修改观察者模式提示连接设备bug；新版本设备连接bug；单开限定

Assets/Scripts/App.cs

@@ -54,7 +54,7 @@ public static class App
     public static IDictionary<string, Texture> TextureCache = new Dictionary<string, Texture>();
     public static Texture CurrentUserHeadTexture;
     public static RouteResult routeResult;//骑行记录向骑行场景传值
-    public static Texture DefaultRotateTexture;
+    public static Texture DefaultRotateTexture { get; set; }
     //全局用 输入框或者下拉框修改标志位
     public static bool isChanged { get; set; }
     public static string notifyContent { get; internal set; }

Assets/Scripts/Scenes/LoginController.cs

@@ -611,7 +611,7 @@ public class LoginController : BaseScene
             //}
             Debug.Log(JsonConvert.SerializeObject(locationInfo));
             var i = await ConfigHelper.thirdPartApi.GetMapImage(locationInfo);
-            var t = new Texture2D(4, 4,TextureFormat.DXT5, false);
+            var t = new Texture2D(2, 2, TextureFormat.DXT5, false);
             if (t.LoadImage(Utils.StreamToBytes(i)))
             {
                 Debug.Log("成功");

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

@@ -510,7 +510,7 @@ public class CyclingController : DeviceServiceMonoBase
 #if UNITY_EDITOR
         check = true;
 #endif
-        if (check)
+        if (check || isWatch)
         {
             singleUIManager.StartRide();
             transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = true;
@@ -521,7 +521,7 @@ public class CyclingController : DeviceServiceMonoBase
             transform.Find("UI/Panel(Clone)/ToolBarPanel/StartOrPauseButton").GetComponent<Button>().enabled = false;
             transform.Find("UI/Panel(Clone)/ToolBarPanel/SettingButton").GetComponent<Button>().enabled = false;
             Utils.showToast(null, "Please connect the device!", duration: int.MaxValue, isLowest: true
-            , stopFunc: () => !(!CheckAnt() && !isWatch) || transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy
+            , stopFunc: () => isWatch || CheckAnt() || transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy
             , endCallback: () => 
             {
                 if (!transform.Find("UI/Panel(Clone)/SelectPlayer").gameObject.activeInHierarchy) 

Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs

@@ -61,7 +61,7 @@ namespace Assets.Scenes.Ride.Scripts
 				weight = App.CurrentUser.Weight;
 				bicycleWeight = App.CurrentUser.BicycleWeight;
 #if UNITY_EDITOR
-                power = 343;
+                power = 143;
 #endif
                 mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
 			}

Assets/Scripts/UI/Prefab/Device/DeviceView.cs

@@ -70,10 +70,12 @@ public class DeviceView : MonoBehaviour
         mSearchButton = unconnectionPanel.transform.Find("SearchButton").gameObject;
         mPairButton = unconnectionPanel.transform.Find("PairButton").gameObject;
         searchState = unconnectionPanel.transform.Find("SearchState").GetComponent<Text>();
-        unconnectionButton = unconnectionPanel.GetComponent<Button>();
         mPairButton.SetActive(false);
         connectionPanel = this.transform.Find("ConnectionPanel").gameObject;
+#if UNITY_IOS || UNITY_ANDROID
+        unconnectionButton = unconnectionPanel.GetComponent<Button>();
         connectionButton = connectionPanel.GetComponent<Button>();
+#endif        
         var material = Instantiate(Resources.Load<Material>("UI/Material/RoundedCornersTextureMaterial"));        
         var rect = ((RectTransform)transform).rect;
         material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height * 0.2f, 0));
@@ -125,7 +127,7 @@ public class DeviceView : MonoBehaviour
         title.text = GetTitle();
 
         connectionPanel.SetActive(false);
-
+#if UNITY_IOS || UNITY_ANDROID
         UIManager.AddEvent(unconnectionButton.gameObject, EventTriggerType.PointerClick, new UnityAction<UnityEngine.EventSystems.BaseEventData>(e =>
         {
             if (!mPairButton.activeSelf)
@@ -134,13 +136,13 @@ public class DeviceView : MonoBehaviour
             }
             connectButtonClick();
         }));
-
+#endif
 
         UIManager.AddEvent(mPairButton, EventTriggerType.PointerClick, new UnityAction<UnityEngine.EventSystems.BaseEventData>(e =>
         {
             connectButtonClick();
         }));
-
+#if UNITY_IOS || UNITY_ANDROID
         UIManager.AddEvent(connectionButton.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
             if (!connectionPanel.activeSelf)
             {
@@ -148,6 +150,7 @@ public class DeviceView : MonoBehaviour
             }
             mDisconnectButtonClick();
         }));
+#endif
 
 
         UIManager.AddEvent(mDisconnectButton, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
@@ -283,6 +286,7 @@ public class DeviceView : MonoBehaviour
             else {
                 hasDevice = App.MainDeviceAdapter.GetDevices().Any(d => d.Sensor == SensorType);
             }
+            Debug.Log(hasDevice);
             if (hasDevice)
             {
                 mSearchButton.SetActive(false);

Assets/Scripts/Utils/Utils.cs

@@ -432,10 +432,29 @@ namespace Assets.Scripts
         }
         /*获取最顶层对象*/
         /*Texture相关*/
+        public static Texture2D DeCompress(this Texture2D source)
+        {
+            RenderTexture renderTex = RenderTexture.GetTemporary(
+                        source.width,
+                        source.height,
+                        0,
+                        RenderTextureFormat.Default,
+                        RenderTextureReadWrite.Linear);
+
+            Graphics.Blit(source, renderTex);
+            RenderTexture previous = RenderTexture.active;
+            RenderTexture.active = renderTex;
+            Texture2D readableText = new Texture2D(source.width, source.height);
+            readableText.ReadPixels(new Rect(0, 0, renderTex.width, renderTex.height), 0, 0);
+            readableText.Apply();
+            RenderTexture.active = previous;
+            RenderTexture.ReleaseTemporary(renderTex);
+            return readableText;
+        }
         public static void WriteTextureToPlayerPrefs(string tag, Texture2D tex)
         {
             // if texture is png otherwise you can use tex.EncodeToJPG().
-            byte[] texByte = tex.EncodeToPNG();
+            byte[] texByte = tex.DeCompress().EncodeToJPG();
 
             // convert byte array to base64 string
             string base64Tex = System.Convert.ToBase64String(texByte);

ProjectSettings/EditorBuildSettings.asset

@@ -6,8 +6,8 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Login-Mobile.unity
-    guid: 4be878da00cf764499988cf403faf94d
+    path: Assets/Scenes/Login.unity
+    guid: 6dce3e17997730b4492f91dd8fede429
   - enabled: 1
     path: Assets/Scenes/MainScene.unity
     guid: ab586a3c1bacd4a48a55178eb06fe0cc

ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,6 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ProjectSettings/ProjectSettings.asset

@@ -86,7 +86,7 @@ PlayerSettings:
   submitAnalytics: 1
   usePlayerLog: 1
   bakeCollisionMeshes: 0
-  forceSingleInstance: 0
+  forceSingleInstance: 1
   useFlipModelSwapchain: 1
   resizableWindow: 0
   useMacAppStoreValidation: 0
@@ -180,7 +180,7 @@ PlayerSettings:
     Android: com.ZhiXingPai.PowerFunUnity
   buildNumber:
     iPhone: 2.0.7.0
-  AndroidBundleVersionCode: 9
+  AndroidBundleVersionCode: 10
   AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 30
   AndroidPreferredInstallLocation: 1