登录页调整 增加半圆角组件 基本完成路线列表功能 基本完成骑行列表 开始做编辑页

Assets/Scripts/Apis/MapApi.cs

@@ -55,9 +55,9 @@ namespace Assets.Scripts.Apis
         /// <param name="sort">hot, distance</param>
         /// <param name="sortDire">asc</param>
         /// <returns></returns>
-        public JsonResult<List<MapRoute>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "")
+        public JsonResult<List<MapRoute>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false)
         {
-            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }";
+            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}";
 
             return Get<JsonResult<List<MapRoute>>>(url);
         }

Assets/Scripts/Apis/MapInterruptRecordApi.cs

@@ -1,10 +1,12 @@
 using Assets.Scripts.Apis.Models;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using UnityEngine;
 
 namespace Assets.Scripts.Apis
 {
@@ -21,5 +23,28 @@ namespace Assets.Scripts.Apis
             var jsonResult = JsonConvert.DeserializeObject<JsonResult<AddMapRecordResultModel>>(result);
             return jsonResult;
         }
+
+        public JsonResult<List<RouteResult>> GetMapInterruptRecord(string keyword, int pageIndex, int pageSize)
+        {
+            var result = new JsonResult<List<RouteResult>>()
+            {
+                result = false,
+                data = null,
+                errMsg = ""
+            };
+            try
+            {
+                var r = Get<List<RouteResult>>($"MapRecord/GetMapInterruptRecord?keyword={keyword}&pageIndex={pageIndex}&pageSize={pageSize}");
+                result.result = true;
+                result.data = r;
+                return result;
+            }
+            catch (Exception e)
+            {
+                Debug.Log(e.ToString());
+                return result;
+            }
+            
+        }
     }
 }

Assets/Scripts/Apis/Models/MapRoute.cs

@@ -100,5 +100,7 @@ namespace Assets.Scripts.Apis.Models
         public bool IsFavorite { get; set; }
 
         public bool Enable3D { get; set; }
+        public int TheHeat { get; set; }
+        public string Hard { get; set; }
     }
 }

Assets/Scripts/Apis/Models/RouteResult.cs

@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class RouteResultParam
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? OnlineUserId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ContinueMark { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? ContinueIndex { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? RouteId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? CompetitionId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double EndDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string RankingsId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GlobalContinue { get; set; }
+    }
+    public class RouteResult
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int RankingId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string IsCompleted { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string IsDelete { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ManufacturerName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int MapCompetitionId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<double> Point { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double Progress { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int RouteId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string RouteImage { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string RouteName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double TotalDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Ticks { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string TrainingTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int UserId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double EndDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Mode { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double TripDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CanAgain { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public RouteResultParam Param { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CanContinueCycling { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public RouteResultParam ContinueCyclingParam { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Count { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CyclingEquipmentName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CanDelete { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Ranking { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public double CurrentRouteStartDistance { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CanShareOnStrava { get; set; }
+    }
+}

Assets/Scripts/Apis/Models/RouteResult.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 20fedef2ea43f1749a5492c955936068
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Apis/UserApi.cs

@@ -115,9 +115,9 @@ namespace Assets.Scripts.Apis
             }
             return ret;
         }
-        public async Task<JsonResult<object>> GetCaptcha(string phone) 
+        public async Task<JsonResult<JObject>> GetCaptcha(string phone) 
         {
-            return await PostAsync<JsonResult<object>>("NoAuth/v1/GetCaptcha",new {phone });
+            return await PostAsync<JsonResult<JObject>>("NoAuth/v1/GetCaptcha",new {phone });
         }
         public async Task<JsonResult<object>> UpdateUserInfo(UserResultModel user) 
         {
@@ -127,6 +127,10 @@ namespace Assets.Scripts.Apis
         {
             return Get<JsonResult<JObject>>("User/GetCurrentUser");
         }
+        public async Task<JsonResult<UserResultModel>> QuickLogin() 
+        {
+            return await PostAsync<JsonResult<UserResultModel>>("NoAuth/QuickLogin",null);
+        }
 
         public async Task<JsonResult<object>> OnWebWxLoginCheckUnionId(string unionId, string openId)
         {