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/Devices/Ant/Interfaces/IRowerDevice.cs

@@ -9,7 +9,10 @@ namespace Assets.Scripts.Devices.Ant.Interfaces
 {
     interface IRowerDevice
     {
+        C2RowerData c2RowerData { get; }
         FtmsRowerData rowerData { get; }
         void Reset();
+        void SetResistanceLevel(ushort v);
+        void C2GetStatus(byte[] bs);
     }
 }

Assets/Scripts/Devices/Ant/SensorType.cs

@@ -38,7 +38,8 @@ namespace Assets.Scripts.Devices.Ant
         SpeedCadence,
         Trainer,
         VirtualPower,
-        Rower
+        Rower,
+        FtmsTrainer
     }
 
     public enum NetworkType