Merge remote-tracking branch 'origin/dev_m1' into dev_mobile_ble

# Conflicts:
#	Assets/Scripts/App.cs

Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

@@ -172,6 +172,7 @@ public class CyclingController : DeviceServiceMonoBase
     private void Update()
     {
         //CamControl();
+#if UNITY_IOS || UNITY_ANDROID
         if (competitionId == 0 && singleUIManager != null)
         {
             var mouse = Input.GetMouseButton(0);
@@ -182,6 +183,7 @@ public class CyclingController : DeviceServiceMonoBase
                 singleUIManager?.ClearPanel(null);
             }
         }
+#endif
 
         timer -= Time.deltaTime;
         if (timer <= 0)//定时器 一秒执行一次
@@ -192,6 +194,7 @@ public class CyclingController : DeviceServiceMonoBase
             {
                 UIManager.SendCompetitionStartMessage("Ride");
             }
+#if UNITY_IOS || UNITY_ANDROID
             if (isStart)
             {
                 activeSeconds++;
@@ -204,6 +207,7 @@ public class CyclingController : DeviceServiceMonoBase
                     singleUIManager?.ClearPanel(null);
                 }
             }
+#endif
             timer += 1.0f;
         }
     }