diff --git a/App.vue b/App.vue index 43adea6..ab386a2 100644 --- a/App.vue +++ b/App.vue @@ -31,7 +31,7 @@ return 'XHJ' } // #endif - return 'DEV' + return 'PRE' } }, computed: { diff --git a/components/LockDatetimePicker/LockDatetimePicker.vue b/components/LockDatetimePicker/LockDatetimePicker.vue index b6aef9f..658ab5e 100644 --- a/components/LockDatetimePicker/LockDatetimePicker.vue +++ b/components/LockDatetimePicker/LockDatetimePicker.vue @@ -8,7 +8,6 @@ ", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "targetSdkVersion": 34, - "abiFilters": ["armeabi-v7a", "arm64-v8a"] - }, - "ios": { - "dSYMs": false - } }, - "modules": { - "Bluetooth": {}, - "VideoPlayer": {}, - "Camera": {}, - "Record": {} - }, - "splashscreen": { - "waiting": false + "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" : { + "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" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "targetSdkVersion" : 34, + "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ] + }, + "ios" : { + "dSYMs" : false + } + }, + "modules" : { + "Bluetooth" : {}, + "VideoPlayer" : {}, + "Camera" : {}, + "Record" : {} + }, + "splashscreen" : { + "waiting" : false + } } - } } diff --git a/pages/others/cycleDate.vue b/pages/others/cycleDate.vue index 00486ce..396390a 100644 --- a/pages/others/cycleDate.vue +++ b/pages/others/cycleDate.vue @@ -88,7 +88,6 @@ > - - - - - {{ range[index].name }} + + + + + + + + + + {{ range[index].name }} + + + + + + + + + + + + + + + + + + + + + + {{ + isVoice ? '点击停止' : '点击说话' + }} + + + + + + + 挂断 + + + + + + + 开锁 + + + + - - - - - - - - - - - - - - - - - - - - {{ - isVoice ? '点击停止' : '点击说话' - }} - - - - - - - 挂断 - - - - - - - 开锁 - - - - - - @@ -250,7 +254,7 @@ return data }) - const cleanupResources = () => { + const cleanupResources = async () => { if (cleanupCalled.value) return cleanupCalled.value = true @@ -263,8 +267,8 @@ } releaseRecord() if (deviceInfo.value) { - stopSendServiceFunction(`${deviceInfo.value.productId}/${deviceInfo.value.deviceName}`) - stopServiceFunction(`${deviceInfo.value.productId}/${deviceInfo.value.deviceName}`) + await stopSendServiceFunction(`${deviceInfo.value.productId}/${deviceInfo.value.deviceName}`) + await stopServiceFunction(`${deviceInfo.value.productId}/${deviceInfo.value.deviceName}`) } // #endif // #ifdef MP-WEIXIN @@ -545,8 +549,15 @@ // #endif } - const callback = audioData => { - dataSendFunction(`${deviceInfo.value.productId}/${deviceInfo.value.deviceName}`, audioData) + const callback = async audioData => { + const result = await dataSendFunction( + `${deviceInfo.value.productId}/${deviceInfo.value.deviceName}`, + audioData + ) + console.log( + `数据传输结果:${result?.data?.result ? result?.data?.result : result?.data?.dynamicJSONFields?.result}`, + audioData + ) } const handlePlaySuccess = () => { diff --git a/pages/setting/autoLock.vue b/pages/setting/autoLock.vue index e3f958c..936354c 100644 --- a/pages/setting/autoLock.vue +++ b/pages/setting/autoLock.vue @@ -51,7 +51,6 @@ :defaultIndex="picker" title="选择时间" keyName="name" - :itemHeight="70" :visibleItemCount="5" @close="show = false" @cancel="show = false" diff --git a/pages/setting/customCatEye.vue b/pages/setting/customCatEye.vue index e90cc89..550581e 100644 --- a/pages/setting/customCatEye.vue +++ b/pages/setting/customCatEye.vue @@ -68,7 +68,6 @@ :show="showRecordingTime" :columns="recordingTimeList" keyName="name" - :itemHeight="70" title="有人出现时录像" :visibleItemCount="5" :defaultIndex="[recordingTimeIndex]" @@ -80,7 +79,6 @@ :show="showDetectionDistance" :columns="detectionDistanceList" title="人体侦测距离" - :itemHeight="70" :visibleItemCount="5" keyName="name" :defaultIndex="[detectionDistanceIndex]" diff --git a/pages/setting/faceSetting.vue b/pages/setting/faceSetting.vue index e404eb4..c5bde89 100644 --- a/pages/setting/faceSetting.vue +++ b/pages/setting/faceSetting.vue @@ -61,7 +61,6 @@ :defaultIndex="[distanceIndex]" title="感应距离" keyName="name" - :itemHeight="70" :visibleItemCount="5" @close="showDistance = false" @cancel="showDistance = false" @@ -73,7 +72,6 @@ :defaultIndex="[enErrUnlock]" title="防误开" keyName="name" - :itemHeight="70" :visibleItemCount="5" @close="showEnErrUnlock = false" @cancel="showEnErrUnlock = false" diff --git a/pages/setting/lockUser.vue b/pages/setting/lockUser.vue index 6e1e683..536c923 100644 --- a/pages/setting/lockUser.vue +++ b/pages/setting/lockUser.vue @@ -267,6 +267,52 @@ } } } + if (data[i].openLockType === 6) { + for (let j = 0; j < data[i].keys.length; j++) { + data[i].keys[j].openLockType = data[i].openLockType + data[i].keys[j].name = data[i].keys[j].palmVeinName + data[i].keys[j].id = data[i].keys[j].palmVeinId + if (data[i].keys[j].palmVeinType === 1) { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].createDate, 'yyyy-mm-dd hh:MM') + ' 永久' + } else if (data[i].keys[j].palmVeinType === 2) { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].startDate, 'yyyy-mm-dd hh:MM') + + ' - ' + + timeFormat(data[i].keys[j].endDate, 'yyyy-mm-dd hh:MM') + + ' 限时' + } else { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].startDate, 'yyyy-mm-dd') + + ' - ' + + timeFormat(data[i].keys[j].endDate, 'yyyy-mm-dd') + + ' 循环' + } + } + } + if (data[i].openLockType === 7) { + for (let j = 0; j < data[i].keys.length; j++) { + data[i].keys[j].openLockType = data[i].openLockType + data[i].keys[j].name = data[i].keys[j].remoteName + data[i].keys[j].id = data[i].keys[j].remoteId + if (data[i].keys[j].remoteType === 1) { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].createDate, 'yyyy-mm-dd hh:MM') + ' 永久' + } else if (data[i].keys[j].remoteType === 2) { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].startDate, 'yyyy-mm-dd hh:MM') + + ' - ' + + timeFormat(data[i].keys[j].endDate, 'yyyy-mm-dd hh:MM') + + ' 限时' + } else { + data[i].keys[j].timeText = + timeFormat(data[i].keys[j].startDate, 'yyyy-mm-dd') + + ' - ' + + timeFormat(data[i].keys[j].endDate, 'yyyy-mm-dd') + + ' 循环' + } + } + } result.push(...data[i].keys) } console.log(result) diff --git a/pages/setting/notOpenDoor.vue b/pages/setting/notOpenDoor.vue index c0c9dee..235ac35 100644 --- a/pages/setting/notOpenDoor.vue +++ b/pages/setting/notOpenDoor.vue @@ -61,7 +61,6 @@ diff --git a/pages/setting/videoSlot.vue b/pages/setting/videoSlot.vue index 23025aa..c82abc8 100644 --- a/pages/setting/videoSlot.vue +++ b/pages/setting/videoSlot.vue @@ -58,7 +58,6 @@ title="开始时间" mode="time" :defaultIndex="startIndex" - :itemHeight="70" :visibleItemCount="5" @close="showStartTime = false" @cancel="showStartTime = false" @@ -70,7 +69,6 @@ title="结束时间" mode="time" :defaultIndex="endIndex" - :itemHeight="70" :visibleItemCount="5" @close="showEndTime = false" @cancel="showEndTime = false" diff --git a/pages/user/login.vue b/pages/user/login.vue index c58f46b..f218b2e 100644 --- a/pages/user/login.vue +++ b/pages/user/login.vue @@ -94,10 +94,10 @@ abbreviation: 'CN', group: 'Z' }) - const username = ref('') - const password = ref('') + const username = ref('18174429647') + const password = ref('..022059') - const select = ref(false) + const select = ref(true) const pending = ref(false) diff --git a/pages/user/updateEmail.vue b/pages/user/updateEmail.vue index 441b380..daea8a1 100644 --- a/pages/user/updateEmail.vue +++ b/pages/user/updateEmail.vue @@ -1,6 +1,6 @@