diff --git a/manifest.json b/manifest.json index 102a969..f1b7ea3 100644 --- a/manifest.json +++ b/manifest.json @@ -1,44 +1,42 @@ { - "name": "wx-starlock", - "appid": "__UNI__933D519", - "description": "", - "versionName": "1.3.0", - "versionCode": "37", - "mp-weixin": { - "appid": "wx9829a39e65550757", - "setting": { - "urlCheck": true, - "minified": true - }, - "permission": { - "scope.bluetooth": { - "desc": "蓝牙将用于控制和管理您的智能门锁" - } - }, - "requiredPrivateInfos": [ - "getLocation" - ], - "usingComponents": true, - "lazyCodeLoading": "requiredComponents", - "optimization": { - "subPackages": true - }, - "plugins": { - "xp2p": { - "version": "latest", - "provider": "wx1319af22356934bf", - "export": "exportForXp2pPlugin.js" - }, - "wmpf-voip": { - "version": "latest", - "provider": "wxf830863afde621eb", - "genericsImplementation": { - "call-page-plugin": { - "custombox": "pages/main/customBox" - } + "name" : "wx-starlock", + "appid" : "__UNI__933D519", + "description" : "", + "versionName" : "1.3.0", + "versionCode" : "37", + "mp-weixin" : { + "appid" : "wx9829a39e65550757", + "setting" : { + "urlCheck" : true, + "minified" : true + }, + "permission" : { + "scope.bluetooth" : { + "desc" : "蓝牙将用于控制和管理您的智能门锁" + } + }, + "requiredPrivateInfos" : [ "getLocation" ], + "usingComponents" : true, + "lazyCodeLoading" : "requiredComponents", + "optimization" : { + "subPackages" : true + }, + "plugins" : { + "xp2p" : { + "version" : "latest", + "provider" : "wx1319af22356934bf", + "export" : "exportForXp2pPlugin.js" + }, + "wmpf-voip" : { + "version" : "latest", + "provider" : "wxf830863afde621eb", + "genericsImplementation" : { + "call-page-plugin" : { + "custombox" : "pages/main/customBox" + } + } + } } - } - } - }, - "vueVersion": "3" + }, + "vueVersion" : "3" } diff --git a/pages/feature/recordList.vue b/pages/feature/recordList.vue index 5bc9a95..4722fa7 100644 --- a/pages/feature/recordList.vue +++ b/pages/feature/recordList.vue @@ -39,7 +39,7 @@ diff --git a/stores/bluetooth.js b/stores/bluetooth.js index bd58cac..098dbb7 100644 --- a/stores/bluetooth.js +++ b/stores/bluetooth.js @@ -1346,8 +1346,24 @@ export const useBluetoothStore = defineStore('ble', { } }) - if (code === 0 && data.outputParams) { - that.parsingCharacteristicValue(that.hexToArray(data.outputParams)) + if (code === 0) { + if (data.status === '') { + that.parsingCharacteristicValue(that.hexToArray(data.outputParams.result)) + } else { + let code = -10 + if (data.status === 'FailedOperation.ActionUnreachable') { + code = -11 + } + + uni.showToast({ + title: `设备状态异常,${code}`, + icon: 'none' + }) + characteristicValueCallback({ + code: -10, + message: '设备状态异常' + }) + } } else { characteristicValueCallback({ code,