diff --git a/android.jks b/android.jks new file mode 100644 index 0000000..7a87050 Binary files /dev/null and b/android.jks differ diff --git a/manifest.json b/manifest.json index cbeb16b..1f81f18 100644 --- a/manifest.json +++ b/manifest.json @@ -1,114 +1,130 @@ { - "name": "星星锁Lite", - "appid": "__UNI__933D519", - "description": "", - "versionName": "1.3.2", - "versionCode": "40", - "mp-weixin": { - "appid": "wx9829a39e65550757", - "setting": { - "urlCheck": 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" + "name" : "星星锁Lite", + "appid" : "__UNI__933D519", + "description" : "", + "versionName" : "1.3.4", + "versionCode" : "41", + "mp-weixin" : { + "appid" : "wx9829a39e65550757", + "setting" : { + "urlCheck" : true, + "minified" : true }, - "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" - } + "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" + } + } + } } - }, - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "targetSdkVersion": 34, - "abiFilters": ["armeabi-v7a", "arm64-v8a"] - }, - "ios": { - "dSYMs": false - } }, - "modules": { - "Bluetooth": {}, - "VideoPlayer": {}, - "Camera": {}, - "Record": {} - }, - "splashscreen": { - "waiting": false + "vueVersion" : "3", + "app-plus" : { + "optimization" : { + "subPackages" : true + }, + "runmode" : "liberate", + "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" : { + "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" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "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 + } } - } } diff --git a/pages/addDevice/searchDevice.vue b/pages/addDevice/searchDevice.vue index e2519db..07cdffc 100644 --- a/pages/addDevice/searchDevice.vue +++ b/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' }" > .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 { diff --git a/pages/main/lockDetail.vue b/pages/main/lockDetail.vue index 2bb62fb..39c585f 100644 --- a/pages/main/lockDetail.vue +++ b/pages/main/lockDetail.vue @@ -3,7 +3,7 @@ {{ env.name }} {{ env.version }}+{{ env.buildNumber }} {{ env.baseUrl.split('/').slice(0, 3).join('/') }} - 切换环境 @@ -89,7 +92,7 @@ {{ env.name }} {{ env.version }}+{{ env.buildNumber }} {{ env.baseUrl.split('/').slice(0, 3).join('/') }} diff --git a/pages/p2p/videoLog.vue b/pages/p2p/videoLog.vue index c004a54..694f391 100644 --- a/pages/p2p/videoLog.vue +++ b/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" diff --git a/pages/setting/coercionFingerprint.vue b/pages/setting/coercionFingerprint.vue index f264e99..86e5d38 100644 --- a/pages/setting/coercionFingerprint.vue +++ b/pages/setting/coercionFingerprint.vue @@ -3,7 +3,7 @@ diff --git a/pages/setting/openDoorNotice.vue b/pages/setting/openDoorNotice.vue index 46d158e..0ef7310 100644 --- a/pages/setting/openDoorNotice.vue +++ b/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' diff --git a/pages/setting/selectGroup.vue b/pages/setting/selectGroup.vue index 71364b3..53c15ad 100644 --- a/pages/setting/selectGroup.vue +++ b/pages/setting/selectGroup.vue @@ -3,7 +3,7 @@ { diff --git a/stores/bluetooth.js b/stores/bluetooth.js index d8d60f8..5d62eed 100644 --- a/stores/bluetooth.js +++ b/stores/bluetooth.js @@ -900,20 +900,24 @@ 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 - }) - } + uni.showModal({ + title: '提示', + content: '蓝牙尚未打开,请先打开蓝牙', + showCancel: false, + success(res) { + if (res.confirm) { + // #ifdef APP-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) + // #endif + } + } + }) // #endif } } else if (this.bluetoothStatus === 2 || this.bluetoothStatus === 3) {