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

# Conflicts:
#	Assets/Scripts/Devices/Ble/Devices/SpeedCadence.cs

Assets/Scripts/Devices/Ble/Win/WclBleMainThread.cs

@@ -128,7 +128,7 @@ namespace Assets.Scripts.Devices.Ble.Win
             }
         }
 
-        public override bool Stop()
+        public void StopGattThreads()
         {
             Debug.Log("停止thread");
             foreach (var item in this.gattClients.Values)
@@ -136,9 +136,8 @@ namespace Assets.Scripts.Devices.Ble.Win
                 item.Stop();
             }
 
-            wclBleManager.Dispose();
-
-            return true;
+            //wclBleManager.Dispose();
+            //return true;
         }
 
         public string Test()

Assets/Scripts/Devices/Ble/Win/WclBleManager.cs

@@ -157,7 +157,7 @@ namespace Assets.Scripts.Ble
 			//	manager,
 			//	status
 			//}, WclBleManager.log);
-			callback(manager, status);
+			callback?.Invoke(manager, status);
 		}
 
 		// Token: 0x04001390 RID: 5008