From 8c8f8090872cdbfaa72929ded649329be583ea9a Mon Sep 17 00:00:00 2001
From: xiaohei <11674173+xiaohei102908@user.noreply.gitee.com>
Date: Tue, 28 Nov 2023 18:25:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.0.6=20=202023-11-28=20=20lj?=
 =?UTF-8?q?d=201=E3=80=81=E4=BC=98=E5=8C=96q=E7=B3=BB=E5=88=97=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=97=A8=E9=94=81=202=E3=80=81=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86zg=E9=94=81=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=92=8C=E8=AE=BE=E7=BD=AE=E5=A3=B0=E9=9F=B3?=
 =?UTF-8?q?=E6=97=B6=E4=B8=80=E7=9B=B4=E5=9C=A8=E8=BD=AC=E5=9C=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/roomDetail/roomDetail.js                     |  6 ++++--
 pages/userbluetoothUnlock/userbluetoothUnlock.js   | 20 +++++++++++++++++---
 pages/userbluetoothUnlock/userbluetoothUnlock.wxml |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pages/roomDetail/roomDetail.js b/pages/roomDetail/roomDetail.js
index 884827a..72ff877 100644
--- a/pages/roomDetail/roomDetail.js
+++ b/pages/roomDetail/roomDetail.js
@@ -1180,7 +1180,7 @@ Page({
     this.setData({ event })
     var deviceinfo = this.data.deviceinfo
     if (deviceinfo.manufactureId == 201 || deviceinfo.manufactureId == 221) {
-      if (app.globalData.zgBlueStatus) {
+      if (this.data.isSearch) {
         if (event == 0) {
           this.openTheDoor()
         } else if (event == 3) {
@@ -1192,6 +1192,7 @@ Page({
         } else if (event == 11) {
           this.synchroPlatformTask()
         }
+        wx.hideLoading()
       } else {
         that.goBlue()
       }
@@ -2330,7 +2331,8 @@ Page({
                 clearInterval(that.data.timer)
                 this.setData({
                   bleStatus: '蓝牙已连接',
-                  deviceId: deviceId
+                  deviceId: deviceId,
+                  isSearch: true
                 })
                 app.globalData.zgBlueStatus = true
                 wx.hideLoading()
diff --git a/pages/userbluetoothUnlock/userbluetoothUnlock.js b/pages/userbluetoothUnlock/userbluetoothUnlock.js
index 7858f4d..3cc1822 100644
--- a/pages/userbluetoothUnlock/userbluetoothUnlock.js
+++ b/pages/userbluetoothUnlock/userbluetoothUnlock.js
@@ -1042,7 +1042,7 @@ Page({
       remotePasswordStatus:false
     })
     if (deviceinfo.manufactureId == 201||deviceinfo.manufactureId == 221) {
-      if (app.globalData.zgBlueStatus) {
+      if (this.data.isSearch) {
         if (event == 0) {
           this.openTheDoor()
         } else if (event == 1) {
@@ -1098,14 +1098,23 @@ Page({
       if (this.data.isSearch) {
         if (event == '0') {
           this.LwjopenLock()
-        } if(event == '3') {
+        }else if(event == '3') {
           this.configurewifj()
+        }else if(event == '12'){
+          this.goPasswordList()
+        }else if(event == '1'){
+          this.addPincode()
         }
       } else {
         this.searchDevicesMethods()
       }
     }
   },
+  addPincode: function() {
+    var that = this
+    taskId = 51
+    that.initBluetooth()
+  },
   configurewifj() {
     var that = this
     taskId = 121
@@ -1174,6 +1183,8 @@ Page({
                         } else if (that.data.event == '3') {
                           console.log("1298wifi");
                           that.configurewifj()
+                        }else if(that.data.event == '12'){
+                          that.goPasswordList()
                         }
                         wx.hideLoading({
                           success: (res) => {},
@@ -2158,7 +2169,8 @@ Page({
                 clearInterval(that.data.timer)
                 this.setData({
                   bleStatus: '蓝牙已连接',
-                  deviceId: deviceId
+                  deviceId: deviceId,
+                  isSearch: true
                 })
                 app.globalData.zgBlueStatus = true
                 wx.hideLoading()
@@ -2965,6 +2977,8 @@ Page({
             })
           }
         })
+      }else if(deviceinfo.manufactureId == 1201 || deviceinfo.manufactureId == 1241){
+
       }
     }
   },
diff --git a/pages/userbluetoothUnlock/userbluetoothUnlock.wxml b/pages/userbluetoothUnlock/userbluetoothUnlock.wxml
index c876b00..b5eac80 100644
--- a/pages/userbluetoothUnlock/userbluetoothUnlock.wxml
+++ b/pages/userbluetoothUnlock/userbluetoothUnlock.wxml
@@ -51,7 +51,7 @@
 			<view class="iconfont icon-xiaoxi text-green"></view>
 			<view class="text-grey text-sm">添加蓝牙密码</view>
 		</view>
-		<view class="actionli" bindtap="addRemotePassword" wx:if="userRole == 1">
+		<view class="actionli" bindtap="addRemotePassword" wx:if="userRole == 1" wx:if="{{deviceinfo.manufactureId ==201 || deviceinfo.manufactureId ==221}}">
 			<view class="iconfont icon-xiaoxi text-green"></view>
 			<view class="text-grey text-sm">添加远程密码</view>
 		</view>