|
|
@@ -72,7 +72,7 @@ export default function MainFastEatCard(props: { count: any, typeChanged: Functi
|
|
|
useEffect(() => {
|
|
|
const { fast, eat } = health.windows.fast_eat
|
|
|
var now = new Date().getTime()
|
|
|
- if ((fast.status == 'WAIT_FOR_END' || fast.target.start_time <= now && fast.target.end_time >= now) || isCurrentTimeInRange(fast.schedule.start_time, fast.schedule.end_time)) {
|
|
|
+ if ((fast.status == 'WAIT_FOR_END' || fast.target.start_time <= now && fast.target.end_time >= now) || isCurrentTimeInRange(fast.period.start_time, fast.period.end_time)) {
|
|
|
setIsFastMode(true)
|
|
|
}
|
|
|
else {
|
|
|
@@ -81,8 +81,8 @@ export default function MainFastEatCard(props: { count: any, typeChanged: Functi
|
|
|
|
|
|
setEatData(eat)
|
|
|
setFastData(fast)
|
|
|
- setStartScheduleTime(fast.schedule.start_time)
|
|
|
- setEndScheduleTime(fast.schedule.end_time)
|
|
|
+ setStartScheduleTime(fast.period.start_time)
|
|
|
+ setEndScheduleTime(fast.period.end_time)
|
|
|
|
|
|
update(fast)
|
|
|
}, [user.isLogin])
|
|
|
@@ -112,8 +112,8 @@ export default function MainFastEatCard(props: { count: any, typeChanged: Functi
|
|
|
const fast = fast_win.fast
|
|
|
setEatData(eat_win)
|
|
|
setFastData(fast_win)
|
|
|
- setStartScheduleTime(fast_win.fast.schedule.start_time)
|
|
|
- setEndScheduleTime(fast_win.fast.schedule.end_time)
|
|
|
+ setStartScheduleTime(fast_win.fast.period.start_time)
|
|
|
+ setEndScheduleTime(fast_win.fast.period.end_time)
|
|
|
})
|
|
|
}
|
|
|
|
|
|
@@ -123,8 +123,8 @@ export default function MainFastEatCard(props: { count: any, typeChanged: Functi
|
|
|
if (fast.status == 'WAIT_FOR_END') {
|
|
|
setStatus('process')
|
|
|
}
|
|
|
- else if ((fast.target.start_timestamp <= now && fast.target.end_timestamp >= now) || isCurrentTimeInRange(fast.schedule.start_time, fast.schedule.end_time)) {
|
|
|
- setStartTime(fast.schedule.start_time)
|
|
|
+ else if ((fast.target.start_timestamp <= now && fast.target.end_timestamp >= now) || isCurrentTimeInRange(fast.period.start_time, fast.period.end_time)) {
|
|
|
+ setStartTime(fast.period.start_time)
|
|
|
setStatus('new')
|
|
|
}
|
|
|
else {
|
|
|
@@ -354,9 +354,9 @@ export default function MainFastEatCard(props: { count: any, typeChanged: Functi
|
|
|
milliSeconds = new Date().getTime() - fastData.real_start_time
|
|
|
break;
|
|
|
case 'new':
|
|
|
- return getTimeToDestination(fastData.schedule.start_time, true)
|
|
|
+ return getTimeToDestination(fastData.period.start_time, true)
|
|
|
case 'upcoming':
|
|
|
- return getTimeToDestination(fastData.schedule.start_time, false)
|
|
|
+ return getTimeToDestination(fastData.period.start_time, false)
|
|
|
|
|
|
}
|
|
|
var seconds = Math.floor(milliSeconds / 1000)
|
|
|
@@ -368,7 +368,7 @@ export default function MainFastEatCard(props: { count: any, typeChanged: Functi
|
|
|
|
|
|
function getEatTime() {
|
|
|
|
|
|
- return getTimeToDestination(eatData.schedule.start_time, isCurrentTimeInRange(eatData.schedule.start_time, eatData.schedule.end_time))
|
|
|
+ return getTimeToDestination(eatData.period.start_time, isCurrentTimeInRange(eatData.period.start_time, eatData.period.end_time))
|
|
|
}
|
|
|
|
|
|
function tapFastStart() {
|
|
|
@@ -708,7 +708,7 @@ export default function MainFastEatCard(props: { count: any, typeChanged: Functi
|
|
|
<View className="schedule">
|
|
|
<Text className="schedule_name">{item.name}</Text>
|
|
|
<Text className="schedule">
|
|
|
- {item.real_start_time ? dayjs(item.real_start_time).format('HH:mm') + ' - ' + dayjs(item.real_end_time).format('HH:mm') : item.schedule.start_time}
|
|
|
+ {item.real_start_time ? dayjs(item.real_start_time).format('HH:mm') + ' - ' + dayjs(item.real_end_time).format('HH:mm') : item.period.start_time}
|
|
|
</Text>
|
|
|
</View>
|
|
|
<View style={{ flex: 1 }} />
|