Merge branch 'dev_cyp1' into dev_combine

# Conflicts:
#	.gitignore
#	Assets/Scripts/Devices/Ble/Characteristic/C2RowerData.cs
#	Assets/Scripts/Scenes/MainController.cs

Assets/Scripts/Apis/Models/RowerRecordModel.cs

@@ -19,16 +19,17 @@ namespace Assets.Scripts.Apis.Models
         public DateTime StartTime { get; set; }
         public DateTime CreateTime { get; set; }
         public int MaxPower { get;  set; }
-        public ushort MaxPace { get;  set; }
+        public int MaxPace { get;  set; }
         public uint MaxRate { get;  set; }
         public double AvgPace { get;  set; }
         public double AvgPower { get;  set; }
         public double AvgRate { get;  set; }
         public int MaxHeartRate { get;  set; }
         public int AvgHeartRate { get;  set; }
-        public ushort StrokeCount { get;  set; }
-        public uint TotalDistance { get;  set; }
+        public int StrokeCount { get;  set; }
+        public int TotalDistance { get;  set; }
         public int TotalTime { get;  set; }
+        public double TrainingTime { get; set; }
         public int? Type { get; set; }
         public double? TypeValue { get; set; }
         public string ShadowIds { get; set; }
@@ -73,7 +74,7 @@ namespace Assets.Scripts.Apis.Models
 
     public class SegmentList
     {
-        public int Ticks { get; set; }
+        public double Ticks { get; set; }
         public int Distance { get; set; }
         public int Speed { get; set; }
         public int Power { get; set; }