@ledvance/ui-biz-bundle 1.1.86 → 1.1.89

package/src/newModules/energyConsumption/EnergyConsumptionChart.tsx

@@ -12,6 +12,7 @@ import Spacer from "@ledvance/base/src/components/Spacer";
 import InfoText from "@ledvance/base/src/components/InfoText";
 
 const { convertX: cx, height, width } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
 
 export interface EnergyConsumptionChartProps {
   addEleDpCode: string
@@ -21,37 +22,48 @@ export interface EnergyConsumptionChartProps {
   over7Days?: boolean
 }
 
-const EnergyConsumptionChart = () => {
-  const props = useRoute().params as EnergyConsumptionChartProps
+const EnergyConsumptionChart = (props: { theme?: any }) => {
+  const params = useRoute().params as EnergyConsumptionChartProps
   const computeNum = Platform.OS === 'ios' && 180 || 130
+
+  const styles = StyleSheet.create({
+    listEmptyView: {
+      alignItems: 'center',
+    },
+    listEmptyImage: {
+      width: cx(200),
+      height: cx(200),
+    },
+  })
+
   return (
     <Page
       backText={I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}
-      headlineText={props.headlineText}
-      headlineIcon={props.chartData?.length ? res.download_icon : undefined}
+      headlineText={params.headlineText}
+      headlineIcon={params.chartData?.length ? res.download_icon : undefined}
       onHeadlineIconClick={() => {
-        exportFile(props.chartData)
+        exportFile(params.chartData)
       }}
       showGreenery={false}
       greeneryIcon={res.energy_consumption_greenery}
     >
       <View style={{ marginHorizontal: cx(24) }}>
         {
-          props.over7Days ? (
+          params.over7Days ? (
             <View style={styles.listEmptyView}>
               <Spacer height={cx(26)} />
               <Image
                 style={styles.listEmptyImage}
                 source={{ uri: res.ldv_timer_empty }} />
               <Spacer height={cx(14)} />
-              <InfoText 
+              <InfoText
                 text={I18n.getLang('energyconsumption_hourlylimit')}
                 icon={res.ic_info}
-                contentColor='#000'
+                contentColor={props.theme.global.fontColor}
               />
             </View>
           ) : (
-            <BarChart height={height - cx(computeNum)} data={props.chartData} width={width - cx(80)} />
+            <BarChart height={height - cx(computeNum)} data={params.chartData} width={width - cx(80)} />
           )
         }
       </View>
@@ -59,24 +71,4 @@ const EnergyConsumptionChart = () => {
   )
 }
 
-const styles = StyleSheet.create({
-  listEmptyView: {
-    alignItems: 'center',
-  },
-  listEmptyImage: {
-    width: cx(200),
-    height: cx(200),
-  },
-  listEmptyTextIcon: {
-    width: cx(16),
-    height: cx(16),
-    tintColor: '#000',
-  },
-  listEmptyText: {
-    color: '#000',
-    fontSize: cx(12),
-    fontFamily: 'helvetica_neue_lt_std_roman',
-  },
-});
-
-export default EnergyConsumptionChart
+export default withTheme(EnergyConsumptionChart)

package/src/newModules/energyConsumption/EnergyConsumptionDetail.tsx

@@ -90,7 +90,7 @@ const EnergyConsumptionDetail = (props: {theme?: any}) => {
         const key = `${dateStr} (${loopsText[dayOfWeek]})`
         return {
           key,
-          value: dayList[time],
+          value: Number(dayList[time] || 0).toFixed(2),
           headlineText: formattedDate,
           chartTitle: `${Number(key?.split('/')[0])}\n${loopsText[dayOfWeek]}`
         }
@@ -178,7 +178,7 @@ const EnergyConsumptionDetail = (props: {theme?: any}) => {
       paddingHorizontal: cx(10),
       paddingVertical: cx(8),
       marginTop: cx(8),
-      backgroundColor: props.theme.button.active,
+      backgroundColor: props.theme.button.primary,
       alignItems: 'center',
       justifyContent: 'center'
     }
@@ -189,7 +189,7 @@ const EnergyConsumptionDetail = (props: {theme?: any}) => {
       backText={I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}
       headlineText={params.curMonth.key}
       headlineIcon={state.overviewList.length ? res.download_icon : undefined}
-      onHeadlineIconClick={() => { 
+      onHeadlineIconClick={() => {
         exportFile(state.overviewList)
       }}
       showGreenery={false}
@@ -217,7 +217,7 @@ const EnergyConsumptionDetail = (props: {theme?: any}) => {
                         <Image
                             source={res.energy_consumption_cash}
                             resizeMode="contain"
-                            style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.active }}
+                            style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.primary }}
                         />
                     </View>
                     <View style={styles.priceNum}>
@@ -247,7 +247,7 @@ const EnergyConsumptionDetail = (props: {theme?: any}) => {
                 <Image
                   source={res.energy_consumption_cash}
                   resizeMode="contain"
-                  style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.active }}
+                  style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.primary }}
                 />
               </View>
               <View>

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -183,7 +183,7 @@ const EnergyConsumptionPage = (props: {theme?: any}) => {
       paddingHorizontal: cx(10),
       paddingVertical: cx(8),
       marginTop: cx(8),
-      backgroundColor: props.theme.button.active,
+      backgroundColor: props.theme.button.primary,
       alignItems: 'center',
       justifyContent: 'center'
     },
@@ -290,7 +290,7 @@ const EnergyConsumptionPage = (props: {theme?: any}) => {
                         <Image
                             source={res.energy_consumption_cash}
                             resizeMode="contain"
-                            style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.active }}
+                            style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.primary }}
                         />
                     </View>
                     <View style={styles.priceNum}>
@@ -305,7 +305,7 @@ const EnergyConsumptionPage = (props: {theme?: any}) => {
                                 <Image
                                     source={res.co2Icon}
                                     resizeMode="contain"
-                                    style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.active }}
+                                    style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.primary }}
                                 />
                             </TouchableOpacity>
                         </View>
@@ -320,7 +320,7 @@ const EnergyConsumptionPage = (props: {theme?: any}) => {
                 <Image
                   source={res.energy_consumption_cash}
                   resizeMode="contain"
-                  style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.active }}
+                  style={{ height: cx(20), width: cx(20), tintColor: props.theme.button.primary }}
                 />
               </View>
               <View>

package/src/newModules/energyConsumption/component/EnergyModal.tsx

@@ -58,7 +58,7 @@ const EnergyModal = (props: EnergyModalProps) => {
       <Text style={{ color: props.theme.global.fontColor }}>{text[length - 4] + text[length - 3] + ':'}</Text>
       <Spacer />
       <Text
-        style={{ textDecorationLine: 'underline', color: props.theme.button.active }}
+        style={{ textDecorationLine: 'underline', color: props.theme.button.primary }}
         onPress={() => openLink(`${text[length - 2]}:${text[length - 1]}${text[length]}`)}
       >
         {`${text[length - 2]}:${text[length - 1]}${text[length]}`}

package/src/newModules/energyConsumption/component/Overview.tsx

@@ -80,7 +80,7 @@ const OverView = (props: OverViewProps) => {
                   </View>
                   <Image
                     source={res.energy_consumption_right}
-                    style={{ width: cx(16), height: cx(16), marginLeft: cx(8) }}
+                    style={{ width: cx(16), height: cx(16), marginLeft: cx(8), tintColor: props.theme.global.secondFontColor }}
                   />
                 </View>
               </View>

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -25,6 +25,7 @@ import { useParams } from "@ledvance/base/src/hooks/Hooks";
 
 const { convertX: cx } = Utils.RatioUtils;
 const { toFixedString } = Utils.NumberUtils;
+const {parseTimer} = Utils.TimeUtils
 
 export interface FixedTimeDetailPageParams extends FixedTimePageParams {
   mode: 'add' | 'edit'
@@ -62,14 +63,11 @@ const FixedTimeDetailPage = () => {
   }, [state.fixedTime.openTime, state.fixedTime.closeTime])
 
   const inRangeTime = useMemo(() => {
-    const { startTime, endTime, closeTime, openTime } = state.fixedTime
-    const poweredTime = openTime + closeTime
-    if (startTime < endTime) {
-      return (endTime - startTime) >= poweredTime
-    } else {
-      return (1440 - endTime - startTime) >= poweredTime
-    }
-  }, [JSON.stringify(state.fixedTime)])
+    const { startTime, endTime, openTime, closeTime } = state.fixedTime
+    const timeInterval = endTime - startTime + ((startTime > endTime) ? 1440 : 0) // 跨天要加1440
+    const workTime = openTime + closeTime
+    return timeInterval >= workTime
+  }, [state.fixedTime.startTime, state.fixedTime.endTime, state.fixedTime.openTime, state.fixedTime.closeTime])
 
   const checkItemChanged = useMemo(() =>{
     return isEqual(state.fixedTime, state.initFixedTime)
@@ -142,7 +140,7 @@ const FixedTimeDetailPage = () => {
             state.fixedTime.weeks[rawIndex] = state.fixedTime.weeks[rawIndex] === 1 ? 0 : 1
           }} />
         <Spacer />
-        <Text style={styles.cardContainer}>{loopText(state.fixedTime.weeks)}</Text>
+        <Text style={styles.cardContainer}>{loopText(state.fixedTime.weeks, parseTimer(state.fixedTime.endTime * 60))}</Text>
         <Spacer />
         {/* Apply for */}
         <View style={styles.cardContainer}>
@@ -268,7 +266,7 @@ const FixedTimeDetailPage = () => {
         </View>
         {/* summary */}
         <Summary
-          frequency={loopText(state.fixedTime.weeks)}
+          frequency={loopText(state.fixedTime.weeks, parseTimer(state.fixedTime.endTime * 60))}
           time={`${convertMinutesTo12HourFormat(state.fixedTime.startTime, is24Hour)} - ${convertMinutesTo12HourFormat(state.fixedTime.endTime, is24Hour)}`}
           actions={(
             <View style={{ flexDirection: 'column' }}>
@@ -349,4 +347,4 @@ const styles = StyleSheet.create({
   }
 })
 
-export default FixedTimeDetailPage
+export default FixedTimeDetailPage

package/src/newModules/mood/AddMoodPage.tsx

@@ -183,7 +183,7 @@ function newMood(
     },
     secondaryLamp: {
       id: isStatic ? -1 : secondaryId,
-      enable: true,
+      enable: !isStatic,
       mode: MoodJumpGradientMode.StripJump,
       speed: 75,
       ...defStripConfig,

package/src/newModules/mood/MoodActions.ts

@@ -93,12 +93,22 @@ const remoteMoodInfo2MoodUIState = (
 export const getRemoteMoodList = async (
   devId: string,
   option: DefMoodOption,
-  featureId = SceneFeatureId
+  featureId = SceneFeatureId,
+  isRefresh?: boolean
 ) => {
   const isFeature = !(option.isCeilingLight || option.isStringLight || option.isStripLight);
+  const moodFeatureId = isFeature ? (option.isMixLight ? MixLightSceneListFeatureId : SceneFeatureId) : (option.isCeilingLight ? SceneFeatureId : featureId)
+  if (isRefresh){
+    const defScene = getDefMoodList(option)
+    const res = await setRemoteMoodList(devId, isFeature, defScene, featureId)
+    if (res.success){
+      return {
+        success: true,
+        data: defScene.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option))
+      }
+    }
+  }
   if (isFeature) {
-    const moodFeatureId = option.isMixLight ? MixLightSceneListFeatureId : SceneFeatureId;
-    // await setRemoteMoodList(devId, isFeature, getDefMoodList(option), moodFeatureId);
     const res = await getFeature(devId, moodFeatureId);
     if (!res.result) {
       return { success: false };
@@ -123,9 +133,6 @@ export const getRemoteMoodList = async (
       data: res.data.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)),
     };
   } else {
-    const moodFeatureId = option.isCeilingLight ? SceneFeatureId : featureId;
-    // const defaultScene = getDefMoodList(option);
-    // await setRemoteMoodList(devId, isFeature, defaultScene, moodFeatureId);
     const res = await NativeApi.getJson(devId, moodFeatureId);
     const isNormalData = Array.isArray(parseJSON(res?.data));
     if (res.success && isNormalData) {

package/src/newModules/mood/MoodInfo.ts

@@ -319,59 +319,211 @@ function getDIMDefSceneList(): RemoteMoodInfo[] {
 function getStringLightSceneList(): RemoteMoodInfo[] {
   return [
     {
-      n: I18n.getLang('strip_lights_modes_flow_text'),
-      i: '010d0d3232000000640000640000000064003c64000000006400f06400000000',
+      n: I18n.getLang('dynamicmoods_forest'),
+      i: "0107104b4b0000003700784c0000000064003364000000002700786400000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('strip_lights_modes_rainbow_text'),
-      i: '0102023232000000640000640000000064003c64000000006400f06400000000',
+      n: I18n.getLang('dynamicmoods_desert'),
+      i: "0108104b4b000000520022210000000064001045000000006400106400000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('string_lights_modes_chase_text'),
-      i:
-        '010e0e3232000000640000640000000064003c640000000064007864000000006400b464000000006400f0640000000064012c6400000000',
+      n: I18n.getLang('dynamicmoods_dreams'),
+      i: "0109104b4b00000064014b14000000005d00b41a0000000064001c1b00000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('string_lights_modes_dazzle_text'),
-      i:
-        '010f0f3232000000640000640000000064003c640000000064007864000000006400b464000000006400f0640000000064012c6400000000',
+      n: I18n.getLang('dynamicmoods_breeze'),
+      i: "010a104b4b00000055002b550000000046000051000000006400276400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_waters'),
+      i: "010b104b4b0000006400c364000000006400a032000000002c00f04e00000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_splash'),
+      i: "010c104b4b00000064003c640000000064002764000000006400106400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_sunrise'),
+      i: "010d104b4b00000064000948000000006400261d000000006400336400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_wonderland'),
+      i: "010e104b4b0000005a00bb170000000064000002000000004b00000000000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Twilight'),
+      i: "010f104b4b00000064014a3b0000000064002764000000003200b46400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_symphony'),
+      i: "0110104b4b0000006400d2580000000064000000000000006400336400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_sorbet'),
+      i: "0110104b4b0000006400d2580000000064000000000000006400336400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_mansion'),
+      i: "0112104b4b00000032012c64000000006400b464000000006400276400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_hour'),
+      i: "0113104b4b000000640033640000000064002164000000006400261d00000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_isle'),
+      i: "0114104b4b0000003200786400000000370092430000000063005a6400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Beat'),
+      i: "0115104b4b0000006400b4640000000064012c640000000064003c6400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_glamour'),
+      i: "0116104b4b000000640033640000000032012c640000000064015e1900000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_edreams'),
+      i: "0117104b4b00000064012c64000000006400b464000000006400276400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_sunset'),
+      i: "0118104b4b000000640010640000000064001d450000000055002b5500000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_carnival'),
+      i: "0119104b4b00000064012c6400000000640027640000000064003c6400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_serenade'),
+      i: "011a104b4b0000002c00f04e000000001f00b429000000006200f00800000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_glow'),
+      i: "011b104b4b00000064001e640000000064003064000000006400005000000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Canopy'),
+      i: "011c104b4b00000028007864000000003c007843000000003c001e4300000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Burst'),
+      i: "011d104b4b0000006400006400000000640027640000000064003c640000000064007864000000006400d264000000006401116400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Lights'),
+      i: "011e104b4b00000064012c640000000064003c64000000006400b464000000006400186400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Dreamscape'),
+      i: "011f104b4b00000064012c14000000006400f0140000000064003c14000000006400b41400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_NLights'),
+      i: "0120104b4b00000064009664000000006400d2640000000064010e6400000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('other_lights_modes_gradient_text'),
-      i: '01101032320000006400f0640000000064012c640000000064003c6400000000',
+      n: I18n.getLang('dynamicmoods_paradise'),
+      i: "0121104b4b0000006401403c0000000064001e500000000064003c3c00000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('other_lights_modes_jump_text'),
-      i: '010a0a32320000006400f0640000000064012c640000000064003c6400000000',
+      n: I18n.getLang('dynamicmoods_ice'),
+      i: "0122104b4b000000640018640000000064000000000000006400d86400000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('strip_lights_modes_breath_text'),
-      i: '010b0b32320000006400f0640000000064012c640000000064003c6400000000',
+      n: I18n.getLang('dynamicmoods_voyage'),
+      i: "0123104b4b0000002800f0640000000028010e64000000006400000000000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('string_lights_modes_blink_text'),
-      i: '010c0c32320000006400f0640000000064012c640000000064003c6400000000',
+      n: I18n.getLang('dynamicmoods_wave'),
+      i: "0124104b4b0000006400d264000000006400b464000000006400966400000000",
       s: '',
       t: 0,
       e: false,