地球收藏问题，ios 蓝牙有返回值处理，划船机倒计时1时重置

Assets/CountDownAnimation.cs

@@ -13,12 +13,12 @@ public class CountDownAnimation : PFUIPanel
     {
         
     }
-    public void StartTime(UnityAction action) 
+    public void StartTime(UnityAction action,UnityAction action2) 
     {
-        HandleAnimation("5", action);
+        HandleAnimation("5", action, action2);
     }
 
-    void HandleAnimation(string s, UnityAction action)
+    void HandleAnimation(string s, UnityAction action, UnityAction action2)
     {
         var text = transform.Find("Text");
         text.GetComponent<Text>().text = s;
@@ -35,13 +35,17 @@ public class CountDownAnimation : PFUIPanel
                    var flag = int.TryParse(s,out int a);
                    if (flag) 
                    {
+                       if (a == 1 && action2 != null) 
+                       {
+                           action2.Invoke();
+                       }
                        if (a - 1 == 0)
                        {
-                           HandleAnimation("Go", action);
+                           HandleAnimation("Go", action, action2);
                        }
-                       else 
+                       else
                        {
-                           HandleAnimation((a - 1).ToString(), action);
+                           HandleAnimation((a - 1).ToString(), action, action2);
                        }
                    }
                };

Assets/Scripts/Devices/Ble/Devices/FtmsRower.cs

@@ -74,7 +74,7 @@ namespace Assets.Scripts.Devices.Ble.Devices
 
         public void Reset() 
         {
-            Debug.Log("发送重置命令");
+            Debug.Log("发送重置命令"+this.controlPointCharacteristic.ToString());
             hwInterface.WriteCharacteristic(this.controlPointCharacteristic, new byte[] { 0x01 });
         }
     }

Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs

@@ -347,7 +347,7 @@ namespace Assets.Scripts.Ble
 
         public void StopScan()
         {
-            bleMobileThread.Stop();
+            bleMobileThread?.Stop();
         }
         
         //发现服务列表
@@ -391,8 +391,12 @@ namespace Assets.Scripts.Ble
         //写入特征值
         public void WriteCharacteristic(BleCharacteristicInfo characteristic, byte[] data)
         {
-            BluetoothLEHardwareInterface.WriteCharacteristic(characteristic.Peripheral.Address, characteristic.Service.Id.ToString(), characteristic.Id.ToString(), data, data.Length, false, (characteristicUUID) => {
+            bool withResponse = false;
-
+#if UNITY_IOS
+            withResponse = characteristic.Id.ToString().ToLower().Contains("2AD9".ToLower());
+#endif
+            BluetoothLEHardwareInterface.WriteCharacteristic(characteristic.Peripheral.Address, characteristic.Service.Id.ToString(), characteristic.Id.ToString(), data, data.Length, withResponse, (characteristicUUID) => {
+                Debug.Log("相应" + characteristicUUID);
                 BluetoothLEHardwareInterface.Log("Write Succeeded");
             });
         }

Assets/Scripts/UI/Prefab/BigMap/Item.cs

@@ -73,6 +73,7 @@ public class Item : PFUIPanel, IPointerEnterHandler, IPointerExitHandler, IPoint
         SetRounded(hot, 17);
 
         //UIManager.AddEvent(this.gameObject, EventTriggerType.PointerClick, OnPointerClick);
+        transform.GetComponent<Button>().onClick.RemoveAllListeners();
         transform.GetComponent<Button>().onClick.AddListener(() => {
             if (onClick != null)
             {

Assets/Scripts/UI/Prefab/MainNav.cs

@@ -61,6 +61,10 @@ public class MainNav : MonoBehaviour
         {
             transform.Find("Exit").gameObject.SetActive(true);
         }
+        if (transform.Find("Home")) 
+        {
+            transform.Find("Home").gameObject.SetActive(false);
+        }
     }
 
     // Start is called before the first frame update

Assets/Scripts/UI/Prefab/MapList/MapItem.cs

@@ -81,6 +81,8 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         //    }
         //    SceneManager.LoadScene("Ride");
         //});
+        Debug.Log(84);
+        transform.GetComponent<Button>().onClick.RemoveAllListeners();
         transform.GetComponent<Button>().onClick.AddListener(() =>
         {
             //UIManager.ShowMapDetailPanel(myMap.Id);
@@ -109,6 +111,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         diff.Find("Text").GetComponent<Text>().text = myMap.Hard;
         tabContainer.Find("3d").gameObject.SetActive(myMap.Enable3D);
         tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(myMap.CountryCode);
+        transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
         transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(Collect);
         transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite =
             UIManager.Instance.collectDict[myMap.IsFavorite];

Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs

@@ -166,6 +166,7 @@ public class RowerHomeScript : PFUIPanel
                 }
                 if (!isPause) 
                 {
+                    
                     startTime = UIManager.Now.GetDateTime();
                 }
                 TimerTicks();
@@ -173,6 +174,13 @@ public class RowerHomeScript : PFUIPanel
                 timer = 1.0f;
                 btnStart.GetComponent<Image>().sprite = spriteDict["Untagged"];
                 btnStart.tag = "Untagged";
+            },
+            ()=> 
+            {
+                if (Rower != null)
+                {
+                    Rower.Reset();
+                }
             });
         }
         else 

Assets/Scripts/UIManager.cs

@@ -289,10 +289,10 @@ public class UIManager : MonoBehaviour
             return this.GetPanelInstance("CountDown", ref this.mCountDownAnimation);
         }
     }
-    public static void ShowCountDownAnimation(UnityAction action)
+    public static void ShowCountDownAnimation(UnityAction action, UnityAction action2 = null)
     {
         UIManager.Show(UIManager.Instance.CountDownAnimation, null, true);
-        UIManager.Instance.CountDownAnimation.StartTime(action);
+        UIManager.Instance.CountDownAnimation.StartTime(action,action2);
     }
     #region 比赛点击弹窗
     private RaceModalScript mRaceModalScript;

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}