From 86c398b754d324cd7b49a8e8b1e965b6442cba6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 29 Aug 2024 16:18:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=8D=93?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E8=93=9D=E7=89=99=E6=90=9C=E7=B4=A2=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=AE=9A=E4=BD=8D=E6=9D=83=E9=99=90=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202.=20=E5=88=A0=E9=99=A4=E4=BB=A5=E5=89=8D=E7=9A=84?=
 =?UTF-8?q?=E8=93=9D=E7=89=99=E6=93=8D=E4=BD=9Cdemo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json            |   3 -
 pages/index/index.vue | 205 ------------------------------------------
 stores/bluetooth.js   |  17 ++++
 3 files changed, 17 insertions(+), 208 deletions(-)
 delete mode 100644 pages/index/index.vue

diff --git a/pages.json b/pages.json
index e51e3c5..c8331f0 100644
--- a/pages.json
+++ b/pages.json
@@ -21,9 +21,6 @@
 		{
 			"path": "pages/mine/mine"
 		},
-		{
-			"path": "pages/index/index"
-		},
 		{
 			"path": "pages/userInfo/userInfo",
 			"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
deleted file mode 100644
index dc0afa9..0000000
--- a/pages/index/index.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<template>
-	<view class="content">
-    <view v-if="!showConnect">
-      <button class="button" v-if="showAdd" @click="getList">添加设备</button>
-      <button class="button" v-else @click="stopGetList">停止搜索</button>
-      <view class="device-list" v-for="(item, index) in deviceList" :key="item.deviceId" @click="connect(item)">{{item.name}}</view>
-    </view>
-    <view v-else>
-      <button class="button" @click="bindUser">添加用户</button>
-      <button class="button" @click="openDoorOperate">开门</button>
-      <button class="button" @click="closeDoorOperate">关门</button>
-      <button class="button" @click="reset">恢复出厂设置</button>
-      <button class="button" @click="getLockStatusResult">获取锁状态</button>
-      <button class="button" @click="resetPassword">重置锁密码</button>
-      <button class="button" @click="setPassword">设置密码</button>
-      <button class="button" @click="deletePassword">删除密码</button>
-      <view>名称：{{currentLockInfo.name}}</view>
-      <view>设备Id：{{currentLockInfo.deviceId}}</view>
-    </view>
-	</view>
-</template>
-
-<script>
-  import { useBluetoothStore } from '@/stores/bluetooth'
-  import { mapState, mapActions } from 'pinia'
-
-	export default {
-		data() {
-			return {
-        showAdd: true,
-        showConnect: false,
-        keyId: '0',
-        authUid: '294',
-        onlineToken: '0'
-      }
-		},
-    computed: {
-      ...mapState(useBluetoothStore, ['deviceList', 'currentLockInfo'])
-    },
-    onLoad () {},
-		methods: {
-      ...mapActions(useBluetoothStore, ['getBluetoothDevices', 'stopGetBluetoothDevices', 'updateCurrentLockInfo',
-        'connectBluetoothDevice', 'getPublicKey', 'getCommKey', 'getLockStatus', 'addLockUser', 'timestampToArray',
-        'openDoor', 'resetDevice', 'resetLockPassword', 'setLockPassword']),
-      async deletePassword() {
-        const timestamp = parseInt(new Date().getTime() / 1000)
-        const data = await this.setLockPassword({
-          keyId: this.keyId,
-          uid: this.authUid,
-          pwdNo: 2,
-          operate: 2,
-          isAdmin: 1,
-          pwd: '000000',
-          userCountLimit: 0,
-          startTime: timestamp,
-          endTime: timestamp
-        })
-        console.log('设置密码返回', data)
-      },
-      async setPassword() {
-        const timestamp = parseInt(new Date().getTime() / 1000)
-        const endTimestamp = timestamp + 3600 * 24 * 365
-        const data = await this.setLockPassword({
-          keyId: this.keyId,
-          uid: this.authUid,
-          pwdNo: 1,
-          operate: 0,
-          isAdmin: 1,
-          pwd: '000000',
-          userCountLimit: 0xffff,
-          startTime: timestamp,
-          endTime: endTimestamp
-        })
-        console.log('设置密码返回', data)
-      },
-      async resetPassword() {
-        const { code } = await this.resetLockPassword({
-          uid: this.authUid,
-          keyId: this.keyId
-        })
-        console.log('重置密码返回', code)
-      },
-      async openDoorOperate() {
-        const { code } = await this.openDoor({
-          name: this.currentLockInfo.name,
-          uid: this.authUid,
-          openMode: 0,
-          openTime: parseInt(new Date().getTime() / 1000),
-          onlineToken: this.onlineToken
-        })
-        console.log('开门返回', code)
-      },
-      async closeDoorOperate() {
-        const { code } = await this.openDoor({
-          name: this.currentLockInfo.name,
-          uid: this.authUid,
-          openMode: 32,
-          openTime: parseInt(new Date().getTime() / 1000),
-          onlineToken: this.onlineToken
-        })
-        console.log('关门返回', code)
-      },
-      async reset() {
-        const { code } = await this.resetDevice({
-          name: this.currentLockInfo.name,
-          authUid: this.authUid,
-          keyId: this.keyId
-        })
-        console.log('恢复出厂设置返回', code)
-      },
-      getList() {
-        this.getBluetoothDevices()
-        this.showAdd = false
-      },
-      stopGetList() {
-        this.stopGetBluetoothDevices()
-        this.showAdd = true
-      },
-      async connect(item) {
-        this.updateCurrentLockInfo({
-          name: item.name,
-          deviceId: item.deviceId
-        })
-        const result = await this.connectBluetoothDevice()
-        if(result) {
-          this.showConnect = true
-          this.stopGetBluetoothDevices()
-        }
-      },
-      async bindUser() {
-        const { code } = await this.getPublicKey(this.currentLockInfo.name)
-        console.log('获取公钥返回', code)
-        if(code !== 0) {
-          return
-        }
-        const { code: getCommKeyCode } = await this.getCommKey(this.currentLockInfo.name, this.keyId, this.authUid,
-              parseInt(new Date().getTime() / 1000))
-        console.log('获取私钥返回', getCommKeyCode)
-        if(getCommKeyCode !== 0) {
-          return
-        }
-        const timestamp = parseInt(new Date().getTime() / 1000)
-        const { code: addUserCode } = await this.addLockUser({
-          name: this.currentLockInfo.name,
-          keyId: this.keyId,
-          authUid: this.authUid,
-          uid: this.authUid,
-          publicKey: this.currentLockInfo.publicKey,
-          commKey: this.currentLockInfo.commKey,
-          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: (Math.floor(Math.random() * 900000) + 100000).toString()
-        })
-        console.log('添加用户返回', addUserCode)
-      },
-      getLockStatusResult() {
-        const timestamp = parseInt(new Date().getTime() / 1000)
-        this.getLockStatus({
-          name: this.currentLockInfo.name,
-          uid: this.authUid,
-          nowTime: timestamp,
-          localTime: timestamp
-        })
-      }
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.content {
-    padding-top: 160rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.button {
-    margin-top: 40rpx;
-    width: 400rpx;
-    height: 108rpx;
-    line-height: 108rpx;
-    background: #3F536E;
-    color: #ffffff !important;
-  }
-
-  .device-list {
-    margin-top: 10rpx;
-    height: 100rpx;
-    width: 500rpx;
-    line-height: 100rpx;
-    text-align: center;
-    border: #dd524d solid 2rpx;
-  }
-</style>
diff --git a/stores/bluetooth.js b/stores/bluetooth.js
index 9bbf236..33a66f1 100644
--- a/stores/bluetooth.js
+++ b/stores/bluetooth.js
@@ -373,6 +373,19 @@ export const useBluetoothStore = defineStore('ble', {
         },
         fail: async function (res) {
           console.log('开始搜索失败', res)
+          if(res.errno === 1509008) {
+            uni.showModal({
+              title: '提示',
+              content: '安卓手机蓝牙功能需要定位权限，请前往设置开启微信的定位权限后再试',
+              showCancel: false,
+              confirmText: '重试',
+              success(res) {
+                if (res.confirm) {
+                  that.getBluetoothDevices()
+                }
+              }
+            })
+          }
           if(res.errCode === 10000) {
             // 重新初始化蓝牙适配器
             await that.initBluetooth()
@@ -550,6 +563,10 @@ export const useBluetoothStore = defineStore('ble', {
             })
           },
           fail(res) {
+            if(res.errno === 1509007) {
+              resolve(true)
+              return
+            }
             uni.showToast({
               title: '连接失败，请靠近设备并保持设备处于唤醒状态',
               icon: 'none'