@ledvance/group-ui-biz-bundle 1.0.73 → 1.0.76

package/src/modules/timer/TimerPage.tsx

@@ -18,12 +18,12 @@ import TextButton from '@ledvance/base/src/components/TextButton'
 import { CircularProgress } from '@ledvance/base/src/components/CircularProgress'
 
 const { convertX: cx } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
 
-const TimerPage = () => {
+const TimerPage = (props: { theme?: any }) => {
   const devInfo = useDeviceInfo()
-
   const params = useParams<TimerPageParams>()
-  const [timerTasks, setTimerTasks, changeTimerTasks] = useTimerTasks(params.timerSettableDps)
+  const [timerTasks, setTimerTasks, changeTimerTasks] = useTimerTasks(params.timerSettableDps, params.devIdGroup)
 
   const state = useReactive({
     hour: '00',
@@ -48,6 +48,119 @@ const TimerPage = () => {
   const startedTasks = tasksByStatus[TaskStatus.Started] || []
   const startEnable = selectedTasks.length > 0
 
+
+  const styles = StyleSheet.create({
+    root: {
+      flex: 1,
+    },
+    content: {
+      marginHorizontal: cx(24),
+    },
+    applyFor: {
+      color: props.theme.global.fontColor,
+      fontSize: cx(16),
+      fontWeight: 'bold',
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    taskList: {
+      backgroundColor: props.theme.container.background,
+      paddingTop: cx(8),
+      borderRadius: cx(4),
+    },
+    taskItem: {
+      marginHorizontal: cx(8),
+      marginBottom: cx(8),
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+      alignItems: 'center',
+      backgroundColor: props.theme.global.background,
+    },
+    taskItemText: {
+      color: props.theme.global.fontColor,
+      fontSize: 14,
+      marginHorizontal: cx(8),
+      marginVertical: cx(9),
+    },
+    taskItemIcon: {
+      tintColor: props.theme.global.fontColor,
+      width: cx(16),
+      height: cx(16),
+      marginRight: cx(8),
+    },
+    listEmptyView: {
+      marginHorizontal: cx(8),
+      marginTop: cx(6),
+      marginBottom: cx(14),
+    },
+    listEmptyText: {
+      color: props.theme.global.secondFontColor,
+      fontSize: cx(14),
+    },
+    noSelectTaskList: {},
+    noSelectTaskItem: {
+      height: cx(30),
+      flexDirection: 'row',
+      alignItems: 'center',
+    },
+    noSelectTaskText: {
+      flex: 1,
+      color: props.theme.global.fontColor,
+      fontSize: cx(14),
+    },
+    activeTaskHeadLine: {
+      flexDirection: 'row',
+      alignItems: 'center',
+    },
+    activeTaskHeadLineText: {
+      flex: 1,
+      color: props.theme.global.fontColor,
+      fontSize: cx(14),
+    },
+    activeTaskHeadLineBtn: {
+      minWidth: cx(50),
+      height: cx(24),
+      padding: 0,
+      backgroundColor: props.theme.button.cancel,
+      borderRadius: cx(4),
+    },
+    activeTaskHeadLineBtnText: {
+      color: props.theme.button.fontColor,
+      fontSize: cx(8.2),
+    },
+    activeTaskTimeText: {
+      flex: 1,
+      color: props.theme.global.secondFontColor,
+      fontSize: cx(24),
+      fontWeight: 'bold',
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    activeTaskDesc: {
+      flex: 1,
+      color: props.theme.global.secondFontColor,
+      fontSize: cx(14),
+    },
+    activeTasBtn: {
+      width: 'auto',
+      height: cx(36),
+      padding: 0,
+      backgroundColor: props.theme.button.cancel,
+      borderRadius: cx(4),
+    },
+    activeTaskBtnText: {
+      color: props.theme.button.fontColor,
+      fontSize: cx(12.2),
+    },
+    activeTaskTimeText2: {
+      flex: 1,
+      marginHorizontal: cx(20),
+      color: props.theme.global.secondFontColor,
+      fontSize: cx(22),
+      textAlign: 'center',
+      fontWeight: 'bold',
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+  })
+
   return (
     <Page
       backText={devInfo.name}
@@ -136,7 +249,7 @@ const TimerPage = () => {
                         state.loading = false
                       }}
                       textStyle={{ fontSize: cx(14) }}
-                      style={{ backgroundColor: !startEnable ? '#FFE0D4' : '#f60' }}/>
+                      style={{ backgroundColor: !startEnable ? props.theme.button.disabled : props.theme.button.primary }}/>
               </View>
           }
           {startedTasks.length > 0 && params.timerSettableDps.length > 1 &&
@@ -150,7 +263,7 @@ const TimerPage = () => {
                   <FlatList
                       data={startedTasks}
                       renderItem={({ item }) => {
-                        return ActiveTimerItem(item, async () => {
+                        return ActiveTimerItem(item, styles,async () => {
                           state.loading = true
                           const tasks = cloneDeep(startedTasks)
                           tasks.forEach(task => {
@@ -213,7 +326,7 @@ const TimerPage = () => {
   )
 }
 
-function ActiveTimerItem(task: TimerTask, onCancel: () => void) {
+function ActiveTimerItem(task: TimerTask, styles: StyleSheet.NamedStyles<any>, onCancel: () => void) {
   return (
     <Card style={{ marginHorizontal: cx(24) }}>
       <Spacer/>
@@ -249,115 +362,5 @@ function ActiveTimerItem(task: TimerTask, onCancel: () => void) {
   )
 }
 
-const styles = StyleSheet.create({
-  root: {
-    flex: 1,
-  },
-  content: {
-    marginHorizontal: cx(24),
-  },
-  applyFor: {
-    color: '#000',
-    fontSize: cx(16),
-    fontWeight: 'bold',
-    fontFamily: 'helvetica_neue_lt_std_bd',
-  },
-  taskList: {
-    backgroundColor: '#f6f6f6',
-    paddingTop: cx(8),
-    borderRadius: cx(4),
-  },
-  taskItem: {
-    marginHorizontal: cx(8),
-    marginBottom: cx(8),
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    alignItems: 'center',
-    backgroundColor: '#fff',
-  },
-  taskItemText: {
-    color: '#000',
-    fontSize: 14,
-    marginHorizontal: cx(8),
-    marginVertical: cx(9),
-  },
-  taskItemIcon: {
-    width: cx(16),
-    height: cx(16),
-    marginRight: cx(8),
-  },
-  listEmptyView: {
-    marginHorizontal: cx(8),
-    marginTop: cx(6),
-    marginBottom: cx(14),
-  },
-  listEmptyText: {
-    color: '#666',
-    fontSize: cx(14),
-  },
-  noSelectTaskList: {},
-  noSelectTaskItem: {
-    height: cx(30),
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  noSelectTaskText: {
-    flex: 1,
-    color: '#000',
-    fontSize: cx(14),
-  },
-  activeTaskHeadLine: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  activeTaskHeadLineText: {
-    flex: 1,
-    color: '#000',
-    fontSize: cx(14),
-  },
-  activeTaskHeadLineBtn: {
-    minWidth: cx(50),
-    height: cx(24),
-    padding: 0,
-    backgroundColor: '#666',
-    borderRadius: cx(4),
-  },
-  activeTaskHeadLineBtnText: {
-    color: '#fff',
-    fontSize: cx(8.2),
-  },
-  activeTaskTimeText: {
-    flex: 1,
-    color: '#666',
-    fontSize: cx(24),
-    fontWeight: 'bold',
-    fontFamily: 'helvetica_neue_lt_std_bd',
-  },
-  activeTaskDesc: {
-    flex: 1,
-    color: '#666',
-    fontSize: cx(14),
-  },
-  activeTasBtn: {
-    width: 'auto',
-    height: cx(36),
-    padding: 0,
-    backgroundColor: '#666',
-    borderRadius: cx(4),
-  },
-  activeTaskBtnText: {
-    color: '#fff',
-    fontSize: cx(12.2),
-  },
-  activeTaskTimeText2: {
-    flex: 1,
-    marginHorizontal: cx(20),
-    color: '#666',
-    fontSize: cx(22),
-    textAlign: 'center',
-    fontWeight: 'bold',
-    fontFamily: 'helvetica_neue_lt_std_bd',
-  },
-})
 
-export default TimerPage
+export default withTheme(TimerPage)

package/src/modules/swithInching/pickerView.tsx

@@ -1,91 +0,0 @@
-import React from 'react'
-import { StyleProp, StyleSheet, View, ViewStyle, Text } from 'react-native'
-import { Picker, Utils } from 'tuya-panel-kit'
-import _ from 'lodash'
-
-const { convertX } = Utils.RatioUtils
-
-const hours = _.times(61, (n) => _.padStart(n.toString(), 2, '0'))
-const minutes = _.times(61, (n) => _.padStart(n.toString(), 2, '0'))
-const pickerTheme = {
-    fontSize: 20,
-}
-
-interface LdvPickerViewProps {
-    hour: string,
-    minute: string,
-    setHour: (string) => void,
-    setMinute: (string) => void,
-    style?: StyleProp<ViewStyle> | undefined,
-    unit?:string[]
-}
-
-const LdvPickerView = (props: LdvPickerViewProps) => {
-
-    const { hour, minute, unit, setHour, setMinute } = props
-
-    return (
-        <View style={[styles.pickerContainer, props.style]}>
-            <View style={styles.picContainer}>
-            <Picker
-                style={[styles.picker, styles.pickerLeft]}
-                theme={pickerTheme}
-                itemStyle={styles.pickerItem}
-                textSize={convertX(14)}
-                selectedValue={hour}
-                itemAlign={'center'}
-                onValueChange={value => setHour(value as string)}>
-                {hours.map((value) => (
-                    <Picker.Item key={value} value={value} label={value} />
-                ))}
-            </Picker>
-            {unit ? <View style={styles.pickerUnit}>
-                    <Text style={{ color: '#000', fontSize: convertX(18) }}>
-                        {unit[0]}
-                    </Text>
-                </View> : null}
-            </View>
-            <View style={styles.picContainer}>
-            <Picker
-                style={[styles.picker, styles.pickerLeft]}
-                theme={pickerTheme}
-                itemStyle={styles.pickerItem}
-                textSize={convertX(14)}
-                selectedValue={minute}
-                onValueChange={value => setMinute(value as string)}>
-                {minutes.map((value) => (
-                    <Picker.Item key={value} value={value} label={value} />
-                ))}
-            </Picker>
-            {unit ? <View style={styles.pickerUnit}>
-                    <Text style={{ color: '#000', fontSize: convertX(18) }}>
-                        {unit[1]}
-                    </Text>
-                </View> : null}
-            </View>
-        </View>
-    )
-}
-
-const styles = StyleSheet.create({
-  pickerContainer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  picker: {
-    flex: 1,
-  },
-  pickerLeft: {},
-  pickerItem: {},
-  picContainer: {
-    flex: 1,
-    alignItems: 'center',
-    flexDirection: 'row',
-  },
-  pickerUnit: {
-    position: 'absolute',
-    right: convertX(20),
-  },
-});
-
-export default LdvPickerView