leon vor 1 Jahr
Ursprung
Commit
fba4827a50

+ 1 - 1
src/_health/base/new_button.tsx

@@ -217,7 +217,7 @@ export default function NewButton(props: {
                 alignItems: 'center',
                 justifyContent: 'center',
                 borderRadius: rpxToPx(11),
-                backgroundColor: isTouched ? '#b2b2b24d' : '#b2b2b21a'
+                backgroundColor: isTouched ? MainColorType.g03+'4d' : MainColorType.g03+'1a'
             }}
                 catchMove
                 onClick={(e) => {

+ 1 - 0
src/_health/base/status_indicator.tsx

@@ -55,6 +55,7 @@ export default function StatusIndicator(props: {
                     height: rpxToPx(32),
                     borderRadius: rpxToPx(16),
                     backgroundColor: props.color,
+                    marginTop:rpxToPx(2),
                     display: 'flex',
                     alignItems: 'center',
                     justifyContent: 'center'

+ 3 - 3
src/_health/components/card.scss

@@ -7,7 +7,7 @@
     width: 698px;
     flex-direction: column;
     overflow: hidden;
-    -webkit-backface-visibility: hidden;
-    -webkit-mask-image: -webkit-radial-gradient(white,black);
-    flex-shrink: 0;
+    // -webkit-backface-visibility: hidden;
+    // -webkit-mask-image: -webkit-radial-gradient(white,black);
+    // flex-shrink: 0;
 }

+ 1 - 3
src/_health/components/schedule_item.tsx

@@ -52,13 +52,11 @@ export default function ScheduleItem(props: {
             color: obj.window == props.selMode ? getThemeColor(props.selMode) : '#000'
         }
     }
-
-
     return <View key={props.key}>
         <AtSwipeAction
             isOpened={false}
             autoClose
-            disabled={props.obj.window != 'EAT' && props.obj.window != 'ACTIVE' && !props.disable}
+            disabled={(props.obj.window != 'EAT' && props.obj.window != 'ACTIVE' && !props.disable) || props.obj.window == 'FAST' || props.obj.window == 'SLEEP'}
             options={[
                 {
                     text: '删除',

Datei-Diff unterdrückt, da er zu groß ist
+ 21 - 8
src/components/basic/Icons.tsx


+ 7 - 4
src/features/health/MainConsole.tsx

@@ -14,7 +14,7 @@ import showActionSheet from "@/components/basic/ActionSheet";
 import { rpxToPx } from "@/utils/tools";
 import { setMode, setShowActionTip } from "@/store/health";
 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 Taro from "@tarojs/taro";
 import { systemLocation } from "@/services/common";
@@ -175,7 +175,7 @@ export default function MainConsole(props: { type: WindowType }) {
         let themeColor: any = getThemeColor(health.mode)
         const scenario = getScenario(health.windows, health.mode)
         if (item.action == 'END' && !scenario.real) {
-            themeColor = '#B2B2B2'
+            themeColor = MainColorType.g03
         }
         if (health.mode == 'DAY' || health.mode == 'NIGHT') {
             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')} />
             }
         }
+        if (timeline.target.timestamp < new Date().getTime()) {
+            return <IconMiss color="#fff" width={rpxToPx(24)} />
+        }
         if (timeline.real) {
             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 statusView() {
             return <StatusIndicator type={StatusType.console}
-                color={getIconColor(index)}
+                color={getThemeColor(health.mode)}
                 text={itemTitle(item)}
                 fontSize={rpxToPx(24)}
             >{
@@ -892,7 +895,7 @@ export default function MainConsole(props: { type: WindowType }) {
         {
             health.mode == 'ACTIVE' && <View>
                 <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"
                     onClick={() => {
                         jumpPage('/_health/pages/move')

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.