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

# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs

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

@@ -90,7 +90,6 @@ public class DeviceController : PFUIPanel
     protected override void Awake()
     {
         base.Awake();
-
         //Debug.Log("device awake");
     }
 
@@ -109,6 +108,7 @@ public class DeviceController : PFUIPanel
         {
             //UIManager.ShowHomePanel();
             //UIManager.CloseModal();
+            App.MainDeviceAdapter.StopScan();
             this.Close();
         }));
         //UIManager.AddEvent(mReturnBtn.gameObject, EventTriggerType.PointerUp, (e) =>
@@ -191,7 +191,9 @@ public class DeviceController : PFUIPanel
         cg.alpha = 0;
         base.Show();
         App.MainDeviceAdapter.ClearDevice();
-
+#if UNITY_ANDROID || UNITY_IOS
+        App.MainDeviceAdapter.StartScan();
+#endif
 
         cg.DOFade(1f, 0.3f);        
     }