Merge branch 'fanpeng' into 'develop'

Fanpeng

See merge request StarlockTeam/wx-starlock!53

manifest.json

@@ -1,114 +1,130 @@
 {
-  "name": "星星锁Lite",
+    "name" : "星星锁Lite",
-  "appid": "__UNI__933D519",
+    "appid" : "__UNI__933D519",
-  "description": "",
+    "description" : "",
-  "versionName": "1.3.2",
+    "versionName" : "1.3.4",
-  "versionCode": "40",
+    "versionCode" : "41",
-  "mp-weixin": {
+    "mp-weixin" : {
-    "appid": "wx9829a39e65550757",
+        "appid" : "wx9829a39e65550757",
-    "setting": {
+        "setting" : {
-      "urlCheck": true,
+            "urlCheck" : true,
-      "minified": true
+            "minified" : true
-    },
-    "permission": {
-      "scope.bluetooth": {
-        "desc": "蓝牙将用于控制和管理您的智能门锁"
-      }
-    },
-    "usingComponents": true,
-    "lazyCodeLoading": "requiredComponents",
-    "optimization": {
-      "subPackages": true
-    },
-    "plugins": {
-      "wmpf-voip": {
-        "version": "latest",
-        "provider": "wxf830863afde621eb",
-        "genericsImplementation": {
-          "call-page-plugin": {
-            "custombox": "pages/main/customBox"
-          }
-        }
-      }
-    }
-  },
-  "vueVersion": "3",
-  "app-plus": {
-    "distribute": {
-      "icons": {
-        "android": {
-          "hdpi": "unpackage/res/icons/72x72.png",
-          "xhdpi": "unpackage/res/icons/96x96.png",
-          "xxhdpi": "unpackage/res/icons/144x144.png",
-          "xxxhdpi": "unpackage/res/icons/192x192.png"
         },
-        "ios": {
+        "permission" : {
-          "appstore": "unpackage/res/icons/1024x1024.png",
+            "scope.bluetooth" : {
-          "ipad": {
+                "desc" : "蓝牙将用于控制和管理您的智能门锁"
-            "app": "unpackage/res/icons/76x76.png",
+            }
-            "app@2x": "unpackage/res/icons/152x152.png",
+        },
-            "notification": "unpackage/res/icons/20x20.png",
+        "usingComponents" : true,
-            "notification@2x": "unpackage/res/icons/40x40.png",
+        "lazyCodeLoading" : "requiredComponents",
-            "proapp@2x": "unpackage/res/icons/167x167.png",
+        "optimization" : {
-            "settings": "unpackage/res/icons/29x29.png",
+            "subPackages" : true
-            "settings@2x": "unpackage/res/icons/58x58.png",
+        },
-            "spotlight": "unpackage/res/icons/40x40.png",
+        "plugins" : {
-            "spotlight@2x": "unpackage/res/icons/80x80.png"
+            "wmpf-voip" : {
-          },
+                "version" : "latest",
-          "iphone": {
+                "provider" : "wxf830863afde621eb",
-            "app@2x": "unpackage/res/icons/120x120.png",
+                "genericsImplementation" : {
-            "app@3x": "unpackage/res/icons/180x180.png",
+                    "call-page-plugin" : {
-            "notification@2x": "unpackage/res/icons/40x40.png",
+                        "custombox" : "pages/main/customBox"
-            "notification@3x": "unpackage/res/icons/60x60.png",
+                    }
-            "settings@2x": "unpackage/res/icons/58x58.png",
+                }
-            "settings@3x": "unpackage/res/icons/87x87.png",
+            }
-            "spotlight@2x": "unpackage/res/icons/80x80.png",
-            "spotlight@3x": "unpackage/res/icons/120x120.png"
-          }
         }
-      },
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
-          "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
-          "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\" />",
-          "<uses-permission android:name=\"android.permission.BLUETOOTH\" />",
-          "<uses-permission android:name=\"android.permission.BLUETOOTH_SCAN\" />",
-          "<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\" />",
-          "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-          "<uses-permission android:name=\"android.permission.MANAGE_EXTERNAL_STORAGE\"/>"
-        ],
-        "targetSdkVersion": 34,
-        "abiFilters": ["armeabi-v7a", "arm64-v8a"]
-      },
-      "ios": {
-        "dSYMs": false
-      }
     },
-    "modules": {
+    "vueVersion" : "3",
-      "Bluetooth": {},
+    "app-plus" : {
-      "VideoPlayer": {},
+        "optimization" : {
-      "Camera": {},
+            "subPackages" : true
-      "Record": {}
+        },
-    },
+        "runmode" : "liberate",
-    "splashscreen": {
+        "distribute" : {
-      "waiting": false
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\" />",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\" />",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_SCAN\" />",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\" />",
+                    "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.MANAGE_EXTERNAL_STORAGE\"/>"
+                ],
+                "packagename" : "com.xhs.lock",
+                "password" : "xhs2025",
+                "aliasname" : "xhs2025",
+                "keystore" : "./android.jks",
+                "targetSdkVersion" : 35,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+            },
+            "ios" : {
+                "dSYMs" : false
+            }
+        },
+        "modules" : {
+            "Bluetooth" : {
+                "description" : "低功耗蓝牙"
+            },
+            "VideoPlayer" : {
+                "description" : "视频播放"
+            },
+            "Camera" : {
+                "description" : "相机和相册"
+            },
+            "Record" : {
+                "description" : "录音"
+            }
+        },
+        "splashscreen" : {
+            "waiting" : false
+        }
     }
-  }
 }

pages/addDevice/searchDevice.vue

@@ -4,7 +4,7 @@
       v-if="deviceInfo"
       class="scroll-view"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.statusBarHeight + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.statusBarHeight + 'px' }"
     >
       <view style="padding-bottom: calc(env(safe-area-inset-bottom) + 300rpx)">
         <view

pages/feature/adminList.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/feature/cardList.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/feature/createAdmin.vue

@@ -14,7 +14,7 @@
       </up-tabs>
     </view>
     <swiper
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top - 44 + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top - 44 + 'px' }"
       v-if="deviceInfo"
       :list="tabs"
       :autoplay="false"

pages/feature/createCard.vue

@@ -14,7 +14,7 @@
       </up-tabs>
     </view>
     <swiper
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top - 44 + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top - 44 + 'px' }"
       v-if="deviceInfo"
       :list="tabs"
       :autoplay="false"

pages/feature/createFace.vue

@@ -14,7 +14,7 @@
       </up-tabs>
     </view>
     <swiper
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top - 44 + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top - 44 + 'px' }"
       v-if="deviceInfo"
       :list="tabs"
       :autoplay="false"

pages/feature/createFingerprint.vue

@@ -14,7 +14,7 @@
       </up-tabs>
     </view>
     <swiper
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top - 44 + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top - 44 + 'px' }"
       v-if="deviceInfo"
       :list="tabs"
       :autoplay="false"

pages/feature/createKey.vue

@@ -14,7 +14,7 @@
       </up-tabs>
     </view>
     <swiper
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top - 44 + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top - 44 + 'px' }"
       v-if="deviceInfo"
       :list="tabs"
       :autoplay="false"

pages/feature/createPalmVein.vue

@@ -14,7 +14,7 @@
       </up-tabs>
     </view>
     <swiper
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top - 44 + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top - 44 + 'px' }"
       v-if="deviceInfo"
       :list="tabs"
       :autoplay="false"

pages/feature/createPassword.vue

@@ -14,7 +14,7 @@
       </up-tabs>
     </view>
     <swiper
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top - 44 + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top - 44 + 'px' }"
       v-if="deviceInfo"
       :list="tabs"
       :autoplay="false"

pages/feature/createRemote.vue

@@ -14,7 +14,7 @@
       </up-tabs>
     </view>
     <swiper
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top - 44 + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top - 44 + 'px' }"
       v-if="deviceInfo"
       :list="tabs"
       :autoplay="false"

pages/feature/faceList.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/feature/fingerprintList.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/feature/keyList.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/feature/palmVeinList.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/feature/passwordList.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/feature/recordList.vue

@@ -47,7 +47,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: `calc(${deviceInfo.screenHeight - deviceInfo.safeArea.top - 60}px)` }"
+      :style="{ height: `calc(${deviceInfo.windowHeight - deviceInfo.safeArea.top - 60}px)` }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/feature/remoteList.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/feature/typeRecordList.vue

@@ -6,7 +6,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: `${deviceInfo.screenHeight - deviceInfo.safeArea.top}px` }"
+      :style="{ height: `${deviceInfo.windowHeight - deviceInfo.safeArea.top}px` }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"
@@ -213,36 +213,36 @@
 
 <style lang="scss" scoped>
   .search {
-    padding: 32rpx;
     width: 686rpx !important;
+    padding: 32rpx;
   }
 
   .item {
     display: flex;
     align-items: center;
-    background-color: #ffffff;
-    height: 120rpx;
     width: 750rpx;
+    height: 120rpx;
+    background-color: #ffffff;
 
     .item-left {
-      margin-left: 32rpx;
       width: 80rpx;
       height: 80rpx;
+      margin-left: 32rpx;
     }
 
     .item-right {
+      width: 574rpx;
       margin-right: 32rpx;
       margin-left: 32rpx;
-      width: 574rpx;
 
       .item-right-top {
         max-width: 400rpx;
-        font-size: 32rpx;
-        font-weight: bold;
         padding-bottom: 6rpx;
-        white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        font-size: 32rpx;
+        font-weight: bold;
+        white-space: nowrap;
       }
 
       .item-right-bottom {
@@ -266,9 +266,9 @@
   }
 
   .empty-list-text {
-    text-align: center;
     font-size: 32rpx;
     color: #999999;
+    text-align: center;
   }
 
   .status {

pages/main/lockDetail.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       @refresherrefresh="refresher"
       :refresher-enabled="true"
       :refresher-triggered="refresherTriggered"
@@ -385,7 +385,8 @@
         icon: 'none'
       })
     }
-    if ($bluetooth.currentLockInfo.appUnlockOnline && type !== 'close') {
+    // if ($bluetooth.currentLockInfo.appUnlockOnline && type !== 'close') {
+    if ($bluetooth.currentLockInfo.appUnlockOnline) {
       const result = await getNetToken()
       if (!result) {
         sLoading.value.close()

pages/main/mine.vue

@@ -66,7 +66,10 @@
       <view class="env" v-if="env">
         <view class="env-text">{{ env.name }} {{ env.version }}+{{ env.buildNumber }}</view>
         <view>{{ env.baseUrl.split('/').slice(0, 3).join('/') }}</view>
-        <view v-if="envVersion !== 'release' && env" class="env-button" @click="show = true"
+        <view
+          v-if="!(envVersion === 'release' || nodeEnv === 'production') && env"
+          class="env-button"
+          @click="show = true"
           >切换环境</view
         >
       </view>
@@ -89,7 +92,7 @@
         <view class="env-text">{{ env.name }} {{ env.version }}+{{ env.buildNumber }}</view>
         <view>{{ env.baseUrl.split('/').slice(0, 3).join('/') }}</view>
         <view
-          v-if="(envVersion !== 'release' || nodeEnv === 'development') && env"
+          v-if="!(envVersion === 'release' || nodeEnv === 'production') && env"
           class="env-button"
           @click="show = true"
         >

pages/p2p/videoLog.vue

@@ -27,7 +27,7 @@
       v-if="deviceInfo"
       scroll-y="true"
       :lower-threshold="100"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top - 145 + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top - 145 + 'px' }"
       :refresher-enabled="true"
       @refresherrefresh="onRefresh"
       @scrolltolower="onScrollToLower"

pages/setting/coercionFingerprint.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
       @refresherrefresh="refresherList"
       :refresher-enabled="true"

pages/setting/coercionOpenDoor.vue

@@ -8,7 +8,7 @@
       scroll-y="true"
       :style="{
         height:
-          deviceInfo.screenHeight -
+          deviceInfo.windowHeight -
           deviceInfo.safeArea.top -
           (deviceInfo.screenWidth / 750) * 128 +
           'px'

pages/setting/lockUser.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
       lower-threshold="100"
     >
       <view class="search">

pages/setting/openDoorNotice.vue

@@ -8,7 +8,7 @@
       scroll-y="true"
       :style="{
         height:
-          deviceInfo.screenHeight -
+          deviceInfo.windowHeight -
           deviceInfo.safeArea.top -
           (deviceInfo.screenWidth / 750) * 128 +
           'px'

pages/setting/selectGroup.vue

@@ -3,7 +3,7 @@
     <scroll-view
       v-if="deviceInfo"
       :scroll-y="true"
-      :style="{ height: deviceInfo.screenHeight - deviceInfo.safeArea.top + 'px' }"
+      :style="{ height: deviceInfo.windowHeight - deviceInfo.safeArea.top + 'px' }"
     >
       <view class="pb-[calc(env(safe-area-inset-bottom)+250rpx)]">
         <view

pages/setting/setting.vue

@@ -321,7 +321,9 @@
         icon: 'none'
       })
     }
+    // #ifdef MP
     await asyncSetting()
+    // #endif
   })
 
   const upgrade = () => {

stores/bluetooth.js

@@ -900,20 +900,24 @@ export const useBluetoothStore = defineStore('ble', {
           })
           // #endif
           // #ifdef APP-PLUS
-          const systemInfo = uni.getSystemInfoSync()
+          uni.showModal({
-          if (systemInfo.platform === 'android') {
+            title: '提示',
-            const main = plus.android.runtimeMainActivity()
+            content: '蓝牙尚未打开，请先打开蓝牙',
-            const Intent = plus.android.importClass('android.content.Intent')
+            showCancel: false,
-            const BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter')
+            success(res) {
-            const intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
+              if (res.confirm) {
-            main.startActivity(intent)
+                // #ifdef APP-ANDROID
-          } else if (systemInfo.platform === 'ios') {
+                const main = plus.android.runtimeMainActivity()
-            uni.showModal({
+                const Intent = plus.android.importClass('android.content.Intent')
-              title: '提示',
+                const BluetoothAdapter = plus.android.importClass(
-              content: '蓝牙尚未打开，请先打开蓝牙',
+                  'android.bluetooth.BluetoothAdapter'
-              showCancel: false
+                )
-            })
+                const intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
-          }
+                main.startActivity(intent)
+                // #endif
+              }
+            }
+          })
           // #endif
         }
       } else if (this.bluetoothStatus === 2 || this.bluetoothStatus === 3) {