删了ec-canvas

dist/wx

@@ -1 +1 @@
-Subproject commit c887d694e2421fdaa1cc80338277ab05e4e5d454
+Subproject commit 23edd7309d4196c4a8026cbaac305d8a7800bf77

src/pages/report/main.json

@@ -4,6 +4,5 @@
     "van-col": "../../static/vant/col/index",
     "van-popup": "../../static/vant/popup/index",
     "van-count-down": "../../static/vant/count-down/index",
-    "ec-canvas": "../../static/ec-canvas/ec-canvas"
   }
 }

src/pages/start/index.vue

@@ -317,65 +317,8 @@ export default {
     //  模拟蓝牙输入值
     //55 55 20 01 00 02 1b 03 33 04 18 00 15 d7 00 75 37 00 0d da 00 0d 9b 00 10 c2 00 0a f9 00 01 fb 00 04 5a 39
     let hex = "5555200100021b033304180015d7007537000dda000d9b0010c2000af90001fb00045a39"
-    //当s1为 00时 数据有效
-    let $s1 = hex.substr(8, 2)
-
-    //专注度数据
-    let $att = parseInt("0x" + hex.substr(12, 2))
-    console.log('att', $att)
-    //放松度数据
-    let $med = parseInt("0x" + hex.substr(16, 2))
-    console.log('$med', $med)
-
-    //Delta数据
-    let $delta_1 = hex.substr(hex.indexOf('0418') + 4, 2)
-    let $delta_2 = hex.substr(hex.indexOf('0418') + 6, 2)
-    let $delta_3 = hex.substr(hex.indexOf('0418') + 8, 2)
-    let $delta = "0x" + $delta_1 << 16 | "0x" + $delta_2 << 8 | "0x" + $delta_3
-    console.log('Delta', parseInt($delta))
-
-    //Theta数据
-    let $theta_1 = hex.substr(hex.indexOf('0418') + 10, 2)
-    let $theta_2 = hex.substr(hex.indexOf('0418') + 12, 2)
-    let $theta_3 = hex.substr(hex.indexOf('0418') + 14, 2)
-    let $theta = "0x" + $theta_1 << 16 | "0x" + $theta_2 << 8 | "0x" + $theta_3
-    console.log('Theta', parseInt($theta))
-
-
-    //low_Alpha
-    let $low_alpha_1 = hex.substr(hex.indexOf('0418') + 16, 2)
-    let $low_alpha_2 = hex.substr(hex.indexOf('0418') + 18, 2)
-    let $low_alpha_3 = hex.substr(hex.indexOf('0418') + 20, 2)
-    let $low_alpha = "0x" + $low_alpha_1 << 16 | "0x" + $low_alpha_2 << 8 | "0x" + $low_alpha_3
-    console.log('low_alpha', $low_alpha)
-
-    //high_Alpha
-    let $high_alpha_1 = hex.substr(hex.indexOf('0418') + 22, 2)
-    let $high_alpha_2 = hex.substr(hex.indexOf('0418') + 24, 2)
-    let $high_alpha_3 = hex.substr(hex.indexOf('0418') + 26, 2)
-    let $high_alpha = "0x" + $high_alpha_1 << 16 | "0x" + $high_alpha_2 << 8 | "0x" + $high_alpha_3
-    console.log('high_alpha', $high_alpha)
-
-    let $alpha = ($high_alpha << 8) | $low_alpha
-    console.log('Alpha', parseInt($alpha))
-
-    //low_beta
-    let $low_beta_1 = hex.substr(hex.indexOf('0418') + 28, 2)
-    let $low_beta_2 = hex.substr(hex.indexOf('0418') + 30, 2)
-    let $low_beta_3 = hex.substr(hex.indexOf('0418') + 32, 2)
-    let $low_beta = "0x" + $low_beta_1 << 16 | "0x" + $low_beta_2 << 8 | "0x" + $low_beta_3
-    console.log('$low_beta', $low_beta)
-
-    //high_beta
-    let $high_beta_1 = hex.substr(hex.indexOf('0418') + 34, 2)
-    let $high_beta_2 = hex.substr(hex.indexOf('0418') + 36, 2)
-    let $high_beta_3 = hex.substr(hex.indexOf('0418') + 38, 2)
-    let $high_beta = "0x" + $low_beta_1 << 16 | "0x" + $low_beta_2 << 8 | "0x" + $low_beta_3
-    console.log('$high_beta', $high_beta)
-
-    //Beta数据
-    let $beta = ($high_beta << 8) | $low_beta
-    console.log('Beta', parseInt($beta, 16))
+    let $data = bluetooth.get_big_data(hex)
+    console.log($data)
 
   },
   created() {

src/utils/bluetooth.js

@@ -277,4 +277,68 @@ export default {
 
     })
   },
+
+  //  获取大包数据 进行绘制图表
+  get_big_data(hex) {
+    //当s1为 00时 数据有效
+    let $s1 = hex.substr(8, 2)
+
+    //专注度数据
+    let $att = parseInt("0x" + hex.substr(12, 2))
+    console.log('att', $att)
+    //放松度数据
+    let $med = parseInt("0x" + hex.substr(16, 2))
+    console.log('$med', $med)
+
+    //Delta数据
+    let $delta_1 = hex.substr(hex.indexOf('0418') + 4, 2)
+    let $delta_2 = hex.substr(hex.indexOf('0418') + 6, 2)
+    let $delta_3 = hex.substr(hex.indexOf('0418') + 8, 2)
+    let $delta = "0x" + $delta_1 << 16 | "0x" + $delta_2 << 8 | "0x" + $delta_3
+    console.log('Delta', parseInt($delta, 16))
+
+    //Theta数据
+    let $theta_1 = hex.substr(hex.indexOf('0418') + 10, 2)
+    let $theta_2 = hex.substr(hex.indexOf('0418') + 12, 2)
+    let $theta_3 = hex.substr(hex.indexOf('0418') + 14, 2)
+    let $theta = "0x" + $theta_1 << 16 | "0x" + $theta_2 << 8 | "0x" + $theta_3
+    console.log('Theta', parseInt($theta, 16))
+
+
+    //low_Alpha
+    let $low_alpha_1 = hex.substr(hex.indexOf('0418') + 16, 2)
+    let $low_alpha_2 = hex.substr(hex.indexOf('0418') + 18, 2)
+    let $low_alpha_3 = hex.substr(hex.indexOf('0418') + 20, 2)
+    let $low_alpha = "0x" + $low_alpha_1 << 16 | "0x" + $low_alpha_2 << 8 | "0x" + $low_alpha_3
+    //high_Alpha
+    let $high_alpha_1 = hex.substr(hex.indexOf('0418') + 22, 2)
+    let $high_alpha_2 = hex.substr(hex.indexOf('0418') + 24, 2)
+    let $high_alpha_3 = hex.substr(hex.indexOf('0418') + 26, 2)
+    let $high_alpha = "0x" + $high_alpha_1 << 16 | "0x" + $high_alpha_2 << 8 | "0x" + $high_alpha_3
+    let $alpha = ($high_alpha << 8) | $low_alpha
+    console.log('Alpha', parseInt($alpha, 16))
+
+    //low_beta
+    let $low_beta_1 = hex.substr(hex.indexOf('0418') + 28, 2)
+    let $low_beta_2 = hex.substr(hex.indexOf('0418') + 30, 2)
+    let $low_beta_3 = hex.substr(hex.indexOf('0418') + 32, 2)
+    let $low_beta = "0x" + $low_beta_1 << 16 | "0x" + $low_beta_2 << 8 | "0x" + $low_beta_3
+    //high_beta
+    let $high_beta_1 = hex.substr(hex.indexOf('0418') + 34, 2)
+    let $high_beta_2 = hex.substr(hex.indexOf('0418') + 36, 2)
+    let $high_beta_3 = hex.substr(hex.indexOf('0418') + 38, 2)
+    let $high_beta = "0x" + $low_beta_1 << 16 | "0x" + $low_beta_2 << 8 | "0x" + $low_beta_3
+    //Beta数据
+    let $beta = ($high_beta << 8) | $low_beta
+    console.log('Beta', parseInt($beta, 16))
+    return {
+      att: $att,
+      med: $med,
+      delta: $delta,
+      theta: $theta,
+      alpha: $alpha,
+      beta: $beta
+    }
+  }
+
 }