预添加陀螺仪指令

src/pages/competition/index.vue

@@ -955,9 +955,9 @@ export default {
       $this.userinfo["validity_time"] = formatTime(
         $this.userinfo["validity_time"]
       );
-      $this.userinfo["level_name"] = utils.get_level_name(
-        $this.userinfo["level"]
-      );
+      // $this.userinfo["level_name"] = utils.get_level_name(
+      //   $this.userinfo["level"]
+      // );
       $this.userinfo["free_time"] = formatSeconds($this.userinfo["free_time"]);
       store.setters.set_userinfo($this.userinfo);
     });

src/pages/start/index.vue

@@ -458,6 +458,14 @@ export default {
       }else{
         $this.$bluetooth.SendLedOrder("00");
       }
+      // 获取教具类型 发送陀螺仪开关指令
+      let $toy_sn = game_store.getters.getToySn();
+      if("SW".indexOf($toy_sn)>=0 || "KL".indexOf($toy_sn)>=0 || "SC".indexOf($toy_sn)>=0){
+        // todo 关闭陀螺仪
+      } else {
+        // todo 打开陀螺仪
+      }
+
       // 开始倒计时
       clearInterval($timeout)
       $timeout = setInterval(() => {

src/pages/user_center/index.vue

@@ -136,7 +136,6 @@ export default {
       game_store.setters.setLED(this.led_status);
       console.log("设置后获取LED灯状态", game_store.getters.getLED())
       // 保存状态到数据库
-      // todo
       setUserLED(this.led_status);
     },
     to_edit() {

src/pages/user_center/vip/index.vue

@@ -117,7 +117,7 @@ export default {
   mounted() {
     $this.getData()
     $this.userinfo = wx.getStorageSync('userinfo')
-    $this.userinfo['level_name'] = utils.get_level_name($this.userinfo['level'])
+    //$this.userinfo['level_name'] = utils.get_level_name($this.userinfo['level'])
   },
   created() {
     $this = this;

src/store/game.js

@@ -25,8 +25,8 @@ const setters = {
   setToyList(toy_list) {
     wx.setStorageSync('toy_list', toy_list)
   },
-  setToyHex(toy_hex) {
-    wx.setStorageSync('toy_hex', toy_hex)
+  setToySn(toy_sn) {
+    wx.setStorageSync('toy_sn', toy_sn)
   },
   removeToyHex() {
     wx.removeStorageSync('toy_hex')
@@ -88,8 +88,8 @@ const getters = {
   getToyList() {
     return wx.getStorageSync('toy_list')
   },
-  getToyHex() {
-    return wx.getStorageSync('toy_hex')
+  getToySn() {
+    return wx.getStorageSync('toy_sn')
   },
   getMode() {
     return wx.getStorageSync('mode')

src/utils/bluetooth.js

@@ -127,20 +127,20 @@ export default {
    */
   sendControlClose() {
     let that = this
+    // 打开LED
+    that.SendLedOrder("01");
+    // 断开教具及蓝牙连接
+    that.SendOrder("31");
+    // 兼容二代脑机，不能退出循环
     control_close = false;
     control_close_intv = setInterval(() => {
       if (!control_close) {
         // 关闭脑控
         that.SendOrder('09')
-        // 打开LED
-        that.SendLedOrder("01");
-        // 断开教具及蓝牙连接
-        that.SendOrder("31");
         //如果是jellyfish则发送00教具
         if (!is_new) {
           that.sendConnectOneToMore('00')
         }
-
       } else {
         //设置打开脑控为false
         FlagOpenControl = false;
@@ -448,7 +448,6 @@ export default {
     const that = this;
     let DeviceId = game_store.getters.getDeviceId();
     wx.onBLECharacteristicValueChange((characteristic) => {
-
       // 获取脑机信号值
       wx.getBLEDeviceRSSI({
         deviceId: DeviceId,
@@ -568,8 +567,8 @@ export default {
         let toy_list_pre = {'01': "SW", '02': "KL", '04': "SC", '05': "PP", '06': "SU", '09': "UF", '12': "JM"}
         let $sn = toy_list_pre[current_toy_id] + $number;
         $this.toy_sn = $sn;
-        //获取教具电量
-        // that.SendOrder('8a')
+        //保存教具sn
+        game_store.setters.setToySn($sn);
         console.log("获取教具名称hexStr",hexStr)
         console.log("获取教具名称$sn",$sn)
       }