From 1cc09adb597b16b30eeb54c97f7bd399b0579aa1 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 17:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=8D=93=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=9B=9E=E9=80=80toast=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json       | 12 ++++++------
 stores/bluetooth.js |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 35562d9..e7753ea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,15 +12,15 @@
             "urlCheck" : true,
             "minified" : true
         },
-        "permission": {
-            "scope.bluetooth": {
-                "desc": "蓝牙将用于控制和管理您的智能门锁"
+        "permission" : {
+            "scope.bluetooth" : {
+                "desc" : "蓝牙将用于控制和管理您的智能门锁"
             },
-            "scope.userLocation": {
-                "desc": "获取您的位置信息将用于智能门锁的位置服务"
+            "scope.userLocation" : {
+                "desc" : "获取您的位置信息将用于智能门锁的位置服务"
             }
         },
-        "requiredPrivateInfos": ["getLocation"],
+        "requiredPrivateInfos" : [ "getLocation" ],
         "usingComponents" : true,
         "lazyCodeLoading" : "requiredComponents"
     },
diff --git a/stores/bluetooth.js b/stores/bluetooth.js
index 33a66f1..98c72b1 100644
--- a/stores/bluetooth.js
+++ b/stores/bluetooth.js
@@ -622,9 +622,9 @@ export const useBluetoothStore = defineStore('ble', {
             timer2 = setTimeout(() => {
               setTimeout(() => {
                 uni.stopBluetoothDevicesDiscovery()
-                clearInterval(timer)
-              }, 7000)
-              timer = setInterval(() => {
+                clearInterval(timer1)
+              }, 10000)
+              timer1 = setInterval(() => {
                 uni.getBluetoothDevices({
                   success(res) {
                     const deviceList = res.devices