骑行界面&赛事界面调整&设备断开功能

Assets/Scripts/Apis/MapCompetitionApi.cs

@@ -5,6 +5,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using UnityEngine;
+
 namespace Assets.Scripts.Apis
 {
     internal class MapCompetitionApi : ApiBase
@@ -24,9 +26,9 @@ namespace Assets.Scripts.Apis
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public JsonResult<List<CompetitionRankingResultModel>> GetRankingList(int id)
+        public JsonResult<List<CompetitionRankingResultModel>> GetRankingListAsync(int id)
         {
-            var list = Get<JsonResult<dynamic>>($"/MapRecord/GetCompetitionRanking?id={ id }&pageIndex=0&pageSize=999");
+            var list = Get<JsonResult<CompetitionRankingResultListModel>>($"/MapRecord/GetCompetitionRanking?id={ id }&pageIndex=0&pageSize=999");
 
             return new JsonResult<List<CompetitionRankingResultModel>>
             {
@@ -38,7 +40,7 @@ namespace Assets.Scripts.Apis
         //查询我参与的比赛列表
         public JsonResult<List<JoinedCompetitionModel>> GetMyCompetitionList()
         {
-            var list = Get<JsonResult<dynamic>>($"/MapCompetition/v0/GetMyList");
+            var list = Get<JsonResult<List<JoinedCompetitionModel>>>($"/MapCompetition/v0/GetMyList");
 
             return new JsonResult<List<JoinedCompetitionModel>>
             {
@@ -50,7 +52,7 @@ namespace Assets.Scripts.Apis
         //查询比赛列表
         public JsonResult<List<MapCompetitionModel>> GetCompetitionList(string name,int pageIndex,int pageSize,int status=0)
         {
-            var list = Get<JsonResult<dynamic>>($"/MapCompetition/v1/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }");
+            var list = Get<JsonResult<List<MapCompetitionModel>>>($"/MapCompetition/v1/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }");
 
             return new JsonResult<List<MapCompetitionModel>>
             {
@@ -61,7 +63,8 @@ namespace Assets.Scripts.Apis
         }
         public async Task<JsonResult<List<MapCompetition>>> GetCompetitionListV2(string name, int pageIndex, int pageSize, string status = "", int order = 1, bool self = false, int activity = 0)
         {
-            var list = await GetAsync<JsonResult<dynamic>>($"/MapCompetition/v2/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }&order={order}&self={self}&activity={activity}");
+            var list = await GetAsync<JsonResult<List<MapCompetition>>>($"/MapCompetition/v2/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }&order={order}&self={self}&activity={activity}");
+            Debug.Log("67");
             return new JsonResult<List<MapCompetition>>
             {
                 result = list.result,
@@ -72,7 +75,7 @@ namespace Assets.Scripts.Apis
         //查询比赛详情
         public JsonResult<MapCompetitionDetailModel> GetCompetitionDetail(int id)
         {
-            var list = Get<JsonResult<dynamic>>($"/MapRouteGlobalCycling/Get?id={ id }");
+            var list = Get<JsonResult<MapCompetitionDetailModel>>($"/MapRouteGlobalCycling/Get?id={ id }");
 
             return new JsonResult<MapCompetitionDetailModel>
             {

Assets/Scripts/Apis/Models/CompetitionRankingResultModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace Assets.Scripts.Apis.Models
 {
@@ -34,4 +35,9 @@ namespace Assets.Scripts.Apis.Models
         public string Gap { get; set; }
         public string WxHeadImg { get; set; }
     }
+
+    public class CompetitionRankingResultListModel
+    {
+        public List<CompetitionRankingResultModel> list { get; set; }
+    }
 }

Assets/Scripts/Apis/Models/MapCompetitionListItem.cs

@@ -0,0 +1,129 @@
+using System;
+
+public class MapCompetitionListItem
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public int Id { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string CoverImage { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public int Status { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string StatusVlaue { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Area { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime StartApplyTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime EndApplyTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string PhoneNumber { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public int CloseTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public int MaxMembers { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime StartTime { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public DateTime EndTime { get; set; }
+    /// <summary>
+    /// 阳澄湖绕圈赛
+    /// </summary>
+    public string Title { get; set; }
+    /// <summary>
+    /// 周一赛事
+    /// </summary>
+    public string Dec { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public int RouteId { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public int ApplyCount { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool HasJoin { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string CanCancelJoin { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool CanJoin { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool CanEnter { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public int MapCompetitionType { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool CanWatch { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public double Distance { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public double AverageGrade { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public double EleDifference { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public double TotalClimb { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public double MaxElevation { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string RouteCover { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string AltitudeGraph { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string SponsorCoverage { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string BannerPreview { get; set; }
+}

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

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