|
@@ -14,7 +14,7 @@ import showActionSheet from "@/components/basic/ActionSheet";
|
|
|
import { rpxToPx } from "@/utils/tools";
|
|
import { rpxToPx } from "@/utils/tools";
|
|
|
import { setMode, setShowActionTip } from "@/store/health";
|
|
import { setMode, setShowActionTip } from "@/store/health";
|
|
|
import { getCountownTime, getDuration, getScenario, getThemeColor, getWindowStatus } from "./hooks/health_hooks";
|
|
import { getCountownTime, getDuration, getScenario, getThemeColor, getWindowStatus } from "./hooks/health_hooks";
|
|
|
-import { IconArrow, IconClose, IconMore, IconNotification, IconNotificationOff, IconSwitch, IconWalk } from "@/components/basic/Icons";
|
|
|
|
|
|
|
+import { IconArrow, IconClose, IconMiss, IconMore, IconNotification, IconNotificationOff, IconSwitch, IconWalk } from "@/components/basic/Icons";
|
|
|
import DurationPicker from "@/_health/components/duration_picker";
|
|
import DurationPicker from "@/_health/components/duration_picker";
|
|
|
import Taro from "@tarojs/taro";
|
|
import Taro from "@tarojs/taro";
|
|
|
import { systemLocation } from "@/services/common";
|
|
import { systemLocation } from "@/services/common";
|
|
@@ -175,7 +175,7 @@ export default function MainConsole(props: { type: WindowType }) {
|
|
|
let themeColor: any = getThemeColor(health.mode)
|
|
let themeColor: any = getThemeColor(health.mode)
|
|
|
const scenario = getScenario(health.windows, health.mode)
|
|
const scenario = getScenario(health.windows, health.mode)
|
|
|
if (item.action == 'END' && !scenario.real) {
|
|
if (item.action == 'END' && !scenario.real) {
|
|
|
- themeColor = '#B2B2B2'
|
|
|
|
|
|
|
+ themeColor = MainColorType.g03
|
|
|
}
|
|
}
|
|
|
if (health.mode == 'DAY' || health.mode == 'NIGHT') {
|
|
if (health.mode == 'DAY' || health.mode == 'NIGHT') {
|
|
|
return null
|
|
return null
|
|
@@ -280,6 +280,9 @@ export default function MainConsole(props: { type: WindowType }) {
|
|
|
return <Image style={{ width: rpxToPx(24), height: rpxToPx(24) }} src={require('@assets/_health/checked.png')} />
|
|
return <Image style={{ width: rpxToPx(24), height: rpxToPx(24) }} src={require('@assets/_health/checked.png')} />
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if (timeline.target.timestamp < new Date().getTime()) {
|
|
|
|
|
+ return <IconMiss color="#fff" width={rpxToPx(24)} />
|
|
|
|
|
+ }
|
|
|
if (timeline.real) {
|
|
if (timeline.real) {
|
|
|
return <Image style={{ width: rpxToPx(24), height: rpxToPx(24) }} src={require('@assets/_health/checked.png')} />
|
|
return <Image style={{ width: rpxToPx(24), height: rpxToPx(24) }} src={require('@assets/_health/checked.png')} />
|
|
|
}
|
|
}
|
|
@@ -289,7 +292,7 @@ export default function MainConsole(props: { type: WindowType }) {
|
|
|
function timelineItem(item: any, index: number, count: number) {
|
|
function timelineItem(item: any, index: number, count: number) {
|
|
|
function statusView() {
|
|
function statusView() {
|
|
|
return <StatusIndicator type={StatusType.console}
|
|
return <StatusIndicator type={StatusType.console}
|
|
|
- color={getIconColor(index)}
|
|
|
|
|
|
|
+ color={getThemeColor(health.mode)}
|
|
|
text={itemTitle(item)}
|
|
text={itemTitle(item)}
|
|
|
fontSize={rpxToPx(24)}
|
|
fontSize={rpxToPx(24)}
|
|
|
>{
|
|
>{
|
|
@@ -892,7 +895,7 @@ export default function MainConsole(props: { type: WindowType }) {
|
|
|
{
|
|
{
|
|
|
health.mode == 'ACTIVE' && <View>
|
|
health.mode == 'ACTIVE' && <View>
|
|
|
<View className="main_column_space" /><IconTitleCell
|
|
<View className="main_column_space" /><IconTitleCell
|
|
|
- icon={<IconWalk width={rpxToPx(32)} color={MainColorType.active}/>}
|
|
|
|
|
|
|
+ icon={<IconWalk width={rpxToPx(32)} color={MainColorType.active} />}
|
|
|
title="Move More"
|
|
title="Move More"
|
|
|
onClick={() => {
|
|
onClick={() => {
|
|
|
jumpPage('/_health/pages/move')
|
|
jumpPage('/_health/pages/move')
|