对战与AR骑行相关逻辑修改

Assets/Scripts/Apis/MapApi.cs

@@ -64,14 +64,14 @@ namespace Assets.Scripts.Apis
         /// <param name="sort">hot, distance</param>
         /// <param name="sortDire">asc</param>
         /// <returns></returns>
-        public Task<JsonResult<List<MapRoute>>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false,bool isMine = false,bool isRecent = false,bool isEnableAR = false)
+        public Task<JsonResult<List<MapRoute>>> GetList(int pageIndex, int pageSize, string name, string distance="", string hands="", bool is3D=false, string sort="", string sortDire = "", bool isFav = false,bool isMine = false,bool isRecent = false,bool isEnableAR = false, bool isEnableBattle = false)
         {
             string lngLat = "";
             if (sort.Equals("Near"))
             {
                 lngLat = $"{App.longitude},{App.latitude}";
             }
-            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}&lngLat={lngLat}&isMine={isMine}&isRecent={isRecent}&isEnableAR={isEnableAR}";
+            var url = $"Map/GetRoute?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&distance={ distance }&hands={ hands }&is3D={ is3D }&sort={ sort }&sortDire={ sortDire }&isFav={isFav}&lngLat={lngLat}&isMine={isMine}&isRecent={isRecent}&isEnableAR={isEnableAR}&isEnableBattle={isEnableBattle}";
 
             return GetAsync<JsonResult<List<MapRoute>>>(url);
         }

Assets/Scripts/Apis/Models/ActivityModel.cs

@@ -58,5 +58,11 @@ namespace Assets.Scripts.Apis.Models
         public double TotalTicks { get; set; }
         public string Url { get; set; }
         public string GlobalDetailUrl { get; set; }
+        /// <summary>
+        /// 活动类型0：网页活动 1:App内部骑行活动 2：App内部赛事活动
+        /// </summary>
+        public int ActivityType { get; set; }
+        public int RouteId { get; set; }
+        public int CompetitionId { get; set; }
     }
 }

Assets/Scripts/Apis/Models/GameRoomModel.cs

@@ -176,5 +176,7 @@ namespace Assets.Scripts.Apis.Models
         public string Source { get; set; }
         public bool IsDNF { get; set; }
         public double? HeartRate { get; set; }
+
+        public string DeviceType { get; set; }
     }
 }

Assets/Scripts/Apis/PfHttpClientHandler.cs

@@ -64,7 +64,7 @@ namespace Assets.Scripts.Apis
         IEnumerator LoadLogin(string msg)
         {
             //释放资源
-            MapUDPService.Dispose();
+            //MapUDPService.Dispose();
             //删除本地文件
             Helper.DelectDir(PFConstants.MapWorkoutRecordTempFolder);
             App.tempRecordData = null;