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

# Conflicts:
#	Assets/Scripts/App.cs

Assets/Scripts/Scenes/MainController.cs

@@ -36,8 +36,9 @@ public class MainController : BaseScene
         //rect1.offsetMin = Vector2.zero;
         //rect1.offsetMax = Vector2.zero;
         //transform.Find("ModalPanel").GetComponent<RectTransform>().sizeDelta = new Vector2(844, 390);
+#else
+       App.MainDeviceAdapter.StartScan();
 #endif
-        App.MainDeviceAdapter.StartScan();
     }
 
     // Start is called before the first frame update
@@ -87,8 +88,9 @@ public class MainController : BaseScene
             //UIManager.ShowBigMapPanel();
             //UIManager.ShowEarthPanel();
         }
-
-        UIManager.UpdateJoinCompetition();//查询当前我参加的赛事
+        Task.Run(() => {
+            UIManager.UpdateJoinCompetition();//查询当前我参加的赛事
+        });
     }
 
 

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;
         }
     }