|
|
@@ -2815,13 +2815,13 @@ Page({
|
|
|
// rdt_arrTemp = that.splitN(ress.data.results.rdt_arr.split(","), 100);
|
|
|
rdt_arrTemp = ress.data.results.rdt_arr.split(",");
|
|
|
}
|
|
|
- console.log('深浅睡眠11111=======' + JSON.stringify(rdt_arrTemp));
|
|
|
+ // console.log('深浅睡眠11111=======' + JSON.stringify(rdt_arrTemp));
|
|
|
let rsleep_arr_Temp = [];
|
|
|
if (ress.data.results.rsleep_arr) {
|
|
|
// rsleep_arr_Temp = that.splitN(ress.data.results.rsleep_arr.split(","), 100);
|
|
|
rsleep_arr_Temp = ress.data.results.rsleep_arr.split(",");
|
|
|
}
|
|
|
- console.log('深浅睡眠222222=======' + JSON.stringify(rsleep_arr_Temp));
|
|
|
+ // console.log('深浅睡眠222222=======' + JSON.stringify(rsleep_arr_Temp));
|
|
|
that.setData({
|
|
|
rdt_arrNew: rdt_arrTemp,
|
|
|
rsleep_arr: rsleep_arr_Temp,
|
|
|
@@ -2835,10 +2835,10 @@ Page({
|
|
|
rawake_durationFormat: that.convertTimeToHoursAndMinutes(ress.data.results.rawake_duration),
|
|
|
});
|
|
|
|
|
|
- console.log('ress.data.results.rdeep_duration=' + ress.data.results.rdeep_duration);
|
|
|
- console.log('ress.data.results.rlight_duration=' + ress.data.results.rlight_duration);
|
|
|
- console.log('ress.data.results.rin_duration=' + ress.data.results.rin_duration);
|
|
|
- console.log('ress.data.results.rawake_duration=' + ress.data.results.rawake_duration);
|
|
|
+ // console.log('ress.data.results.rdeep_duration=' + ress.data.results.rdeep_duration);
|
|
|
+ // console.log('ress.data.results.rlight_duration=' + ress.data.results.rlight_duration);
|
|
|
+ // console.log('ress.data.results.rin_duration=' + ress.data.results.rin_duration);
|
|
|
+ // console.log('ress.data.results.rawake_duration=' + ress.data.results.rawake_duration);
|
|
|
|
|
|
|
|
|
that.calculateTheDurationOfDeepSleep();
|
|
|
@@ -4210,15 +4210,15 @@ Page({
|
|
|
},
|
|
|
calculateTheDurationOfDeepSleep() {
|
|
|
var that = this;
|
|
|
- var totalDuration = this.data.total_duration;
|
|
|
- var timePeriod = this.data.rdt_arrNew;
|
|
|
+ // var totalDuration = this.data.total_duration;
|
|
|
+ // var timePeriod = this.data.rdt_arrNew;
|
|
|
var sleepData = this.data.rsleep_arr;//睡眠状态数据集合,0-清醒,10-浅睡,20-中睡,30-深睡
|
|
|
|
|
|
- console.log("睡眠总时长=>", totalDuration);
|
|
|
- console.log("睡眠时间片段=>", timePeriod);
|
|
|
- console.log("睡眠时间片段=>", timePeriod.length);
|
|
|
- console.log("睡眠数据=>", sleepData);
|
|
|
- console.log("睡眠数据=>", sleepData.length);
|
|
|
+ // console.log("睡眠总时长=>", totalDuration);
|
|
|
+ // console.log("睡眠时间片段=>", timePeriod);
|
|
|
+ // console.log("睡眠时间片段=>", timePeriod.length);
|
|
|
+ // console.log("睡眠数据=>", sleepData);
|
|
|
+ // console.log("睡眠数据=>", sleepData.length);
|
|
|
var awakeColor = [{ offset: 0, color: '#F7FCBE' }, { offset: 1, color: '#FDBE25' }];;
|
|
|
var lightSleepColor = [{ offset: 0, color: '#FDBE25' }, { offset: 1, color: '#FD7778' }];
|
|
|
var sleptInColor = [{ offset: 0, color: '#FD7778' }, { offset: 1, color: '#AA3CFF' }];
|
|
|
@@ -4332,9 +4332,9 @@ Page({
|
|
|
}
|
|
|
}
|
|
|
updateTimeWaterfall(startTime, timePeriods, that)
|
|
|
- console.log("睡眠数据最终=>", dateString);
|
|
|
- console.log("睡眠数据最终=>", startTime);
|
|
|
- console.log("睡眠数据最终=>", JSON.stringify(timePeriods));
|
|
|
+ // console.log("睡眠数据最终=>", dateString);
|
|
|
+ // console.log("睡眠数据最终=>", startTime);
|
|
|
+ // console.log("睡眠数据最终=>", JSON.stringify(timePeriods));
|
|
|
},
|
|
|
onReady() {
|
|
|
var that = this;
|
柒零