diff --git a/pages/catEye/catEye.vue b/pages/catEye/catEye.vue
index 1845169..66d25a5 100644
--- a/pages/catEye/catEye.vue
+++ b/pages/catEye/catEye.vue
@@ -7,9 +7,9 @@
{{
$bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0]
? catEyeMode[
- $bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0]?.catEyeMode - 1
+ $bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0]?.catEyeMode
].name
- : ''
+ : ""
}}
@@ -75,7 +75,7 @@
const value = computed(() => {
const list = []
if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0]) {
- list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode - 1)
+ list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode)
if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode === 4) {
if (
$bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeModeConfig
diff --git a/pages/catEyeMode/catEyeMode.vue b/pages/catEyeMode/catEyeMode.vue
index 58eeb77..d9f3167 100644
--- a/pages/catEyeMode/catEyeMode.vue
+++ b/pages/catEyeMode/catEyeMode.vue
@@ -3,6 +3,58 @@
+
+
+
+
+ {{ catEyeMode[0].name }}：
+
+ 适合门口较为安全的环境。
+ 仅发生特定事件才录像，并可查看实时画面。
+ 一般情况下，满电可使用7-8个月
+
+
+ 查看
+
+
+ {{ catEyeMode[0].name }}：
+ {{ catEyeMode[1].name }}：
- 适合门口较为安全的环境。
- 仅发生特定事件才录像，并可查看实时画面。
- 一般情况下，满电可使用7-8个月 有人逗留或发生特定事件才录像，可随时查看实时画面。
+ 一般情况下，满电可使用5~6个月。
查看
- {{ catEyeMode[1].name }}：{{ catEyeMode[2].name }}：
- 有人逗留或发生特定事件才录像，可随时查看实时画面。
- 一般情况下，满电可使用5~6个月。 适合门口人员复杂、较不安全的环境。
+ 有人出现就录像，可随时查看实时画面。
+ 一般情况下，满电可使用2~4个月。
查看
{{ catEyeMode[2].name }}：
-
- 适合门口人员复杂、较不安全的环境。
- 有人出现就录像，可随时查看实时画面。
- 一般情况下，满电可使用2~4个月。
-
-
- 查看
-
-
-
-
-
-
-
- {{ catEyeMode[3].name }}：
{
const list = []
if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0]) {
- list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode - 1)
+ list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode)
if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode === 4) {
if (
$bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeModeConfig
@@ -331,7 +331,7 @@
const toCustom = () => {
if (
!$bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0] ||
- $bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode !== 4
+ $bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode !== 3
) {
uni.showToast({
title: '请先选择自定义模式',
@@ -352,7 +352,7 @@
const updateCatEyeConfig = index => {
if (
$bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0] &&
- $bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode === index + 1
+ $bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode === index
) {
return
}
@@ -363,7 +363,7 @@
type: 'catEyeConfig',
params: [
{
- catEyeMode: index + 1,
+ catEyeMode: index,
catEyeModeConfig: $bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0]
? $bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeModeConfig
: {
diff --git a/pages/customCatEye/customCatEye.vue b/pages/customCatEye/customCatEye.vue
index 0a222d1..e90cc89 100644
--- a/pages/customCatEye/customCatEye.vue
+++ b/pages/customCatEye/customCatEye.vue
@@ -105,8 +105,8 @@
const value = computed(() => {
const list = []
if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0]) {
- list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode - 1)
- if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode === 4) {
+ list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode)
+ if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode === 3) {
if (
$bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeModeConfig
.recordStartTime === 0 &&
diff --git a/pages/openDirection/openDirection.vue b/pages/openDirection/openDirection.vue
index 37e4b19..34ffcf3 100644
--- a/pages/openDirection/openDirection.vue
+++ b/pages/openDirection/openDirection.vue
@@ -60,7 +60,7 @@
const pending = ref(false)
onMounted(() => {
- value.value = $bluetooth.currentLockSetting.lockSettingInfo.openDirection
+ value.value = $bluetooth.currentLockSetting.lockSettingInfo.openDirectionValue
})
const updateValue = async val => {
diff --git a/pages/passageMode/passageMode.vue b/pages/passageMode/passageMode.vue
index 0a1555e..9960664 100644
--- a/pages/passageMode/passageMode.vue
+++ b/pages/passageMode/passageMode.vue
@@ -24,8 +24,8 @@
:class="[weekDays.includes(index + 1) ? 'bg-#5eb7ac text-white' : '']"
@click="changeSelect(index)"
class="rounded-50% border-solid border-3 border-gray-400 flex items-center justify-center w-70 h-70"
- >{{ item }}
+ >{{ item }}
+
@@ -116,8 +116,8 @@
const defaultStartTime = ref('')
const defaultEndTime = ref('')
- const startTimeText = ref(null)
- const endTimeText = ref(null)
+ const startTimeText = ref('00:00')
+ const endTimeText = ref('00:00')
const check = ref(false)
const weekDays = ref([])
@@ -201,7 +201,7 @@
autoUnlock: autoUnlock.value
}
- if (check.value && data.startDate >= data.endDate) {
+ if (check.value && data.startDate > data.endDate) {
uni.showToast({
title: '开始时间不能大于结束时间',
icon: 'none'
diff --git a/pages/realTimePicture/realTimePicture.vue b/pages/realTimePicture/realTimePicture.vue
index 783d46a..d19023a 100644
--- a/pages/realTimePicture/realTimePicture.vue
+++ b/pages/realTimePicture/realTimePicture.vue
@@ -108,7 +108,7 @@
const value = computed(() => {
const list = []
if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0]) {
- list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode - 1)
+ list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode)
if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode === 4) {
if (
$bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeModeConfig
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 49ff5a1..a2afb14 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -5,7 +5,9 @@
@click="toJump('lockInfo')"
>
基本信息
-
+
+
+
面容开锁
-
+
+
+
消息提醒
-
+
+
+
猫眼设置
-
+
+
+
开门方向设置
-
+
+
+
电机功率设置
-
+
+
+
锁时间
-
+
+
+
上传数据
-
+
+
+
锁升级
-
+
+
+
删除
+ >删除
+
- 本操作将上传锁内数据到服务器，过程可能需要几分钟，请耐心等待
+ 本操作将上传锁内数据到服务器，过程可能需要几分钟，请耐心等待
{
if (pending.value && !flag) return
+ const netWork = await $basic.getNetworkType()
+ if (!netWork) {
+ return
+ }
pending.value = true
uni.showLoading({
title: `上传中${progress.value}/7`
@@ -45,6 +51,7 @@
uid: $user.userInfo.uid.toString(),
countReq: 10
})
+ console.log('code value :', code)
if (code === 0) {
if (typeList[progress.value] === 'setting') {
const { code: resultCode } = await lockDataUploadRequest({
@@ -60,6 +67,14 @@
lockId: $bluetooth.currentLockInfo.lockId
})
if (code === 0) {
+ if (data.lockSettingInfo.catEyeConfig[0]) {
+ data.lockSettingInfo.catEyeConfig[0].catEyeModeConfig.recordTime = Number(
+ data.lockSettingInfo.catEyeConfig[0].catEyeModeConfig.recordTime
+ )
+ data.lockSettingInfo.catEyeConfig[0].catEyeModeConfig.detectionDistance = Number(
+ data.lockSettingInfo.catEyeConfig[0].catEyeModeConfig.detectionDistance
+ )
+ }
$bluetooth.updateCurrentLockSetting(data)
}
uni.showToast({
@@ -99,12 +114,16 @@
progress.value++
}
await asyncData(true)
+ } else if (code === -21) {
+ pending.value = false
+ $bluetooth.closeBluetoothConnection()
+ uni.hideLoading()
} else {
pending.value = false
$bluetooth.closeBluetoothConnection()
uni.hideLoading()
uni.showToast({
- title: '上传失败，请重试',
+ title: '上传失败，请保持在锁附近',
icon: 'none'
})
}
diff --git a/pages/videoSlot/videoSlot.vue b/pages/videoSlot/videoSlot.vue
index 0561ac9..289bfcd 100644
--- a/pages/videoSlot/videoSlot.vue
+++ b/pages/videoSlot/videoSlot.vue
@@ -101,7 +101,7 @@
const value = computed(() => {
const list = []
if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0]) {
- list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode - 1)
+ list.push($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode)
if ($bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeMode === 4) {
if (
$bluetooth.currentLockSetting.lockSettingInfo.catEyeConfig[0].catEyeModeConfig
diff --git a/stores/bluetooth.js b/stores/bluetooth.js
index 594f8bf..66c2baa 100644
--- a/stores/bluetooth.js
+++ b/stores/bluetooth.js
@@ -551,10 +551,10 @@ export const useBluetoothStore = defineStore('ble', {
})
break
case subCmdIds.updateSetting:
- that.updateCurrentLockInfo({
- ...that.currentLockInfo,
- token: decrypted.slice(5, 9)
- })
+ // that.updateCurrentLockInfo({
+ // ...that.currentLockInfo,
+ // token: decrypted.slice(5, 9)
+ // })
characteristicValueCallback({
code: decrypted[2]
})
@@ -797,6 +797,9 @@ export const useBluetoothStore = defineStore('ble', {
if (uuid && uuid.slice(2, 8) === '758824' && uuid.slice(30, 32) === '00') {
that.deviceList.push(deviceList[i])
}
+ if (uuid && uuid.slice(0, 2) === '75' && uuid.slice(4, 6) === '00') {
+ that.deviceList.push(deviceList[i])
+ }
}
}
console.log('设备列表', that.deviceList)
@@ -1073,6 +1076,11 @@ export const useBluetoothStore = defineStore('ble', {
for (let i = 0; i < deviceList.length; i++) {
if (deviceList[i]?.name === that.currentLockInfo.name) {
const uuid = deviceList[i]?.advertisServiceUUIDs[0]
+ if (uuid && uuid.slice(2, 8) === '758824') {
+ console.log('设备UUID', uuid, uuid.slice(2, 8), uuid.slice(30, 32))
+ } else if (uuid && uuid.slice(0, 2) === '75') {
+ console.log('设备UUID', uuid, uuid.slice(2, 8), uuid.slice(4, 6))
+ }
if (
uuid &&
uuid.slice(2, 8) === '758824' &&
@@ -1106,6 +1114,30 @@ export const useBluetoothStore = defineStore('ble', {
code: -2
})
break
+ } else if (uuid && uuid.slice(0, 2) === '75' && uuid.slice(4, 6) === '01') {
+ uni.stopBluetoothDevicesDiscovery()
+ clearTimeout(timer2)
+ clearInterval(timer1)
+ resolve({
+ code: 0,
+ data: {
+ deviceId: deviceList[i].deviceId
+ }
+ })
+ break
+ } else if (uuid && uuid.slice(0, 2) === '75' && uuid.slice(4, 6) === '00') {
+ uni.stopBluetoothDevicesDiscovery()
+ clearTimeout(timer2)
+ clearInterval(timer1)
+ uni.hideLoading()
+ uni.showToast({
+ title: '锁已被重置，请重新绑定',
+ icon: 'none'
+ })
+ resolve({
+ code: -2
+ })
+ break
} else {
uni.stopBluetoothDevicesDiscovery()
clearTimeout(timer2)
@@ -1475,7 +1507,7 @@ export const useBluetoothStore = defineStore('ble', {
console.log('写入未执行', this.bluetoothStatus)
this.getBluetoothStatus()
return {
- code: -21
+ code: -1
}
}
@@ -2900,6 +2932,7 @@ export const useBluetoothStore = defineStore('ble', {
)
contentArray.set(md5Array, withParams ? 71 + params.length : 71)
+ console.log('加密前：', Array.from(contentArray))
const cebArray = sm4.encrypt(contentArray, this.currentLockInfo.commKey, {
mode: 'ecb',
@@ -2919,7 +2952,7 @@ export const useBluetoothStore = defineStore('ble', {
console.log('写入未执行', this.bluetoothStatus)
this.getBluetoothStatus()
return {
- code: -21
+ code: -1
}
}
@@ -2997,7 +3030,7 @@ export const useBluetoothStore = defineStore('ble', {
console.log('写入未执行', this.bluetoothStatus)
this.getBluetoothStatus()
return {
- code: -1
+ code: -21
}
}