tmp

components/scanHandle/scanHandle.js

@@ -31,6 +31,10 @@ Component({
         searchDevice(){
             // 触发父组件的事件
             this.triggerEvent('searchDevice')
+        },
+        disconnectDevice(){
+            // 触发父组件的事件
+            this.triggerEvent('disconnectDevice')
         }
     }
 })

components/scanHandle/scanHandle.wxml

@@ -6,7 +6,7 @@
       <view>
         {{devName}}
       </view>
-      <view class="custom-info-btn btn" bindtap="searchDevice" >重新扫描</view>
+      <view class="custom-info-btn btn" bindtap="disconnectDevice" >断开连接</view>
     </view>
     <view class="state-msg" wx:if="{{state == connectStateTypes.unConnect}}">
       <view class="custom-info-btn btn" bindtap="searchDevice" >扫描</view>

pages/ble/ble.js

@@ -100,7 +100,7 @@ Page({
         return this.bleFail('断开连接失败', '当前未连接设备');
       }
       let err,res;
-      [err,res] = ble.disconnectDev(this.data.ble.deviceId);
+      [err,res] = await handle(ble.disconnectDev(this.data.ble.deviceId));
       if(err){
         return this.bleFail('断开连接失败', err.errMsg);
       }

pages/ble/ble.wxml

@@ -5,6 +5,7 @@
             state="{{ble.state}}" 
             dev-name="{{ble.devName}}"
             bindsearchDevice="searchDeviceHandle"
+            binddisconnectDevice="disconnectHandle"
             />
     </view>
     
@@ -13,7 +14,9 @@
         <tabList
         wx:if="{{ble.state === connectStateTypes.scaning || ble.state === connectStateTypes.connecting}}"
         ble-devs="{{ bleDevs }}"
-        bindconnectDev="connectDevHandle">
+        bindconnectDev="connectDevHandle"
+        
+        >
         </tabList>
 
         <view class="lampControl" 
@@ -25,11 +28,6 @@
                 <view class="deviceName">
                 设备名称: {{ble.devName}}
                 </view>
-                <div class="action">
-                    <view class="btn" hover-class="none" hover-stop-propagation="false" bindtap="disconnectHandle">
-                        断开连接
-                    </view>
-                </div>
             </view>
             <div class="service_items">
                 <!-- 服务控制 -->

pages/light/light.js

@@ -236,25 +236,61 @@ Page({
           lamp: {...this.data.lamp, bgc: newBgC}
       })
     },
-    
+    initPageInfo(){
+      this.setData({
+        ble: {...this.data.ble, 
+          state: connectStateTypes.unConnect, 
+          init: false,
+          devName: "",
+          deviceId: "",
+        },
+        bleDevs: [],
+      });
+      bleServices = [];
+      // 灯光信息初始化
+      this.setData({
+        lamp: {
+          // 开关状态
+          switch: false,
+          // 全开状态(无色温调节)
+          fullOpen: false,
+          // 亮度
+          brightness: 50,
+          // 色温
+          colorTemperature: MAX_COLOR_TEMPERATURE,
+          // 色彩
+          bgc: "#3b3b3b"
+        }
+      })
+    },
+    // 连接失败
     bleFail(title,msg){
       wx.showModal({
         title: title,
         content: msg,
-        success (res) { 
-          this.setData({
-            ble: {...this.data.ble, 
-              state: connectStateTypes.unConnect, 
-              init: false,
-              devName: "",
-              deviceId: "",
-            },
-            bleDevs: []
-          });
-          bleServices = [];
+        success: (res) =>{ 
+          this.initPageInfo();
         }
       });
     },
+
+    disconnectHandle(){
+      this.excuteDisconnect();
+    },
+
+    async excuteDisconnect(){
+      console.log('断开连接');
+      if(this.data.ble.state !== connectStateTypes.connected){
+        return this.bleFail('断开连接失败', '当前未连接设备');
+      }
+      let err,res;
+      [err,res] = await handle(ble.disconnectDev(this.data.ble.deviceId));
+      if(err){
+        return this.bleFail('断开连接失败', err.errMsg);
+      }
+      wx.showToast({title: `断开连接成功`, })
+      this.initPageInfo();
+    },
     // 蓝牙控制板块
     searchDeviceHandle() {
         // 开始搜索设备

pages/light/light.wxml

@@ -5,6 +5,7 @@
             state="{{ble.state}}" 
             dev-name="{{ble.devName}}"
             bindsearchDevice="searchDeviceHandle"
+            binddisconnectDevice="disconnectHandle"
             />
     </view>