|
@@ -44,67 +44,57 @@ export default {
|
|
|
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 = parseInt(
|
|
|
- (("0x" + $delta_1) << 16) | (("0x" + $delta_2) << 8) | ("0x" + $delta_3),
|
|
|
- 16
|
|
|
- );
|
|
|
+ let $delta = parseInt($delta_1 + $delta_2 + $delta_3, 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 = parseInt(
|
|
|
- (("0x" + $theta_1) << 16) | (("0x" + $theta_2) << 8) | ("0x" + $theta_3),
|
|
|
- 16
|
|
|
- );
|
|
|
+ let $theta = parseInt($theta_1 + $theta_2 + $theta_3, 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);
|
|
|
+ let $low_alpha = parseInt($low_alpha_1 + $low_alpha_2 + $low_alpha_3, 16);
|
|
|
+
|
|
|
//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 = parseInt(($high_alpha << 8) | $low_alpha, 16);
|
|
|
+ let $high_alpha = parseInt($high_alpha_1 + $high_alpha_2 + $high_alpha_3, 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);
|
|
|
+ let $low_beta = parseInt($low_beta_1 + $low_beta_2 + $low_beta_3, 16);
|
|
|
+
|
|
|
//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 = parseInt(($high_beta << 8) | $low_beta, 16);
|
|
|
- console.log("delta: " + $delta,
|
|
|
- "heta: " + $theta,
|
|
|
- "alpha: " + $alpha,
|
|
|
- "beta: " + $beta);
|
|
|
+ let $high_beta = parseInt($high_beta_1 + $high_beta_2 + $high_beta_3, 16);
|
|
|
+ console.log(
|
|
|
+ "att: " + $att,
|
|
|
+ "med: " + $med,
|
|
|
+ "delta: " + $delta,
|
|
|
+ "theta: " + $theta,
|
|
|
+ "low_alpha: " + $low_alpha,
|
|
|
+ "high_alpha: " + $high_alpha,
|
|
|
+ "low_beta: " + $low_beta,
|
|
|
+ "high_beta: " + $high_beta,
|
|
|
+ );
|
|
|
return {
|
|
|
att: $att,
|
|
|
med: $med,
|
|
|
delta: $delta,
|
|
|
theta: $theta,
|
|
|
- alpha: $alpha,
|
|
|
- beta: $beta,
|
|
|
+ low_alpha: $low_alpha,
|
|
|
+ high_alpha: $high_alpha,
|
|
|
+ low_beta: $low_beta,
|
|
|
+ high_beta: $high_beta
|
|
|
};
|
|
|
},
|
|
|
//获取设备电量
|
|
@@ -161,9 +151,9 @@ export default {
|
|
|
deviceId,
|
|
|
success: (res) => {
|
|
|
for (let i = 0; i < res.services.length; i++) {
|
|
|
- console.log("serviceItem:"+res.services[i].uuid);
|
|
|
+ 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);
|
|
|
+ console.log("SelectedServiceItem:" + res.services[i].uuid);
|
|
|
$this.getBLEDeviceCharacteristics(deviceId, res.services[i].uuid);
|
|
|
return;
|
|
|
}
|
|
@@ -177,7 +167,7 @@ export default {
|
|
|
|
|
|
//获取蓝牙设备某个服务中所有特征值
|
|
|
getBLEDeviceCharacteristics(deviceId, serviceId) {
|
|
|
- console.log(deviceId,serviceId);
|
|
|
+ console.log(deviceId, serviceId);
|
|
|
const $this = this;
|
|
|
wx.getBLEDeviceCharacteristics({
|
|
|
deviceId,
|