diff --git a/index/index.js b/index/index.js index 2afb477..13b9ce4 100644 --- a/index/index.js +++ b/index/index.js @@ -79,7 +79,8 @@ Page({ const hexStr = this.uint8ArrayToMac(new Uint8Array(device.advertisData)) 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); } }); diff --git a/utils/ParseDataPacket.js b/utils/ParseDataPacket.js index 6d37cf0..4cae8ef 100644 --- a/utils/ParseDataPacket.js +++ b/utils/ParseDataPacket.js @@ -39,9 +39,10 @@ const parseDataPacket = { case 0: return 2; // 深睡 case 2: + case 3: return 1; // 浅睡 - case 3: - return 4; // REM + // case 3: + // return 4; // REM case 4: default: return 3; // 清醒 @@ -352,8 +353,12 @@ const parseDataPacket = { // 开始循环遍历 sleepData 数据 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({ minute: currentMinute + 1, // 分钟递增