Merge branch 'fanpeng' into 'develop'

Fanpeng

See merge request StarlockTeam/wx-starlock!51

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({

pages/feature/bindFace.vue

@@ -116,15 +116,15 @@
 
 <style scoped lang="scss">
   .button {
-    border-radius: 64rpx;
     width: 686rpx;
-    margin-left: 32rpx;
     height: 100rpx;
-    line-height: 100rpx;
+    margin-left: 32rpx;
-    text-align: center;
-    background-color: #63b8af;
-    color: #fff;
     font-size: 32rpx;
     font-weight: bold;
+    line-height: 100rpx;
+    color: #fff;
+    text-align: center;
+    background-color: #63b8af;
+    border-radius: 64rpx;
   }
 </style>

pages/main/lockDetail.vue

@@ -422,7 +422,7 @@
       // #endif
     }
     if (code === 0) {
-      $bluetooth
+      await $bluetooth
         .syncRecord({
           keyId: $bluetooth.currentLockInfo.keyId.toString(),
           uid: $user.userInfo.uid.toString()

pages/setting/setting.vue

@@ -325,11 +325,20 @@
   })
 
   const upgrade = () => {
+    // #ifdef MP
     uni.showModal({
       title: '提示',
       content: '小程序暂不支持升级功能，请下载星星锁APP进行升级',
       showCancel: false
     })
+    // #endif
+    // #ifdef APP-PLUS
+    uni.showModal({
+      title: '提示',
+      content: '星星锁Lite暂不支持升级功能，请下载星星锁APP进行升级',
+      showCancel: false
+    })
+    // #endif
   }
 
   const asyncSetting = async () => {
@@ -338,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,

stores/bluetooth.js

@@ -233,7 +233,7 @@ export const useBluetoothStore = defineStore('ble', {
           fail(err) {
             console.log('蓝牙初始化失败', err)
             // 系统蓝牙未打开
-            if (err.errCode === 10001) {
+            if (err.errCode === 10001 || err.code === 10001) {
               if (that.bluetoothStatus === 2) {
                 that.bluetoothStatus = 3
               } else {
@@ -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
             }
@@ -883,6 +883,7 @@ export const useBluetoothStore = defineStore('ble', {
       if (this.bluetoothStatus === 1) {
         const initResult = await this.initBluetooth()
         if (!initResult) {
+          // #ifdef MP-WEIXIN
           uni.showModal({
             title: '提示',
             content: '蓝牙尚未打开，请先打开蓝牙',
@@ -897,6 +898,23 @@ export const useBluetoothStore = defineStore('ble', {
               }
             }
           })
+          // #endif
+          // #ifdef APP-PLUS
+          const systemInfo = uni.getSystemInfoSync()
+          if (systemInfo.platform === 'android') {
+            const main = plus.android.runtimeMainActivity()
+            const Intent = plus.android.importClass('android.content.Intent')
+            const BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter')
+            const intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
+            main.startActivity(intent)
+          } else if (systemInfo.platform === 'ios') {
+            uni.showModal({
+              title: '提示',
+              content: '蓝牙尚未打开，请先打开蓝牙',
+              showCancel: false
+            })
+          }
+          // #endif
         }
       } else if (this.bluetoothStatus === 2 || this.bluetoothStatus === 3) {
         uni.showModal({