设备连接界面断开逻辑调整

Assets/Scripts/Devices/Ant/AntConnector.cs

@@ -544,5 +544,10 @@ namespace Assets.Scripts.Devices.Ant
             channel.closeChannel(500);
             channel.unassignChannel(500);
         }
+
+        public void Remove(AbstractAntDevice device) 
+        {
+            discoveredDevices.Remove(device);
+        }
     }
 }

Assets/Scripts/Devices/Ant/AntDeviceAdapter.cs

@@ -42,6 +42,18 @@ namespace Assets.Scripts.Devices.Ant
             return AntConnector.Instance().discoveredDevices;
         }
 
+        public override void Refresh()
+        {
+            var list = AntConnector.Instance().discoveredDevices.ToList();
+            foreach (var item in list)
+            {
+                if (item.State == Ant.DeviceState.Disconnected)
+                {
+                    AntConnector.Instance().Remove(item);
+                }
+            }
+        }
+
         public override void StartScan()
         {
             //throw new NotImplementedException();

Assets/Scripts/Devices/Ble/BleDeviceAdapter.cs

@@ -183,6 +183,19 @@ namespace Assets.Scripts.Devices.Ble
             }
         }
 
+        public override void Refresh()
+        {
+            var list = discoveredDevices.ToList();
+            foreach (var item in list)
+            {
+                if (item.Value.State == Ant.DeviceState.Disconnected)
+                {
+                    item.Value.Dispose();
+                    discoveredDevices.Remove(item.Key);
+                }
+            }
+        }
+
         /// <summary>
         /// 清除未连接的设备
         /// </summary>

Assets/Scripts/Devices/DeviceAdapter.cs

@@ -24,7 +24,7 @@ namespace Assets.Scripts.Devices
         {
             
         }
-
+        public abstract void Refresh();
         
     }
 }

Assets/Scripts/UI/Prefab/Rower/RowerDeviceView.cs

@@ -129,14 +129,35 @@ public class RowerDeviceView : MonoBehaviour
         UIManager.AddEvent(gameObject, EventTriggerType.PointerClick, b =>
         {
             if (!mPairButton.activeInHierarchy && !mDisconnectButton.activeInHierarchy) return;
-            connectButtonClick();
+            var device = GetDevice();
+            if (device != null && device.State == DeviceState.Connected)
+            {
+                UIManager.ShowConfirm("警告", "是否断开该设备？", () =>
+                {
+                    device.Disconnect(false);
+                    UIManager.CloseConfirm();
+                }, 2, () => {
+                    UIManager.CloseConfirm();
+                });
+            }
+            else
+            {
+                connectButtonClick();
+            }
         });
         UIManager.AddEvent(mDisconnectButton, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
-            //var device = GetDevice();
+            UIManager.ShowConfirm("警告", "是否断开该设备？", () =>
-            //if(device != null && device.State == DeviceState.Connected)
+            {
-            //{
+                var device = GetDevice();
-            //    device.Disconnect();
+                if (device != null && device.State == DeviceState.Connected)
-            //}
+                {
+                    device.Disconnect(false);
+                }
+                UIManager.CloseConfirm();
+            }, 2, () => {
+                UIManager.CloseConfirm();
+            });
+            return;
 
 #if UNITY_IOS || UNITY_ANDROID
             var obj = Resources.Load("UI/Prefab/Device/Mobile/ConnectDeviceModal");