Merge branch 'master' of gitee.com:sh_13808852820/program

src/pages/start/index.vue

@@ -102,9 +102,9 @@
             {{ online_att }}
           </text>
           <view class="online_desc">
-<!--            <text class="online_desc">-->
-              {{ online_att_desc }}
-<!--            </text>-->
+            <!--            <text class="online_desc">-->
+            {{ online_att_desc }}
+            <!--            </text>-->
           </view>
         </view>
       </van-circle>
@@ -114,9 +114,9 @@
             {{ online_med }}
           </text>
           <view class="online_desc">
-<!--            <text class="online_desc">-->
-              {{ online_med_desc }}
-<!--            </text>-->
+            <!--            <text class="online_desc">-->
+            {{ online_med_desc }}
+            <!--            </text>-->
           </view>
         </view>
       </van-circle>
@@ -268,9 +268,9 @@ export default {
 
       //实时的专注值和放松度
       online_att: 0,
-      online_att_desc:"一般专注",
+      online_att_desc: "",
       online_med: 0,
-      online_med_desc:"深度放松",
+      online_med_desc: "",
 
       //图标数据集合
       att_list: [],
@@ -506,6 +506,30 @@ export default {
 
       $this.online_att = $data["att"];
       $this.online_med = $data["med"];
+      let $att_msg = "";
+      if ($data["att"] >= 1 && $data['att'] < 40) {
+        $att_msg = "专注力不足";
+      } else if ($data['att'] < 60) {
+        $att_msg = "一般专注";
+      } else if ($data['att'] < 80) {
+        $att_msg = "高度专注";
+      } else if ($data['att'] <= 100) {
+        $att_msg = "深度专注";
+      }
+      $this.online_att_desc = $att_msg;
+
+      let $med_msg = "";
+      if ($data["med"] >= 1 && $data['med'] < 40) {
+        $med_msg = "放松度不足";
+      } else if ($data['med'] < 60) {
+        $med_msg = "一般放松";
+      } else if ($data['med'] < 80) {
+        $med_msg = "高度放松";
+      } else if ($data['med'] <= 100) {
+        $med_msg = "深度放松";
+      }
+      $this.online_med_desc = $med_msg;
+
 
       $this.att_list.push($data["att"]);
       $this.med_list.push($data["med"]);
@@ -896,7 +920,7 @@ export default {
 
 .circle_text {
   width: 100%;
-    padding-bottom: 50px;
+  padding-bottom: 50px;
 
 }
 

src/utils/bluetooth.js

@@ -161,7 +161,9 @@ export default {
       deviceId,
       success: (res) => {
         for (let i = 0; i < res.services.length; i++) {
-          if (res.services[i].isPrimary) {
+          console.log("serviceItem:"+res.services[i].uuid);
+          if (res.services[i].uuid.indexOf('6E') != -1 || res.services[i].uuid.indexOf('0000FFF0') != -1) {
+            console.log("SelectedServiceItem:"+res.services[i].uuid);
             $this.getBLEDeviceCharacteristics(deviceId, res.services[i].uuid);
             return;
           }
@@ -175,6 +177,7 @@ export default {
 
   //获取蓝牙设备某个服务中所有特征值
   getBLEDeviceCharacteristics(deviceId, serviceId) {
+    console.log(deviceId,serviceId);
     const $this = this;
     wx.getBLEDeviceCharacteristics({
       deviceId,
@@ -386,9 +389,7 @@ export default {
     }
 
     return $errmsg;
-  }
-
-  ,
+  },
   //写入buffer
   WriteBufferInBle($hex) {
     let $device_id = game_store.getters.getDeviceId();