diff --git a/pages/addDevice/bindLock.vue b/pages/addDevice/bindLock.vue index 6a5a722..91f7e73 100644 --- a/pages/addDevice/bindLock.vue +++ b/pages/addDevice/bindLock.vue @@ -90,8 +90,10 @@ }) if (addUserCode === 0) { this.closeBluetoothConnection() + // #ifdef MP this.closeAllBluetooth() this.initAndListenBluetooth() + // #endif } else if (addUserCode === -1) { uni.hideLoading() uni.showToast({ diff --git a/pages/feature/bindFace.vue b/pages/feature/bindFace.vue index 761c25b..f3dd856 100644 --- a/pages/feature/bindFace.vue +++ b/pages/feature/bindFace.vue @@ -116,15 +116,15 @@ diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue index f2d3bc5..5e33d6a 100644 --- a/pages/setting/setting.vue +++ b/pages/setting/setting.vue @@ -347,7 +347,9 @@ lockId: $bluetooth.currentLockInfo.lockName.toString(), uid: $user.userInfo.uid.toString() }) + // #ifdef MP $bluetooth.closeBluetoothConnection() + // #endif if (code === 0) { const { code: resultCode } = await lockDataUploadRequest({ lockId: $bluetooth.currentLockInfo.lockId, diff --git a/stores/bluetooth.js b/stores/bluetooth.js index 5763d41..d8d60f8 100644 --- a/stores/bluetooth.js +++ b/stores/bluetooth.js @@ -249,7 +249,7 @@ export const useBluetoothStore = defineStore('ble', { } } // 蓝牙已经初始化 - if (err.errMsg === 'openBluetoothAdapter:fail already opened') { + if (err.errMsg === 'openBluetoothAdapter:fail already opened' || err.code === -1) { resolve(true) return }