|
|
@@ -62,20 +62,20 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
// sleep.real_start_time = sleepStart.time
|
|
|
// sleep.real_start_date = sleepStart.date
|
|
|
|
|
|
- fast.real_start ={
|
|
|
- time:fastStart.time,
|
|
|
- date:fastStart.date,
|
|
|
- extra:{
|
|
|
- set_time:fastStart.set_time,
|
|
|
- confirm_time:fastStart.confirm_time
|
|
|
+ fast.real_start = {
|
|
|
+ time: fastStart.time,
|
|
|
+ date: fastStart.date,
|
|
|
+ extra: {
|
|
|
+ set_time: fastStart.set_time,
|
|
|
+ confirm_time: fastStart.confirm_time
|
|
|
}
|
|
|
}
|
|
|
- sleep.real_start ={
|
|
|
- time:sleepStart.time,
|
|
|
- date:sleepStart.date,
|
|
|
- extra:{
|
|
|
- set_time:sleepStart.set_time,
|
|
|
- confirm_time:sleepStart.confirm_time
|
|
|
+ sleep.real_start = {
|
|
|
+ time: sleepStart.time,
|
|
|
+ date: sleepStart.date,
|
|
|
+ extra: {
|
|
|
+ set_time: sleepStart.set_time,
|
|
|
+ confirm_time: sleepStart.confirm_time
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
@@ -93,12 +93,12 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
// fast.real_start_time = fastStart.time
|
|
|
// fast.real_start_date = fastStart.date
|
|
|
|
|
|
- fast.real_start ={
|
|
|
- time:fastStart.time,
|
|
|
- date:fastStart.date,
|
|
|
- extra:{
|
|
|
- set_time:fastStart.set_time,
|
|
|
- confirm_time:fastStart.confirm_time
|
|
|
+ fast.real_start = {
|
|
|
+ time: fastStart.time,
|
|
|
+ date: fastStart.date,
|
|
|
+ extra: {
|
|
|
+ set_time: fastStart.set_time,
|
|
|
+ confirm_time: fastStart.confirm_time
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -125,21 +125,21 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
// sleep.real_end_time = sleepEnd.time
|
|
|
// sleep.real_end_date = sleepEnd.date
|
|
|
|
|
|
- sleep.real_start ={
|
|
|
- time:sleepStart.time,
|
|
|
- date:sleepStart.date,
|
|
|
- extra:{
|
|
|
- set_time:sleepStart.set_time,
|
|
|
- confirm_time:sleepStart.confirm_time
|
|
|
+ sleep.real_start = {
|
|
|
+ time: sleepStart.time,
|
|
|
+ date: sleepStart.date,
|
|
|
+ extra: {
|
|
|
+ set_time: sleepStart.set_time,
|
|
|
+ confirm_time: sleepStart.confirm_time
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- sleep.real_end ={
|
|
|
- time:sleepEnd.time,
|
|
|
- date:sleepEnd.date,
|
|
|
- extra:{
|
|
|
- set_time:sleepEnd.set_time,
|
|
|
- confirm_time:sleepEnd.confirm_time
|
|
|
+ sleep.real_end = {
|
|
|
+ time: sleepEnd.time,
|
|
|
+ date: sleepEnd.date,
|
|
|
+ extra: {
|
|
|
+ set_time: sleepEnd.set_time,
|
|
|
+ confirm_time: sleepEnd.confirm_time
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
@@ -164,12 +164,12 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
// fast.real_start_time = fastStart.time
|
|
|
// fast.real_start_date = fastStart.date
|
|
|
|
|
|
- fast.real_start ={
|
|
|
- time:fastStart.time,
|
|
|
- date:fastStart.date,
|
|
|
- extra:{
|
|
|
- set_time:fastStart.set_time,
|
|
|
- confirm_time:fastStart.confirm_time
|
|
|
+ fast.real_start = {
|
|
|
+ time: fastStart.time,
|
|
|
+ date: fastStart.date,
|
|
|
+ extra: {
|
|
|
+ set_time: fastStart.set_time,
|
|
|
+ confirm_time: fastStart.confirm_time
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -178,12 +178,12 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
// sleep.real_start_confirm_time = sleepStart.confirm_time
|
|
|
// sleep.real_start_time = sleepStart.time
|
|
|
// sleep.real_start_date = sleepStart.date
|
|
|
- sleep.real_start ={
|
|
|
- time:sleepStart.time,
|
|
|
- date:sleepStart.date,
|
|
|
- extra:{
|
|
|
- set_time:sleepStart.set_time,
|
|
|
- confirm_time:sleepStart.confirm_time
|
|
|
+ sleep.real_start = {
|
|
|
+ time: sleepStart.time,
|
|
|
+ date: sleepStart.date,
|
|
|
+ extra: {
|
|
|
+ set_time: sleepStart.set_time,
|
|
|
+ confirm_time: sleepStart.confirm_time
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -202,12 +202,12 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
// sleep.real_start_confirm_time = sleepStart.confirm_time
|
|
|
// sleep.real_start_time = sleepStart.time
|
|
|
// sleep.real_start_date = sleepStart.date
|
|
|
- sleep.real_start ={
|
|
|
- time:sleepStart.time,
|
|
|
- date:sleepStart.date,
|
|
|
- extra:{
|
|
|
- set_time:sleepStart.set_time,
|
|
|
- confirm_time:sleepStart.confirm_time
|
|
|
+ sleep.real_start = {
|
|
|
+ time: sleepStart.time,
|
|
|
+ date: sleepStart.date,
|
|
|
+ extra: {
|
|
|
+ set_time: sleepStart.set_time,
|
|
|
+ confirm_time: sleepStart.confirm_time
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -231,12 +231,12 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
// sleep.real_end_confirm_time = sleepEnd.confirm_time
|
|
|
// sleep.real_end_time = sleepEnd.time
|
|
|
// sleep.real_end_date = sleepEnd.date
|
|
|
- sleep.real_end ={
|
|
|
- time:sleepEnd.time,
|
|
|
- date:sleepEnd.date,
|
|
|
- extra:{
|
|
|
- set_time:sleepEnd.set_time,
|
|
|
- confirm_time:sleepEnd.confirm_time
|
|
|
+ sleep.real_end = {
|
|
|
+ time: sleepEnd.time,
|
|
|
+ date: sleepEnd.date,
|
|
|
+ extra: {
|
|
|
+ set_time: sleepEnd.set_time,
|
|
|
+ confirm_time: sleepEnd.confirm_time
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -244,12 +244,12 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
// fast.real_end_confirm_time = fastEnd.confirm_time
|
|
|
// fast.real_end_time = fastEnd.time
|
|
|
// fast.real_end_date = fastEnd.date
|
|
|
- fast.real_end ={
|
|
|
- time:fastEnd.time,
|
|
|
- date:fastEnd.date,
|
|
|
- extra:{
|
|
|
- set_time:fastEnd.set_time,
|
|
|
- confirm_time:fastEnd.confirm_time
|
|
|
+ fast.real_end = {
|
|
|
+ time: fastEnd.time,
|
|
|
+ date: fastEnd.date,
|
|
|
+ extra: {
|
|
|
+ set_time: fastEnd.set_time,
|
|
|
+ confirm_time: fastEnd.confirm_time
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
@@ -364,7 +364,7 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
else if (operateType == 'endSleep') {
|
|
|
title = t('feature.track_time_duration.console.real_sleep_end_dt')
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
var color = operateType == 'startFast' || operateType == 'endFast' ? ColorType.fast : ColorType.sleep
|
|
|
var endTimestamp = min
|
|
|
|
|
|
@@ -395,32 +395,32 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
global.pauseIndexTimer = false
|
|
|
if (operateType == 'startFast') {
|
|
|
setFastStart({
|
|
|
- set_time:defaultTimestamp,
|
|
|
- confirm_time:new Date().getTime(),
|
|
|
+ set_time: defaultTimestamp,
|
|
|
+ confirm_time: new Date().getTime(),
|
|
|
time: e,
|
|
|
date: dayjs(e).format('YYYYMMDD')
|
|
|
})
|
|
|
}
|
|
|
else if (operateType == 'endFast') {
|
|
|
setFastEnd({
|
|
|
- set_time:defaultTimestamp,
|
|
|
- confirm_time:new Date().getTime(),
|
|
|
+ set_time: defaultTimestamp,
|
|
|
+ confirm_time: new Date().getTime(),
|
|
|
time: e,
|
|
|
date: dayjs(e).format('YYYYMMDD')
|
|
|
})
|
|
|
}
|
|
|
else if (operateType == 'startSleep') {
|
|
|
setSleepStart({
|
|
|
- set_time:defaultTimestamp,
|
|
|
- confirm_time:new Date().getTime(),
|
|
|
+ set_time: defaultTimestamp,
|
|
|
+ confirm_time: new Date().getTime(),
|
|
|
time: e,
|
|
|
date: dayjs(e).format('YYYYMMDD')
|
|
|
})
|
|
|
}
|
|
|
else {
|
|
|
setSleepEnd({
|
|
|
- set_time:defaultTimestamp,
|
|
|
- confirm_time:new Date().getTime(),
|
|
|
+ set_time: defaultTimestamp,
|
|
|
+ confirm_time: new Date().getTime(),
|
|
|
time: e,
|
|
|
date: dayjs(e).format('YYYYMMDD')
|
|
|
})
|
|
|
@@ -455,27 +455,45 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
|
|
|
{
|
|
|
props.event == 'start_sleep' && startFastCell()
|
|
|
}
|
|
|
+ {
|
|
|
+ props.event == 'start_sleep' && <View className="new_item_cell_line" />
|
|
|
+ }
|
|
|
{
|
|
|
props.event == 'start_sleep' && startSleepCell()
|
|
|
}
|
|
|
{
|
|
|
props.event == 'end_sleep' && props.status == 'WAIT_FOR_START' && startFastCell()
|
|
|
}
|
|
|
+ {
|
|
|
+ props.event == 'end_sleep' && props.status == 'WAIT_FOR_START' && <View className="new_item_cell_line" />
|
|
|
+ }
|
|
|
{
|
|
|
props.event == 'end_sleep' && startSleepCell()
|
|
|
}
|
|
|
+ {
|
|
|
+ props.event == 'end_sleep' && <View className="new_item_cell_line" />
|
|
|
+ }
|
|
|
{
|
|
|
props.event == 'end_sleep' && endSleepCell()
|
|
|
}
|
|
|
{
|
|
|
props.event == 'end_fast' && props.status == 'WAIT_FOR_START' && startFastCell()
|
|
|
}
|
|
|
+ {
|
|
|
+ props.event == 'end_fast' && props.status == 'WAIT_FOR_START' && <View className="new_item_cell_line" />
|
|
|
+ }
|
|
|
{
|
|
|
props.event == 'end_fast' && props.scenario == 'FAST_SLEEP' && (props.status == 'ONGOING1' || props.status == 'WAIT_FOR_START') && startSleepCell()
|
|
|
}
|
|
|
+ {
|
|
|
+ props.event == 'end_fast' && props.scenario == 'FAST_SLEEP' && (props.status == 'ONGOING1' || props.status == 'WAIT_FOR_START') && <View className="new_item_cell_line" />
|
|
|
+ }
|
|
|
{
|
|
|
props.event == 'end_fast' && props.scenario == 'FAST_SLEEP' && (props.status == 'ONGOING1' || props.status == 'ONGOING2' || props.status == 'WAIT_FOR_START') && endSleepCell()
|
|
|
}
|
|
|
+ {
|
|
|
+ props.event == 'end_fast' && props.scenario == 'FAST_SLEEP' && (props.status == 'ONGOING1' || props.status == 'ONGOING2' || props.status == 'WAIT_FOR_START') && <View className="new_item_cell_line" />
|
|
|
+ }
|
|
|
{
|
|
|
props.event == 'end_fast' && endFastCell()
|
|
|
}
|