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

This commit is contained in:
Caiyanpeng committed 2021-09-15 19:30:47 +08:00
commit 7d4617eca6
7 files changed
+55 -21

No files matched your search

+3 -3
View File
@@ -37,7 +37,7 @@ public class MainController : BaseScene
//rect1.offsetMax = Vector2.zero;
//transform.Find("ModalPanel").GetComponent<RectTransform>().sizeDelta = new Vector2(844, 390);
#endif
App.MainDeviceAdapter.StartScan();
//App.MainDeviceAdapter.StartScan();
}
@@ -110,8 +110,8 @@ public class MainController : BaseScene
scanTicks++;
if (scanTicks == 10)
{
App.MainDeviceAdapter.StopScan();
Debug.Log("StopScan");
//App.MainDeviceAdapter.StopScan();
//Debug.Log("StopScan");
}
}
}