修复bug

main
sjchen 5 months ago
parent 21eca7fdcf
commit 5cfa0bb8a3

@ -79,7 +79,8 @@ Page({
const hexStr = this.uint8ArrayToMac(new Uint8Array(device.advertisData)) const hexStr = this.uint8ArrayToMac(new Uint8Array(device.advertisData))
console.log("advertisData: ",hexStr) console.log("advertisData: ",hexStr)
// 连接指定设备 // 连接指定设备
if(device.deviceId=="03:02:02:07:65:98"){ // if(device.deviceId=="03:02:02:07:65:98"){
if(device.deviceId=="03:02:02:07:5F:AF"){
this.connectToDevice(device.deviceId); this.connectToDevice(device.deviceId);
} }
}); });

@ -39,9 +39,10 @@ const parseDataPacket = {
case 0: case 0:
return 2; // 深睡 return 2; // 深睡
case 2: case 2:
return 1; // 浅睡
case 3: case 3:
return 4; // REM return 1; // 浅睡
// case 3:
// return 4; // REM
case 4: case 4:
default: default:
return 3; // 清醒 return 3; // 清醒
@ -353,7 +354,11 @@ const parseDataPacket = {
// 开始循环遍历 sleepData 数据 // 开始循环遍历 sleepData 数据
for (let i = 0; i < sleepData.length; i++) { for (let i = 0; i < sleepData.length; i++) {
const status = sleepData[i]; const status = sleepData[i];
let m = currentMinute + 1
if(m > 660 && m < 1200){
break;
}
// 处理每分钟的睡眠数据 // 处理每分钟的睡眠数据
result.push({ result.push({
minute: currentMinute + 1, // 分钟递增 minute: currentMinute + 1, // 分钟递增

Loading…
Cancel
Save