Merge remote-tracking branch 'origin/dev' into dev_lishuo

# Conflicts:
#	Assets/Scripts/Apis/MapApi.cs
#	Assets/Scripts/App.cs

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/NearRouteModel.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class NearRouteModel
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string DirPath { get; set; }
+        public string CreateTime { get; set; }
+        public int UserId { get; set; }
+        public double Distance { get; set; }
+        public double EleDifference { get; set; }
+        public double TotalClimb { get; set; }
+        public double AverageGrade { get; set; }
+        public string CoverImage { get; set; }
+        public string ElevationPath { get; set; }
+        public List<double> Point { get; set; }
+        public string Address { get; set; }
+        /// <summary>
+        /// 骑行热度
+        /// </summary>
+        public int TheHeat { get; set; }
+    }
+}

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

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

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: