Jelajahi Sumber

添加蓝牙未启动重试;添加未扫描到结束准备,然后重试

Frankensteinly 9 bulan lalu
induk
melakukan
6db88ddfaf
1 mengubah file dengan 7 tambahan dan 0 penghapusan
  1. 7 0
      app/src/main/java/com/grkj/iscs/BusinessManager.kt

+ 7 - 0
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -454,7 +454,9 @@ object BusinessManager {
         loadingCallBack?.invoke(true, "正在扫描设备...", null)
         BleUtil.instance?.scan(object : CustomBleScanCallback() {
             override fun onPrompt(promptStr: String?) {
+                // 蓝牙未启动重试
                 BleManager.getInstance().enableBluetooth()
+                doScanBle(mac, loadingCallBack, prepareDoneCallBack)
             }
 
             override fun onScanStarted(success: Boolean) {
@@ -475,7 +477,12 @@ object BusinessManager {
             }
 
             override fun onScanFinished(scanResultList: MutableList<BleDevice>?) {
+                LogUtil.i("onScanFinished: $mac - $scanResultList")
                 loadingCallBack?.invoke(false, null, null)
+                if (connectListeners.any { it.mac == mac }) {
+                    LogUtil.w("$mac is not scanned")
+                    prepareDoneCallBack?.invoke(false, null)
+                }
             }
         })
     }