瀏覽代碼

feat: 蓝牙灯光模块

kindring 1 年之前
父節點
當前提交
e82b68ec5a
共有 5 個文件被更改,包括 9 次插入7 次删除
  1. 1 1
      components/scanHandle/scanHandle.wxml
  2. 1 1
      components/tabList/tabList.wxss
  3. 3 3
      pages/light/light.js
  4. 1 0
      pages/light/light.wxss
  5. 3 2
      utils/mjs_wxble.js

+ 1 - 1
components/scanHandle/scanHandle.wxml

@@ -11,7 +11,7 @@
     <view class="state-msg" wx:if="{{state == connectStateTypes.unConnect}}">
       <view class="custom-info-btn btn" bindtap="searchDevice" >扫描</view>
     </view>
-    <view class="state-msg" wx:if="{{state == connectStateTypes.connecting}}">
+    <view class="state-msg" wx:if="{{state == connectStateTypes.connecting || state == connectStateTypes.scaning  }}">
       <view class="custom-info-btn btn" bindtap="searchDevice" >重新扫描</view>
     </view>
 </view>

+ 1 - 1
components/tabList/tabList.wxss

@@ -1,7 +1,7 @@
 
 .bleDevices{
     width:100%;
-    height: 360px;
+    height: 100%;
     display: flex;
     flex-direction: column;
     overflow: hidden;

+ 3 - 3
pages/light/light.js

@@ -33,7 +33,7 @@ Page({
         // unConnect scaning connecting connected
         connectStateTypes: connectStateTypes,
         ble: {
-            state: connectStateTypes.scaning,
+            state: connectStateTypes.unConnect,
             devName: "",
             deviceId: "",
             init: false,
@@ -70,7 +70,7 @@ Page({
       let serverUuid = '';
       let characteristicUuid = '';
       
-      let server = services.find(s=>s.uuid === controlUuid);
+      let server = bleServices.find(s=>s.uuid === controlUuid);
       if(!server)
       {
         // return bleFail('获取服务失败', '该设备不支持该程序');
@@ -279,7 +279,7 @@ Page({
 
   async connectServices(){
       // uuid FF01
-      let [err,res] = await handle(ble.getServices());
+      let [err,res] = await handle(ble.getBleServices());
       if(err){ return this.bleFail('获取服务失败', err.errMsg);}
       // 保存服务信息;
       bleServices = res;

+ 1 - 0
pages/light/light.wxss

@@ -9,6 +9,7 @@
     height: auto;
     min-height: 100vh;
     position: relative;
+    height: calc(100% - 40px);
     /* 暗灰 */
     background-color: #3b3b3b;
 }

+ 3 - 2
utils/mjs_wxble.js

@@ -37,11 +37,12 @@ class BLE{
         var bleArray = res.devices;
         //这里会收到周边搜索到的蓝牙
         console.log("\n\nfind devices ----");
-        // console.log(res);
-        // console.log(res.devices);
+        console.log(res);
+        console.log(res.devices);
         // 对
         for (let index = 0; index < bleArray.length; index++) {
           const ble = bleArray[index];
+
           if(ble.advertisData){
             // 解析到特征值设备
             let advertisData = buf2hex(ble.advertisData);