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