Merge branch 'dev_cyp' into dev_ar_cyp

# Conflicts:
#	Assets/Resources/UI/Font/HanWangZonYi.ttf.meta
#	Assets/Resources/UI/language.json
#	Assets/Scenes/Login.unity
#	Assets/Scripts/Apis/Models/MapRoute.cs
#	Assets/Scripts/App.cs
#	Assets/Scripts/ConfigHelper.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
#	Assets/Scripts/UIManager.cs
#	Assets/Scripts/Utils/Utils.cs

Assets/Scripts/Apis/Models/MailModel.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class MailModel
+    {
+        public int Id { get; set; }
+        public string Title { get; set; }
+        public string Desc { get; set; }
+        public bool IsRead { get; set; }
+        public DateTime CreateTime { get; set; }
+        public int Type { get; set; }
+        public int SendUserId { get; set; }
+        public string SendNickName { get; set; }
+    }
+}

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

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

Assets/Scripts/Apis/Models/MapRoute.cs

@@ -120,6 +120,7 @@ namespace Assets.Scripts.Apis.Models
         //最近骑行列表使用
         public RouteResult RecentRecord { get; set; }
 
+        public bool IsEnabled { get; set; }
         public string Url { get; set; }
         public string FileName { get; set; }
         public int FileSize { get; set; }

Assets/Scripts/Apis/Models/RowerRecordModel.cs

@@ -29,6 +29,9 @@ namespace Assets.Scripts.Apis.Models
         public ushort StrokeCount { get;  set; }
         public uint TotalDistance { get;  set; }
         public int TotalTime { get;  set; }
+        public int? Type { get; set; }
+        public double? TypeValue { get; set; }
+        public string ShadowIds { get; set; }
     }
     public class RowerChartModel 
     {
@@ -36,6 +39,8 @@ namespace Assets.Scripts.Apis.Models
         public ushort Pace { get; set; }
         public uint Rate { get; set; }
         public int HeartRate { get; set; }
+        public int Distance { get; set; }
+        public int StrokeCount { get; set; }
     }
     public class RowerResultModel
     {
@@ -60,5 +65,55 @@ namespace Assets.Scripts.Apis.Models
         public int TotalTime { get;  set; }
         public List<RowerChartModel> ChartList { get; set; }
         public string Cover { get; set; }
+        public int? Type { get; set; }
+        public double? TypeValue { get; set; }
+        public double Ticks { get; set; }
     }
+
+
+    public class SegmentList
+    {
+        public int Ticks { get; set; }
+        public int Distance { get; set; }
+        public int Speed { get; set; }
+        public int Power { get; set; }
+        public int HeartRate { get; set; }
+        public int StrokeCount { get; set; }
+        public int Energy { get; set; }
+        public int Rate { get; set; }
+    }
+
+    public class RowerRank
+    {
+        public string Id { get; set; }
+        public int UserId { get; set; }
+        public double Time { get; set; }
+        public int TotalDistance { get; set; }
+        public string NickName { get; set; }
+        public string WxHeadImg { get; set; }
+        public DateTime CreateTime { get; set; }
+        public bool isFinished { get; set; }
+        public List<RowerChartModel> list { get; set; }
+        public string Country { get; set; }
+        public int Nid { get; set; }
+        public double Ticks { get; set; }
+        public int rankNum { get; set; }
+    }
+
+    public class Info
+    {
+        public string CreateTime { get; set; }
+        public string MyRank { get; set; }
+        public int? Type { get; set; }
+        public string TypeStr { get; set; }
+        public string MyRankLeft { get; set; }
+    }
+
+    public class RowerSegmentData
+    {
+        public List<SegmentList> segmentList { get; set; }
+        public List<RowerRank> ranks { get; set; }
+        public Info info { get; set; }
+    }
+
 }