From e3a54bd1e655ac9cc95751baed8d73135b307744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Sat, 24 Aug 2024 14:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BB=91=E5=AE=9A=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=85=A8=E9=83=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/check.js                          |  12 ++
 api/geocode.js                        |  12 ++
 api/lock.js                           |   9 +
 manifest.json                         |  64 +------
 pages.json                            |  22 ++-
 pages/bindLock/bindLock.vue           | 186 +++++++++++++++++++
 pages/home/home.vue                   |  25 ++-
 pages/index/index.vue                 |   6 +-
 pages/searchDevice/searchDevice.vue   | 150 ++++++++++++++-
 pages/selectAddress/selectAddress.vue | 256 ++++++++++++++++++++++++++
 static/images/icon_add.png            | Bin 4447 -> 880 bytes
 static/images/icon_add_round.png      | Bin 0 -> 4447 bytes
 static/images/icon_address.png        | Bin 0 -> 1813 bytes
 static/images/icon_door_lock.png      | Bin 0 -> 3495 bytes
 stores/basic.js                       |  27 +++
 stores/bluetooth.js                   |  78 +++++---
 stores/user.js                        |   2 +-
 utils/request.js                      |   1 +
 18 files changed, 755 insertions(+), 95 deletions(-)
 create mode 100644 api/check.js
 create mode 100644 api/geocode.js
 create mode 100644 pages/bindLock/bindLock.vue
 create mode 100644 pages/selectAddress/selectAddress.vue
 create mode 100644 static/images/icon_add_round.png
 create mode 100644 static/images/icon_address.png
 create mode 100755 static/images/icon_door_lock.png

diff --git a/api/check.js b/api/check.js
new file mode 100644
index 0000000..215667c
--- /dev/null
+++ b/api/check.js
@@ -0,0 +1,12 @@
+import request from '../utils/request'
+
+// check 检查模块
+
+// 获取服务器时间
+export function getServerDatetime(data) {
+  return request({
+    url: '/check/getServerDatetime',
+    method: 'POST',
+    data
+  })
+}
diff --git a/api/geocode.js b/api/geocode.js
new file mode 100644
index 0000000..dd85388
--- /dev/null
+++ b/api/geocode.js
@@ -0,0 +1,12 @@
+import request from '../utils/request'
+
+// geocode 地理编码模块
+
+// 获取地址信息
+export function getGeocodeAddress(data) {
+  return request({
+    url: '/geocode/getAddress',
+    method: 'POST',
+    data
+  })
+}
diff --git a/api/lock.js b/api/lock.js
index d1f39b7..9931b27 100644
--- a/api/lock.js
+++ b/api/lock.js
@@ -10,3 +10,12 @@ export function getLockListRequest(data) {
     data
   })
 }
+
+// 绑定锁管理员
+export function bindLockAdmin(data) {
+  return request({
+    url: '/v2/lock/bindAdmin',
+    method: 'POST',
+    data
+  })
+}
diff --git a/manifest.json b/manifest.json
index 5330fd3..35562d9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,49 +5,6 @@
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "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\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "wx9829a39e65550757",
@@ -55,20 +12,17 @@
             "urlCheck" : true,
             "minified" : true
         },
+        "permission": {
+            "scope.bluetooth": {
+                "desc": "蓝牙将用于控制和管理您的智能门锁"
+            },
+            "scope.userLocation": {
+                "desc": "获取您的位置信息将用于智能门锁的位置服务"
+            }
+        },
+        "requiredPrivateInfos": ["getLocation"],
         "usingComponents" : true,
         "lazyCodeLoading" : "requiredComponents"
     },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
     "vueVersion" : "3"
 }
diff --git a/pages.json b/pages.json
index 9c0ec72..cba01fd 100644
--- a/pages.json
+++ b/pages.json
@@ -17,6 +17,16 @@
 				"navigationStyle": "default"
 			}
 		},
+		{
+			"path": "pages/selectAddress/selectAddress",
+			"style": {
+				"navigationBarTitleText": "锁地址",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#63b8af",
+				"navigationStyle": "default",
+				"disableScroll": true
+			}
+		},
 		{
 			"path": "pages/mine/mine",
 			"style": {
@@ -110,10 +120,20 @@
 				"navigationStyle": "default"
 			}
 		},
+		{
+			"path": "pages/bindLock/bindLock",
+			"style": {
+				"navigationBarTitleText": "添加锁",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#63b8af",
+				"navigationStyle": "default"
+			}
+		},
 		{
 			"path": "pages/searchDevice/searchDevice",
 			"style": {
-				"navigationBarTitleText": "搜索",
+				"disableScroll": true,
+				"navigationBarTitleText": "附近设备",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#63b8af",
 				"navigationStyle": "default"
diff --git a/pages/bindLock/bindLock.vue b/pages/bindLock/bindLock.vue
new file mode 100644
index 0000000..d88b2d3
--- /dev/null
+++ b/pages/bindLock/bindLock.vue
@@ -0,0 +1,186 @@
+<template>
+  <view>
+    <view class="text">如需修改名字请重新命名，点击确定添加锁</view>
+    <input class="input" :value="name" maxlength="32" placeholder="请输入名称" placeholder-class="input-placeholder"
+           @input="uopdateName"
+    ></input>
+    <view class="button" @click="bindLock">确定</view>
+  </view>
+</template>
+
+<script>
+import { useBluetoothStore } from '@/stores/bluetooth'
+import { useUserStore } from '@/stores/user'
+import { mapActions, mapState } from 'pinia'
+import { bindLockAdmin } from '@/api/lock'
+import { useLockStore } from '@/stores/lock'
+
+export default {
+  data () {
+    return {
+      name: ''
+    }
+  },
+  computed: {
+    ...mapState(useBluetoothStore, ['currentLockInfo', 'keyId']),
+    ...mapState(useUserStore, ['userInfo']),
+  },
+  onLoad() {
+    this.name = this.currentLockInfo.name
+    console.log(this.currentLockInfo)
+    console.log(this.name)
+  },
+  methods: {
+    ...mapActions(useBluetoothStore, ['addLockUser']),
+    ...mapActions(useLockStore, ['getLockList']),
+    uopdateName(data) {
+      this.name = data.detail.value
+    },
+    async bindLock() {
+      if(this.name === '') {
+        uni.showToast({
+          title: '请输入名称',
+          icon: 'none'
+        })
+        return
+      }
+      uni.showLoading({
+        title: '添加中'
+      })
+      const timestamp = parseInt(new Date().getTime() / 1000)
+      const password = (Math.floor(Math.random() * 900000) + 100000).toString()
+      const { code: addUserCode } = await this.addLockUser({
+        name: this.currentLockInfo.name,
+        keyId: this.keyId,
+        authUid: this.userInfo.uid.toString(),
+        uid: this.userInfo.uid.toString(),
+        openMode: 1,
+        keyType: 1,
+        startDate: timestamp,
+        expireDate: 0xffffffff,
+        useCountLimit: 0xffff,
+        isRound: 0,
+        weekRound: 0,
+        startHour: 0,
+        startMin: 0,
+        endHour: 0,
+        endMin: 0,
+        role: 0xff,
+        password
+      })
+      if(addUserCode !== 0) {
+        uni.navigateBack({
+          complete() {
+            uni.showToast({
+              title: '添加失败，请重试',
+              icon: 'none'
+            })
+          }
+        })
+        uni.hideLoading()
+        return
+      }
+      const params = {
+        lockAlias: this.name,
+        lockInfo: {
+          ...this.currentLockInfo.lockConfig,
+          adminPwd: password
+        },
+        bluetooth: {
+          bluetoothDeviceName: this.currentLockInfo.name,
+          bluetoothDeviceId: this.currentLockInfo.deviceId,
+          publicKey: this.currentLockInfo.publicKey,
+          privateKey: this.currentLockInfo.commKey,
+          signKey: this.currentLockInfo.signKey,
+        },
+        lockUserNo: this.currentLockInfo.lockUserNo,
+        pwdTimestamp: this.currentLockInfo.pwdTimestamp,
+        featureValue: this.currentLockInfo.featureValue,
+        featureSettingValue: this.currentLockInfo.featureSettingValue,
+        featureSettingParams: this.currentLockInfo.featureSettingParams
+      }
+      if(this.currentLockInfo.position) {
+        params.position = {
+          latitude: this.currentLockInfo.position.latitude,
+          longitude: this.currentLockInfo.position.longitude,
+          province: this.currentLockInfo.position.province,
+          city: this.currentLockInfo.position.city,
+          district: this.currentLockInfo.position.district,
+          country: this.currentLockInfo.position.country,
+          township: this.currentLockInfo.position.township,
+          address: this.currentLockInfo.position.address
+        }
+      }
+      const { code, message } = await bindLockAdmin(params)
+      console.log('添加锁返回', code, message)
+      if(code === 0) {
+        this.getLockList({
+          pageNo: 1,
+          pageSize: 50
+        })
+        uni.hideLoading()
+        uni.navigateBack({
+          complete() {
+            uni.showToast({
+              title: '添加成功',
+              icon: 'none'
+            })
+          }
+        })
+      } else {
+        uni.hideLoading()
+        uni.showToast({
+          title: message,
+          icon: 'none'
+        })
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss">
+page {
+  background-color: $uni-bg-color-grey;
+}
+</style>
+
+<style lang="scss" scoped>
+.text {
+  color: #2b2a28;
+  padding: 100rpx 0;
+  font-size: 34rpx;
+  text-align: center;
+}
+
+.input {
+  border-radius: 16rpx;
+  background: #FFFFFF;
+  margin-left: 35rpx;
+  margin-top: 24rpx;
+  height: 108rpx;
+  width: 616rpx;
+  padding-left: 32rpx;
+  padding-right: 32rpx;
+}
+
+.input-placeholder {
+  height: 108rpx;
+  font-size: 36rpx;
+  font-weight: bold;
+  line-height: 108rpx;
+}
+
+.button {
+  margin-top: 160rpx;
+  margin-left: 35rpx;
+  width: 680rpx;
+  height: 96rpx;
+  background: #63b8af;
+  border-radius: 16rpx;
+  line-height: 96rpx;
+  text-align: center;
+  font-size: 32rpx;
+  color: #FFFFFF;
+}
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d96a461..57f6010 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -2,8 +2,8 @@
 	<view>
     <view v-if="!penging">
       <view v-if="isLogin">
-        <scroll-view scroll-y="true" :style="{ height: 'calc(100vh)' }" lower-threshold="100"
-                     @refresherrefresh="refresherList" :refresher-enabled="true" @scrolltolower="nextPage"
+        <scroll-view v-if="deviceInfo" scroll-y="true" :style="{ height: deviceInfo.windowHeight + 'px' }"
+                     lower-threshold="100" @refresherrefresh="refresherList" :refresher-enabled="true" @scrolltolower="nextPage"
                      :refresher-triggered="refresherTriggered">
           <view class="search">
             <up-search :searchIconSize="48" :inputStyle="{ fontSize: '32rpx' }" @focus="getFocus" @blur="getBlur"
@@ -12,7 +12,8 @@
           </view>
           <view class="lock-list" v-if="!penging">
             <view v-if="lockList.length === 0 && search.searchStr === '' && !focus">
-              <image src="/static/images/icon_add.png" mode="aspectFill" class="button-add-big" @click="toSearchDevice"></image>
+              <image src="/static/images/icon_add_round.png" mode="aspectFill" class="button-add-big"
+                     @click="toSearchDevice"></image>
               <view class="text">填加锁时，手机必须在锁旁边</view>
             </view>
             <view v-else>
@@ -32,9 +33,9 @@
                       <view>{{getRole(lock.userType)}}</view>
                     </view>
                   </view>
-                  <view class="lock-name">{{lock.lockName}}</view>
+                  <view class="lock-name">{{lock.lockAlias}}</view>
                   <view class="lock-time">
-                    <view v-if="lock.keyType !== 1" style="font-size: 32rpx">{{ getTimeLimit(lock.keyType) }}</view>
+                    <view v-if="lock.keyType === 1" style="font-size: 32rpx">{{ getTimeLimit(lock.keyType) }}</view>
                     <view v-else>
                       <view>{{ timeFormat(lock.startDate, 'yyyy-mm-dd h:M') }}</view>
                       <view>{{ timeFormat(lock.endDate, 'yyyy-mm-dd h:M ') + getTimeLimit(lock.keyType) }}</view>
@@ -45,7 +46,7 @@
             </view>
           </view>
         </scroll-view>
-        <image v-if="lockList.length !== 0" src="/static/images/icon_add.png" mode="aspectFill"
+        <image v-if="lockList.length !== 0" src="/static/images/icon_add_round.png" mode="aspectFill"
                class="button-add" @click="toSearchDevice"></image>
       </view>
       <view v-else>
@@ -63,6 +64,7 @@
   import { useBluetoothStore } from '@/stores/bluetooth'
   import { useBasicStore } from '@/stores/basic'
   import { mapState, mapActions } from 'pinia'
+  import { getServerDatetime } from '@/api/check'
 
 	export default {
 		data() {
@@ -74,7 +76,8 @@
         },
         refresherTriggered: false,
         focus: false,
-        penging: true
+        penging: true,
+        deviceInfo: null
 			}
 		},
     computed: {
@@ -86,6 +89,8 @@
       uni.showLoading({
         title: '加载中'
       })
+      this.deviceInfo = await this.getDeviceInfo()
+      console.log(this.deviceInfo)
       const token = uni.getStorageSync('token')
       if(token) {
         this.updateLoginStatus(true)
@@ -102,7 +107,7 @@
       ...mapActions(useUserStore, ['updateUserInfo', 'updateLoginStatus', 'login']),
       ...mapActions(useLockStore, ['getLockList', 'getRole', 'getTimeLimit']),
       ...mapActions(useBluetoothStore, ['getBluetoothStatus', 'initAndListenBluetooth', 'updateCurrentLockInfo', 'checkSetting']),
-      ...mapActions(useBasicStore, ['routeJump']),
+      ...mapActions(useBasicStore, ['routeJump', 'getDeviceInfo']),
       async nextPage() {
         if(this.lockList.length < this.lockTotal) {
           this.search.pageNo++
@@ -116,6 +121,10 @@
         this.refresherTriggered = true
         this.search.pageNo = 1
         await this.getLockList(this.search)
+        uni.showToast({
+          title: '刷新成功',
+          icon: 'none'
+        })
         this.refresherTriggered = false
       },
       async changeSearch(data) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c4ed272..dc0afa9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -164,12 +164,12 @@
         console.log('添加用户返回', addUserCode)
       },
       getLockStatusResult() {
-        const timnestamp = parseInt(new Date().getTime() / 1000)
+        const timestamp = parseInt(new Date().getTime() / 1000)
         this.getLockStatus({
           name: this.currentLockInfo.name,
           uid: this.authUid,
-          nowTime: timnestamp,
-          localTime: timnestamp
+          nowTime: timestamp,
+          localTime: timestamp
         })
       }
 		}
diff --git a/pages/searchDevice/searchDevice.vue b/pages/searchDevice/searchDevice.vue
index 608c2be..2cc7af6 100644
--- a/pages/searchDevice/searchDevice.vue
+++ b/pages/searchDevice/searchDevice.vue
@@ -1,17 +1,161 @@
 <template>
   <view>
-
+    <scroll-view v-if="deviceInfo" class="scroll-view" scroll-y="true" :style="{ height: deviceInfo.screenHeight - deviceInfo.statusBarHeight + 'px' }">
+      <view style="padding-bottom: calc(env(safe-area-inset-bottom) + 300rpx)">
+        <view class="device" v-for="device in deviceList" @click="connect(device)">
+          <view class="device" style="justify-content:flex-start;">
+            <image  class="device-lock" src="/static/images/icon_door_lock.png"></image>
+            <view class="device-name">{{device.name}}</view>
+          </view>
+          <image class="device-add" src="/static/images/icon_add.png"></image>
+        </view>
+      </view>
+    </scroll-view>
+    <view class="loading">
+      <up-loading-icon size="80rpx" text="搜索中" :vertical="true" textSize="32rpx"></up-loading-icon>
+    </view>
   </view>
 </template>
 
 <script>
+import { mapState, mapActions } from 'pinia'
+import { useBluetoothStore } from '@/stores/bluetooth'
+import { useBasicStore } from '@/stores/basic'
+import { useUserStore } from '@/stores/user'
+
 export default {
   data () {
-    return {}
+    return {
+      deviceInfo: null
+    }
+  },
+  computed: {
+    ...mapState(useBluetoothStore, ['deviceList', 'currentLockInfo', 'serverTimestamp', 'keyId']),
+    ...mapState(useUserStore, ['userInfo'])
+  },
+  async onLoad() {
+    this.deviceInfo = await this.getDeviceInfo()
+    this.getBluetoothDevices()
+  },
+  onUnload() {
+    this.stopGetBluetoothDevices()
+  },
+  methods: {
+    ...mapActions(useBluetoothStore, ['getBluetoothDevices', 'stopGetBluetoothDevices', 'updateCurrentLockInfo',
+      'getPublicKey', 'getCommKey', 'connectBluetoothDevice', 'updateServerTimestamp', 'getLockStatus']),
+    ...mapActions(useBasicStore, ['getDeviceInfo', 'routeJump']),
+    async connect(device) {
+      uni.showLoading({
+        title: '连接中',
+        // mask: true
+      })
+      const { code: serverTimestampCode, message } = await this.updateServerTimestamp()
+      if(serverTimestampCode !== 0) {
+        uni.showToast({
+          title: message,
+          icon: 'none'
+        })
+        uni.hideLoading()
+        return
+      }
+      this.updateCurrentLockInfo({
+        name: device.name,
+        deviceId: device.deviceId
+      })
+      const result = await this.connectBluetoothDevice()
+      this.stopGetBluetoothDevices()
+      if(result) {
+        const { code: getPublicKeyCode } = await this.getPublicKey(this.currentLockInfo.name)
+        console.log('获取公钥返回', getPublicKeyCode, [...this.currentLockInfo.publicKey])
+        if(getPublicKeyCode !== 0) {
+          uni.hideLoading()
+          uni.showToast({
+            title: '连接失败，请重试',
+            icon: 'none'
+          })
+          return
+        }
+        const { code: getCommKeyCode } = await this.getCommKey(this.currentLockInfo.name, this.keyId,
+            this.userInfo.uid.toString(), this.serverTimestamp)
+        console.log('获取私钥返回', getCommKeyCode)
+        if(getCommKeyCode !== 0) {
+          uni.hideLoading()
+          uni.showToast({
+            title: '连接失败，请重试',
+            icon: 'none'
+          })
+          return
+        }
+        const timestamp = parseInt(new Date().getTime() / 1000)
+        const { code } = await this.getLockStatus({
+          name: this.currentLockInfo.name,
+          uid: this.userInfo.uid,
+          nowTime: this.serverTimestamp,
+          localTime: timestamp
+        })
+        if (code !== 0) {
+          uni.hideLoading()
+          uni.showToast({
+            title: '连接失败，请重试',
+            icon: 'none'
+          })
+          return
+        }
+        this.routeJump({
+          type: 'redirectTo',
+          name: 'selectAddress'
+        })
+      } else {
+        this.getBluetoothDevices()
+        uni.showToast({
+          title: '连接失败，请重试',
+          icon: 'none'
+        })
+        uni.hideLoading()
+      }
+    }
   }
 }
 </script>
 
 <style lang="scss">
-
+page {
+  background-color: $uni-bg-color-grey;
+}
+</style>
+
+<style lang="scss" scoped>
+.loading {
+  position: fixed;
+  bottom: calc(env(safe-area-inset-bottom) + 50rpx) ;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.device {
+  background: #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 100rpx;
+
+  .device-lock {
+    margin-left: 24rpx;
+    width: 72rpx;
+    height: 72rpx;
+  }
+
+  .device-name {
+    margin-left: 24rpx;
+    font-size: 28rpx;
+    font-weight: bold;
+  }
+
+  .device-add {
+    float: right;
+    width: 60rpx;
+    height: 60rpx;
+    margin-right: 24rpx;
+  }
+}
 </style>
diff --git a/pages/selectAddress/selectAddress.vue b/pages/selectAddress/selectAddress.vue
new file mode 100644
index 0000000..516ade8
--- /dev/null
+++ b/pages/selectAddress/selectAddress.vue
@@ -0,0 +1,256 @@
+<template>
+  <view>
+    <view class="title">地理位置</view>
+    <view v-if="show">
+      <map class="map" :longitude="longitude" :latitude="latitude" :scale="16" :markers="markers"
+           :enable-zoom="false" :enable-scroll="false"></map>
+    </view>
+    <view v-else class="map"></view>
+    <view class="explain">检查以确保以下地址是正确的</view>
+    <view class="view-address" :style="{height: calculateStringTotalWidth(address) > 44 ? '120rpx' : '80rpx'}">
+      <view class="address">{{ address }}</view>
+    </view>
+    <view class="bottom">
+      <view class="skip" @click="skipAddress">跳过</view>
+      <view class="confirm" @click="toBindLock">下一步</view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { test } from 'uview-plus'
+import { useBasicStore } from '@/stores/basic'
+import { mapState, mapActions } from 'pinia'
+import { getGeocodeAddress } from '@/api/geocode'
+import { useBluetoothStore } from '@/stores/bluetooth'
+
+export default {
+  data () {
+    return {
+      latitude: null,
+      longitude: null,
+      show: false,
+      markers: [],
+      address: '',
+      first: true
+    }
+  },
+  computed: {
+    ...mapState(useBluetoothStore, ['currentLockInfo'])
+  },
+  onLoad() {
+    this.getLocation()
+  },
+  onShow() {
+    if(this.first) {
+      this.first = false
+    } else {
+      if(!this.show) {
+        this.getLocation()
+      }
+    }
+  },
+  methods: {
+    ...mapActions(useBasicStore, ['routeJump', 'calculateStringTotalWidth']),
+    ...mapActions(useBluetoothStore, ['updateCurrentLockInfo']),
+    toBindLock() {
+      const that = this
+      if(this.address === '') {
+        uni.showModal({
+          title: '提示',
+          content: '暂未获取到地理位置信息，请重试',
+          confirmText: '重试',
+          success: (res) => {
+            if(res.confirm) {
+              that.getLocation()
+            }
+          }
+        })
+        return
+      }
+      this.routeJump({
+        type: 'redirectTo',
+        name: 'bindLock'
+      })
+    },
+    skipAddress() {
+      const that = this
+      if(this.address !== '') {
+        uni.showModal({
+          title: '提示',
+          content: '已获取当前地理位置，确定跳过吗',
+          confirmText: '跳过',
+          cancelText: '取消',
+          success: (res) => {
+            if(res.confirm) {
+              const lockInfo = that.currentLockInfo
+              delete lockInfo.position
+              that.updateCurrentLockInfo(lockInfo)
+              this.routeJump({
+                type: 'redirectTo',
+                name: 'bindLock'
+              })
+            }
+          }
+        })
+        return
+      }
+      this.routeJump({
+        type: 'redirectTo',
+        name: 'bindLock'
+      })
+    },
+    async getLocation() {
+      const that = this
+      uni.getLocation({
+        isHighAccuracy: true,
+        type: 'gcj02',
+        async success (res) {
+          that.latitude = res.latitude
+          that.longitude = res.longitude
+          that.markers = [{
+            id: 1,
+            latitude: res.latitude,
+            longitude: res.longitude,
+            iconPath: '/static/images/icon_address.png',
+            width: '48rpx',
+            height: '48rpx'
+          }]
+          that.show = true
+          const { code, data: result } = await getGeocodeAddress({
+            latitude: that.latitude,
+            longitude: that.longitude
+          })
+          if(code === 0) {
+            that.address = result.addr
+            const position = {
+              ...result,
+              latitude: that.latitude,
+              longitude: that.longitude
+            }
+            console.log('获取地理位置信息', that.currentLockInfo)
+            that.updateCurrentLockInfo({
+              ...that.currentLockInfo,
+              position
+            })
+            console.log('获取地理位置信息', that.currentLockInfo)
+          }
+        },
+        fail (res) {
+          if(res.errMsg === 'getLocation:fail auth deny') {
+            uni.showModal({
+              title: '提示',
+              content: '拒绝授权将无法使用定位功能',
+              confirmText: '去授权',
+              cancelText: '跳过',
+              success (res) {
+                if (res.confirm) {
+                  uni.openSetting()
+                } else {
+                  that.routeJump({
+                    type: 'redirectTo',
+                    name: 'bindLock'
+                  })
+                }
+              }
+            })
+          } else {
+            uni.showModal({
+              title: '提示',
+              content: '获取地理位置信息失败',
+              confirmText: '重试',
+              cancelText: '跳过',
+              success (res) {
+                if (res.confirm) {
+                  that.getLocation()
+                } else {
+                  that.routeJump({
+                    type: 'redirectTo',
+                    name: 'bindLock'
+                  })
+                }
+              }
+            })
+          }
+        }
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss">
+page {
+  background-color: $uni-bg-color-grey;
+}
+</style>
+
+<style lang="scss" scoped>
+.map {
+  width: 750rpx;
+  height: 650rpx;
+}
+
+.title {
+  padding: 40rpx 30rpx;
+  font-size: 80rpx;
+  font-weight: bold;
+}
+
+.explain {
+  padding: 20rpx 30rpx 0 30rpx;
+  font-size: 40rpx;
+}
+
+.view-address {
+  display: flex;
+  align-items: center;
+  width: 690rpx;
+  color: #c4c4c4;
+  font-size: 32rpx;
+  margin: 0 30rpx;
+  border-bottom: #63b8af 3rpx solid;
+
+  .address {
+    width: 690rpx;
+    text-align: left;
+    word-break: break-all;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal;
+  }
+}
+
+.bottom {
+  width: 600rpx;
+  display: flex;
+  justify-content: space-between;
+  padding:  0 75rpx;
+  position: fixed;
+  bottom: calc(30rpx + env(safe-area-inset-bottom));
+
+  .skip {
+    width: 225rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    font-size: 36rpx;
+    border-radius: 64rpx;
+    border: 3rpx solid #63b8af;
+  }
+
+  .confirm {
+    border-radius: 64rpx;
+    color: #FFFFFF;
+    background-color: #63b8af;
+    width: 225rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+    font-size: 36rpx;
+  }
+}
+</style>
diff --git a/static/images/icon_add.png b/static/images/icon_add.png
index d0f9a4d9e417a0708aa4e6b772c4222262585c56..937c30ba4f057d8692209e55f28367f53a7e7b92 100644
GIT binary patch
literal 880
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>VAk?<aSW-5
zdwbW{PuY>D?cuA*yqlX-&l%iFejs;7a#M@!!xTx^&VVZu<W+8^p5hnUtx;C{?@?9m
zf|;|{U*hsv>i_;jFJss221bbmJD864uV*%JC}i!Dk7rM4c*G@QzmM+#!%<O<x*FLA
z#xCuEKR>J(m_@=D{P<YPz^1Xz;p5}i3_JlbjgO9BhZ+#SiusQHdiia^zf0FWyS&ZT
z?(SN%(3-%D4E5^`4lpzGtT?cc+2BB6ZfV2Ji~QjYd<F^38CD05uX@E`b)aMZ*YoF>
zFu!2fZ79Ifbl`F<KMP-t@(!jL#&r#rU-<qs{x2|*bzr~1Si%r|U?aOulTOpC00y=L
z3=#~?2@E_1&#rCel#$>xKnQ(U*WfzA^}>NG=GIaiER704V;uxIm>eHy^50<LJJSLe
zPyopmtZxY25c=W3jeOCXjXSIw_zEtn9Nu$4P9cN8;QyX|nQPzf3$B%&Cs3xj{_K|A
z{FOrXDxXWX|N7>BU8jikPi5r(G!utoi|Q1YpWT1^>U;e?|5i;mIuL5Kv_g=1iH7rj
z6^RA&ziBENJ9HU+@or-Ll{sI@2wCF44D%baJWZ9^svi%FJI+>>OWuD%P9gbYxn(3P
z``RW+h1E<v56YR+<qBBOu-^QCdd3u<%`WkY3~UjH!Y%I$vm`O_G%)^&1%?bT1Wr`O
z>rWJALxfG;$C?IJz56QfI~m~t)KJa}3dBhQQ4UflL9yH>L0Ezzd9PCgIJm%}1B#Np
zOkoGZ4(^>{W4BK8fJg$D0qYDVAI4=2!3{v}hn4JqbQI*y9afqJ5^Q)BeBf-^E(_K@
zl};WJ!D1`6Gc5(`J$g=JKBG~Xs)0Hihlq8u2HS~<sR!mrC<MIeSty~99LiLj)Znnu
qxGkxnCzSI{CnFP3Ll+e^{9_h==sW*-1^*8QAn<hcb6Mw<&;$SgkW703

literal 4447
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
Af&c&j

diff --git a/static/images/icon_add_round.png b/static/images/icon_add_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0f9a4d9e417a0708aa4e6b772c4222262585c56
GIT binary patch
literal 4447
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
Af&c&j

literal 0
HcmV?d00001

diff --git a/static/images/icon_address.png b/static/images/icon_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2ddd5e85d9439344be96586863e86149601fa36
GIT binary patch
literal 1813
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
DAlxC4

literal 0
HcmV?d00001

diff --git a/static/images/icon_door_lock.png b/static/images/icon_door_lock.png
new file mode 100755
index 0000000000000000000000000000000000000000..72dd4b9db05e3780244dcc8968d7f17a16d669eb
GIT binary patch
literal 3495
zcmZ`+XHXMNw+<MP8VsPc5K2HmilIqDmENR;8k+Q?QbP+xKtw_j5Gm3@q*wq!Uj!tS
zfDl7_RR|Dz6{Q!IjyK$yd*}P}&FtB;bGFRxIlJe1Hrd=%pOuN12><}F8XD+WP&Mvc
z80e|B>Wa~M2V<atT`&N^%yBL>fPx}!>R>xV9Zf52(MEAp;AJvDvBO*7nK5*UPUL}y
zfq@q9ootaVk#DYUtO<8q0`=<CN76$lTmh#SRIJxS)_nxxYnAyg<6<GlWsR&MI%Uh`
zln^+WK}TFi@Y5HOr-DjC-!(B?n<ZxrUku46VO#A=D|;)0ZIs~s{g#!Jp%N|>=c9PS
z0TZH$xpQ0Q7AW!Re@gr$T|I}P5I67hAN&=~qh>+B>2+<d>zZlwkkx<xp3zJxM8&Pd
zJpojRfvLr#8thSZX~0zMv#DraetCNd_ti_yq^|@R;b$NFFE+~%9dUc*%aD$mxp6w4
zr@kB3Kq%UAz#T<{dkO)y@Bk$kfj4jZFLFmq>s!$(3v&)`FoB9QgH}0uaxmE|!RSb_
z47!NdQqSW?i0xV077TUKRn(Q}T6sks+vaN*ysOz&%_UrdWN}D&gtL-nd*+J(1_Y(5
ztX)$pxK%|l0d-|52yH1kx7h;u#y%~R7KE3+DD)%69HK6{`1^uvld*eBTBGn?qlkea
zLBQ`#X@OMzWx*dw;^W~)y@gwb{#?Bl&{o@<PRNWY7SL@oH#IS0V@%5ZYEOI+9BmPu
z`MV!DlCzVSuQer;a<wGW9l-=ain;f1a_g1*KkMb`5^~wQ1}5)Ch$KwO3_jb5g8)}l
zF8iu*ckkH5iWJzqfBB?4(NlQy^Nx+>;%mqSSm(@D#<%OtVI1YpOhRdGtQZVHtxoKh
z$Ci9Hs<5H4EUa8&-hR(@$*LeTDK1pra*WJEGvpmD#4mH_7brH|WW#IC9&Buc-If8R
zDPJRg5jUR|cb%jeef+~!yEaZShnBs%Iru(tsaYN1s{!fW<hYWNKv!hV98vQIEUQL2
zyr&|p@13ylDBKMZl)uciQ(qs~Ex(`onG|?~t-&e%12m;{lo&W~c{PzI#XAV=pO(~;
zKg8(v2J-BqM9Gmhr&HU^&(`C7%1_|+7_kIlT%_EG<t{%pPK`4dN4L?(NOIJ~=;DA{
zW99cBkIhvZVJV~j-aT^+aA_KYA}zu3iu<?d6ZIsHa1wy<5?xL&FuwVQM-<4d1u}Lq
zZY5mrE0#ooz$92y_gxq&TOjP+ah;UlMK?J(qP(o7c)@l{56tt=vK)tn-KTj9S;!$u
zHn&e!feDXSN>no$3bTDSLvr0a6(S0#gwK{8P-ONaT_q*4sx4aoY#@_7bKcefRQNoJ
zJ!o|2JQo}CIz7Onk{!Pt$dE5F<je>7qd*#`h--f!ne;CqCKgV7rM1Lknk_<p6*zlL
zSk2X@xhBb&T#Grq$)fMDeyC|LOsw=@?L(8gXraO0A3J0uVT|Ja!EYgETS@azSxFr~
z0~Fx2_z$zin*UsU1H^isb$8K*i{AH(Ww`(wJu}OiO>zmyTAHXoK5^W?mo_<I6y7Ao
z%5{0&@2QLD{=|rq^6aZ-Wfajk6{o|7J?c|uTv4e#e%^bUllWp)TvGc{WJSbe3?k7r
z_4{0}G%+(+uCQlWlUL>%0y9)FW9*3e^~=(iGI*Eu?K{tK7PZsw_ue%x9ZcSd_$DQ=
z4TGT+^}J-I^z{?yV+g2A*u}Dh^rV)F?mS2W;tX2^)`%+bi2F3#s3>xNVQOJDqua~@
z{Fz_wl>dQ?5H*J0*>?xzCFlDij}qfHaA>xk0ACGG?OF5aQnECW)XyaH2i+ZRkiy%F
z{UVAJ;TTbR=h*#rM9Juh$71p;8DyQKZS;FG`(nRBlVmey8ha8#+9A;8CLI-H-4M?q
zsALy!SXTGex^Ff(=dq$RN8eX4O0}sN){U?YFb~oBUsKRTWtub3sJlY$VxJ}r#EY$+
zwtN2lyXSUdi+wwXaK}lx0#~(ab=3A@{n>toB#weoOWcRE4+ky#Gz6*(ck^*4|7^x6
z-0#{=D{~d8D!{ztYi%fi`9S<oA=gVsvfTrLxdI;DfdYm$?r$!dAR{l@$?;nK>b0><
zzjtNewilM8t%01qIIMnE-~20|!yw(Gm}iRvvEnlJ_=odK?Y%;h<Ws-uK{tC)N5HQ?
z`@?c!_kA{il{~{b9+kVfXJ$%YsFS>w-~W3mO|;@0x(=q>uz#3`rkzuWbbn(PjBY5B
z@nOlJJ>_-h=zek5;!L$l5Iar&M%z^%kS0-sidyQ(VYaxl@w?PVaM#X`_Mz5%PFljP
z=Sm--<CuhbYlVC1pCkx%Y6#ka!k+oH79hzrJd0F_O4)N_8gdM(vj5f^@Tv+zvSdt*
z&i3FDLb9CrSTpo*EzDPjErh7_ypM(Insu~|8J4`>B9>8VJR%S9mhVrFS}p5OWCDsm
zF#tRxfE}@_k4JQ(w%TUS_u+02Up~0q823(fE2e2gXYP3RpKvkNb3eI<eGCt9!6yLA
z>ZXp(5O2OyCe6+rU@>6CTm@m2;ji)rwibr8H56N6#5v8Q;Vph6-xb%Ymh*Tz6G9Z|
zooi<9tu>6foUa8_lfYs=r$j;@k45ZPwC&0NJ`YL-To9`fE`Q6ItEXSapQHwrql-Ci
z_aNQKv}eHcIyh~Sk1qU6V{C*t*_&1OsbJmxBg<Gj%@h+@nl!~Cs4!%X=P;1#sa6tS
z)p%0>7siu4VOt_9TC@rKLfkO7UD|t)eZjm*OPPFw31u!&*~(bCN(owhN)yFwnfbN@
z$!(kdw8$l+U&6}7LX1PtO?gu#m|q=Q=&C_&*FlEa<91J6#-LfryV0Ow_Fo;bQ(lh%
zFC~^KH&~jm^+q>Qe{BEms&87<uW1Kd2iHg}vwA9Uq;F?86fDL{NzB*3+<vpAZ!f%q
zhv>N@=Uap25gr#^Y7;N(5R=<{PhV~2J}owSQs~+M5qjVj>Io=KG?BBh-DP0x1&&sJ
zQ|q|}>fkVA2_?yTE92;7ps)Mk#CTOua1~!hX`LB^YEOX?Tk$Xn{;9x-hBiP|>|5>d
zG#vzJ6LA1~VCl}q_E94zm!ZbtT5l*gF^Z~%rDfay<+WICx5&*qVwIPb7tuGRC%hm_
z?Qb(@*f4*Vl~wnukuB$xltgdLbJ^HzSJ`0shO99145QcG8*yWH9k<|Wuc5ZQ$F*`$
zSH2tiu4rvUMek>+AW~+&R(-_fwH9p7;2Ry|(e_WLOXZR30mpq(@{d2&2ry)M2C&u9
ztln)|Jse$n6ePyRDCFXlmXw&fxiJjCU1x3C=WbKbxO>GbLW9TI7A8z6zdCE>6`>Ep
zQ6cws(4E(@RI;OxwgK$hLuRk2*j|CH<c;@KDbs{6p_`)ONTpYLQkV#h-<Rj~XYw6~
zqkE<)80$Sm&C5$J%OBXQUKBv+q0XD8n4>W^QI;Q5OVg&}ah86YeLDvjFiDw9@@LP}
z(rDBb!f4|VvmBfj64>&`T%6D!<z81unEq&^gUbE={<qXUw%qLPar7Equ!F+YO_1MY
z+#O<MjJ*>W5V72Qj`8b;*~#T-rNbZ}E2o$EY7)go)D-2Ns1cG8_m7Bo9S;vMX1_f_
zgFlt9X?@qere<zui3zn&AE?)01p-j<U$sL%rPp|<i9m8K3!};C6NcU~1SX)J$<D1b
zCu{CJ$AzBLVo-{vCm82#i-W6C+V7!dE&@XI#7ic?y7!v)1$YlLyQJc|#u9I(HLntK
z)qSWD{<nj_tLUe%;Y0F3e%*{iYY)J8ih%XMO1LfnqQfjAoAQe5W`?PxVan2>^!8;>
zF#eYTL(hA>3jHG2IivWQ`9#{uM%tHzY&ZCSB2wFuhI>Q@DQR&IsgU4Fg<$}9uX`QO
zbBC2~55WR7>hB6=gesQTwy{e?vM!jHKBU6Pcvxp)6ec2#wUKtzis^$IF^@ri8Q@<U
zBE9&NKg-vc|Dmtb8}-AH*4StK2pOWEeXGRnX#wqS-CW$`%DYgUSZ=C#2z+OxOA!eO
zo%21%;pj_m8(x`qQe(gSm5dFtPIu7lJT#@71oZ~uLouVmsZ2;;^i_K*A~UH9;`#zP
z5g60n+-cdzI#l8*pP;?!F}He%_q05&`6Q2-`fjh$(>^RWgWz7T@;a5H3H8KR@8|6o
zL9PM$!F0!_B<x<Bi{b8g8|`Y}p@RcFVtX`$@B%Xxe<?&)98{XKb3_vxeqU)cg_<H{
zRURIEzhocKFPqpdH0Mzme?-qXxN&CS$n}5h*Kul6usJzksX49UlH=hmLIX2Xn4(dM
ziiW64&fEhdn$%R}Kt4fp4sWdvJ1|Xe&=D<zX?>lloBP5;X&emc-$P2ZWt}GkDrbKl
zS0lgQ2>HvV`4_IMpHN<DN!aOUN_To9WT!eLw%xhl22Eu`WG}sxs}Q+_Rcm>S1CVw+
zMIO2MB$S6gS)iVq%ts}PoNA|>w#Or5Q5Plr^~igkTJe!7s7Q9rFkVeBCc=71{JK?q
zzQpQUvg^WHRTsm9+=s598@j2_8M7Y#S0TmH=+csbgB2rq>dy;csB5ZIr{xm=KLU<?
A2mk;8

literal 0
HcmV?d00001

diff --git a/stores/basic.js b/stores/basic.js
index 43e57e0..daa6e11 100644
--- a/stores/basic.js
+++ b/stores/basic.js
@@ -61,6 +61,16 @@ const pages = [
     name: 'searchDevice',
     path: '/pages/searchDevice/searchDevice',
     tabBar: false
+  },
+  {
+    name: 'selectAddress',
+    path: '/pages/selectAddress/selectAddress',
+    tabBar: false
+  },
+  {
+    name: 'bindLock',
+    path: '/pages/bindLock/bindLock',
+    tabBar: false
   }
 ]
 
@@ -120,5 +130,22 @@ export const useBasicStore = defineStore('basic', {
         return
       })
     },
+    // 计算字符串长度
+    calculateStringTotalWidth(str) {
+      let totalWidth = 0
+      // 遍历字符串中的每一个字符
+      for (let i = 0; i < str.length; i++) {
+        const char = str[i]
+        // 判断当前字符是全角字符还是半角字符
+        if (/[\uFF01-\uFF60\uFFE0-\uFFE6\u4E00-\u9FFF\u3000-\u303F]/.test(char)) {
+          // 全角字符宽度为 2
+          totalWidth += 2
+        } else {
+          // 半角字符宽度为 1
+          totalWidth += 1
+        }
+      }
+      return totalWidth
+    }
   }
 })
diff --git a/stores/bluetooth.js b/stores/bluetooth.js
index 541e2a7..2e67edf 100644
--- a/stores/bluetooth.js
+++ b/stores/bluetooth.js
@@ -5,6 +5,7 @@ import { defineStore } from 'pinia'
 import crc from 'crc'
 import { sm4 } from 'sm-crypto'
 import { md5 } from 'js-md5'
+import { getServerDatetime } from '@/api/check'
 
 // 定时器
 let timer
@@ -58,10 +59,32 @@ export const useBluetoothStore = defineStore('ble', {
       // 消息序号
       messageCount: 1,
       // 是否初始化蓝牙
-      isInitBluetooth: false
+      isInitBluetooth: false,
+      // 服务器时间
+      serverTimestamp: 0,
+      // 设备keyID
+      keyId: '0'
     }
   },
   actions: {
+    // 二进制转字符串
+    uint8ArrayToString(uint8Array) {
+      let str = ''
+      for (let i = 0; i < uint8Array.length; i++) {
+        if (uint8Array[i] !== 0) {
+          str += String.fromCharCode(uint8Array[i]);
+        }
+      }
+      return str
+    },
+    // 更新服务端时间戳
+    async updateServerTimestamp() {
+      const { code, data, message } = await getServerDatetime({})
+      if(code === 0) {
+        this.serverTimestamp = parseInt(data.date / 1000)
+      }
+      return { code, data, message }
+    },
     // 初始化并监听
     async initAndListenBluetooth() {
       // 初始化蓝牙
@@ -168,7 +191,7 @@ export const useBluetoothStore = defineStore('ble', {
           if(binaryData[14] === 0) {
             that.updateCurrentLockInfo({
               ...that.currentLockInfo,
-              publicKey: binaryData.slice(15, 31)
+              publicKey: [...binaryData.slice(15, 31)]
             })
           }
           characteristicValueCallback({
@@ -191,7 +214,8 @@ export const useBluetoothStore = defineStore('ble', {
             that.updateCurrentLockInfo({
               ...that.currentLockInfo,
               commKey: decrypted.slice(3, 19),
-              signKey: decrypted.slice(19, 35)
+              signKey: decrypted.slice(19, 35),
+              pwdTimestamp: this.arrayToTimestamp(decrypted.slice(35, 39)) * 1000
             })
             console.log('commKey', Array.from(that.currentLockInfo.commKey))
             console.log('signKey', Array.from(that.currentLockInfo.signKey))
@@ -211,28 +235,28 @@ export const useBluetoothStore = defineStore('ble', {
           case cmdIds.getLockStatus:
             if (decrypted[2] === 0) {
               const lockConfig = {
-                vendor: decrypted.slice(3, 23),
+                vendor: that.uint8ArrayToString(decrypted.slice(3, 23)),
                 product: decrypted[23],
-                model: decrypted.slice(24, 44),
-                fwVersion: decrypted.slice(44, 64),
-                hwVersion: decrypted.slice(64, 84),
-                serialNum0: decrypted.slice(84, 100),
-                serialNum1: decrypted.slice(100, 116),
-                btDeviceName: decrypted.slice(116, 132),
-                battRemCap: decrypted[132],
-                battRemCapStandby: decrypted[133],
-                restoreCounter: decrypted.slice(134, 136),
-                restoreDate: decrypted.slice(136, 140),
-                icPartNo: decrypted.slice(140, 150),
-                inDate: decrypted.slice(150, 154),
-                mac: decrypted.slice(154, 174),
-                featurevalueLength: decrypted[174],
-                featureValue: decrypted.slice(175, 175 + decrypted[174]),
-                featureEnValLength: decrypted[175 + decrypted[174]],
-                featureEnVal: decrypted.slice(176 + decrypted[174], 176 + decrypted[174] + decrypted[175 + decrypted[174]]),
+                model: that.uint8ArrayToString(decrypted.slice(24, 44)),
+                fwVersion: that.uint8ArrayToString(decrypted.slice(44, 64)),
+                hwVersion: that.uint8ArrayToString(decrypted.slice(64, 84)),
+                serialNum0: that.uint8ArrayToString(decrypted.slice(84, 100)),
+                serialNum1: that.uint8ArrayToString(decrypted.slice(100, 116)),
+                btDeviceName: that.uint8ArrayToString(decrypted.slice(116, 132)),
+                electricQuantity: decrypted[132],
+                electricQuantityStandby: decrypted[133],
+                restoreCount: decrypted[134] * 256 + decrypted[135],
+                restoreDate: this.arrayToTimestamp(decrypted.slice(136, 140)),
+                icPartNo: that.uint8ArrayToString(decrypted.slice(140, 150)),
+                indate: this.arrayToTimestamp(decrypted.slice(150, 154)),
+                mac: that.uint8ArrayToString(decrypted.slice(154, 174)),
+                timezoneOffset: new Date().getTimezoneOffset() * 60
               }
               that.updateCurrentLockInfo({
                 ...that.currentLockInfo,
+                featureValue: that.uint8ArrayToString(decrypted.slice(175, 175 + decrypted[174])),
+                featureSettingValue: that.uint8ArrayToString(decrypted.slice(176 + decrypted[174], 176 + decrypted[174] + decrypted[175 + decrypted[174]])),
+                featureSettingParams: Array.from(decrypted.slice(176 + decrypted[174] + decrypted[175 + decrypted[174]])),
                 lockConfig
               })
               console.log('获取锁状态成功', that.currentLockInfo.lockConfig)
@@ -244,7 +268,8 @@ export const useBluetoothStore = defineStore('ble', {
           case cmdIds.addUser:
             that.updateCurrentLockInfo({
               ...that.currentLockInfo,
-              token: decrypted.slice(42,46)
+              token: decrypted.slice(42,46),
+              lockUserNo: decrypted[47] * 256 + decrypted[48]
             })
             characteristicValueCallback({
               code: decrypted[46]
@@ -769,10 +794,15 @@ export const useBluetoothStore = defineStore('ble', {
       array[3] = (timestamp & 0xff)
       return array
     },
+    // 二进制转时间戳
+    arrayToTimestamp(array) {
+      const timestamp = (array[0] << 24) | (array[1] << 16) | (array[2] << 8) | array[3]
+      return timestamp >>> 0
+    },
     // 添加用户
     async addLockUser(data) {
       const { name, authUid, uid, keyId, openMode, keyType, startDate, expireDate, useCountLimit, isRound, weekRound,
-        startHour, startMin, endHour, endMin, role, password, publicKey, commKey } = data
+        startHour, startMin, endHour, endMin, role, password } = data
       const length = 2 + 40 + 20 + 40 + 20 + 1 + 1 + 4 + 4 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 20 + 4 + 1 + 16
       const headArray = this.createPackageHeader(3, length)
       const conentArray = new Uint8Array(length)
@@ -825,7 +855,7 @@ export const useBluetoothStore = defineStore('ble', {
 
       conentArray.set(md5Array, 166)
 
-      const cebArray = sm4.encrypt(conentArray, commKey, { mode: 'ecb', output: 'array' })
+      const cebArray = sm4.encrypt(conentArray, this.currentLockInfo.commKey, { mode: 'ecb', output: 'array' })
 
       const packageArray = this.createPackageEnd(headArray, cebArray)
       await this.writeBLECharacteristicValue(packageArray)
diff --git a/stores/user.js b/stores/user.js
index 5aa4988..e89fd61 100644
--- a/stores/user.js
+++ b/stores/user.js
@@ -22,7 +22,7 @@ export const useUserStore = defineStore('user', {
       this.isLogin = status
     },
     async login() {
-      uni.setStorageSync('token', '3021|MZv7iEf0NwjCPSGx4QWs37zOjeVN3GrSJ2v7D56L7db1fcc5')
+      uni.setStorageSync('token', '3023|pZ1aoVlMKJBTBTGWlsZPpbLvxc8txcHbrJx2ljrf49c7efe0')
       const { code, data } = await getUserInfoRequest()
       await useLockStore().getLockList({
         pageNo: 1,
diff --git a/utils/request.js b/utils/request.js
index f7567ae..4cea802 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -74,6 +74,7 @@ const request = (config) => {
           code: res?.data?.errorCode,
           res: res?.data?.data,
           token: header?.authorization || '',
+          message: res?.data?.errorMsg,
           duration: new Date().getTime() - timestamp
         })
       }