@ledvance/ui-biz-bundle 1.1.111 → 1.1.113

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.111",
+  "version": "1.1.113",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/music/MusicPage.tsx

@@ -26,7 +26,7 @@ const { withTheme } = Utils.ThemeUtils
 
 export interface MusicPageRouterParams extends JudgeTimeScheduleProps {
   switch_led: string
-  colour_switch?: string 
+  colour_switch?: string
   work_mode: string
   mix_rgbcw: string
   mix_light_scene: string
@@ -116,9 +116,9 @@ const MusicPage = (props: { theme?: ThemeType }) => {
     } else {
       const dps = {}
       if (workMode !== 'music') dps[params.work_mode] = WorkMode.Music
-      if (!switchLed) dps[params.switch_led] = true 
+      if (!switchLed) dps[params.switch_led] = true
       if (params.colour_switch && params.isCeilingLight){
-        dps[params.colour_switch] = true 
+        dps[params.colour_switch] = true
       }
       if (!isEmpty(dps)){
         await setDps(dps)
@@ -194,7 +194,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
 
   const getSelect = async () => {
     state.musicEnable = workMode === 'music' && !!switchLed
-    if (!state.musicEnable) return 
+    if (!state.musicEnable) return
     const res: any = await NativeApi.getJson(deviceId, 'musicSelect')
     const type = res?.data ? (JSON.parse(res?.data)?.type || 0) : 0
     state.musicType = res?.data ? JSON.parse(res?.data)?.musicType : params.dreamMusicDp ? 0 : 1
@@ -311,7 +311,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
         <View style={{ alignItems: 'center', marginVertical: cx(38) }}>
           <Image
             style={{ width: cx(200), height: cx(204) }}
-            source={state.musicEnable ? Img.app_music_center_on : Img.app_music_center_off}
+            source={state.musicEnable ? (props.theme?.type === 'light' ? Img.app_music_center_on_light : Img.app_music_center_on_dark) : Img.app_music_center_off}
             resizeMode="contain"
           />
         </View>

package/src/modules/music/res/index.ts

@@ -5,5 +5,6 @@ export default {
     app_music_romantic: require('./app_music_romantic.png'),
     app_music_check: require('./iconsMaterialOutlinedArrowsNavCheck.png'),
     app_music_center_off: require('./illustrationsFeaturesMusicDisabled.png'),
-    app_music_center_on: require('./illustrationsFeaturesMusic.png'),
+    app_music_center_on_light: require('./illustrationsFeaturesMusic.png'),
+    app_music_center_on_dark: require('./illustrationsFeaturesMusic-dark.png'),
 }

package/src/modules/timer/TimerPage.tsx

@@ -131,7 +131,7 @@ const TimerPage = (props: {theme?: ThemeType}) => {
     return progress.length > 1
   }
 
-  const renderItem = ({ item }) => {
+  const renderItem = (item: dpItem) => {
     return (
       <View style={{
         flexDirection: 'row',
@@ -250,11 +250,9 @@ const TimerPage = (props: {theme?: ThemeType}) => {
                           borderRadius: 4,
                         }}
                       >
-                        <FlatList
-                          data={state.selectedSkill}
-                          renderItem={item => renderItem(item)}
-                          keyExtractor={(item: dpItem) => item.dpId}
-                        />
+                        {
+                          state.selectedSkill.map(item => renderItem(item))
+                        }
                       </View>}
                   </View>
                 {state.skillList.map((skill: dpItem) => {

package/src/newModules/biorhythm/BiorhythmEditPage.tsx

@@ -151,6 +151,7 @@ const BiorhythmEditPage = (props: { theme?: ThemeType }) => {
 
           <View style={{ height: cx(20) }} />
           <TimerPicker
+            key={props.theme?.type}
             itemTextColor='#aeadb5'
             style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
             pickerFontColor={props.theme?.global.fontColor}

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -1,5 +1,5 @@
 import {useDp} from "@ledvance/base/src/models/modules/NativePropsSlice";
-import {localeNumber, loopsText, monthFormat, monthFormatShort} from "@ledvance/base/src/utils/common";
+import {exportCsvFile, localeNumber, loopsText, monthFormat, monthFormatShort} from "@ledvance/base/src/utils/common";
 import {EnergyData} from "./component/EnergyModal";
 import {NativeApi} from "@ledvance/base/src/api/native";
 import {
@@ -13,6 +13,7 @@ import {OverviewItem} from "@ledvance/ui-biz-bundle/src/newModules/energyConsump
 import {overDays} from "@ledvance/base/src/utils/index";
 import dayjs from "dayjs";
 import {isEmpty} from "lodash";
+import I18n from "@ledvance/base/src/i18n";
 
 export function useElectricCurrent(dpCode: string): number {
   const current = useDp<number, any>(dpCode)[0] || 0
@@ -135,3 +136,9 @@ const getDpResultByDate = async (devId: string, addEleDpCode: string, date: stri
   }
   return list
 }
+
+export const exportEnergyCsv = (values: any[][], unit: string) => {
+  const headers = [I18n.getLang('date'), `${I18n.getLang('consumption_data_annual_bar_chart_system_back_text')} (kWh)`, `Price(${unit})`]
+  const functionName = `${I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}`
+  exportCsvFile(headers, values, functionName)
+}

package/src/newModules/energyConsumption/EnergyConsumptionChart.tsx

@@ -1,25 +1,25 @@
 import React, { useCallback } from "react";
-import {Image, Platform, StyleSheet, View, Text, TouchableOpacity} from "react-native";
+import {Image, StyleSheet, View, TouchableOpacity} from "react-native";
 import {useRoute} from '@react-navigation/core'
 import Page from "@ledvance/base/src/components/Page";
 import res from "@ledvance/base/src/res";
 import I18n from "@ledvance/base/src/i18n";
 import {Utils} from "tuya-panel-kit";
 import NewBarChart from "./component/NewBarChart";
-import {exportFile, loopsText, monthFormat} from "@ledvance/base/src/utils/common";
+import { loopsText, monthFormat} from "@ledvance/base/src/utils/common";
 import {OverviewItem} from "./EnergyConsumptionPage";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import InfoText from "@ledvance/base/src/components/InfoText";
 import dayjs from "dayjs";
 import ThemeType from '@ledvance/base/src/config/themeType'
 import {overDays} from "@ledvance/base/src/utils/index";
-import DateTypeItem from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/component/DateTypeItem";
-import {DateType} from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/co2Data";
-import DateSelectedItem from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/component/DateSelectedItem";
+import DateTypeItem from "./component/DateTypeItem";
+import {DateType} from "./co2Data";
+import DateSelectedItem from "./component/DateSelectedItem";
 import {useReactive, useUpdateEffect} from "ahooks";
-import {getElectricity} from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/EnergyConsumptionActions";
+import {exportEnergyCsv, getElectricity} from "./EnergyConsumptionActions";
 import {useDeviceId} from "@ledvance/base/src/models/modules/NativePropsSlice";
-import DateSwitch from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/component/DateSwitch";
+import DateSwitch from "./component/DateSwitch";
 
 const {convertX: cx} = Utils.RatioUtils
 const {withTheme} = Utils.ThemeUtils
@@ -163,8 +163,11 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
                   onDateChange={(date) => {
                     state.date = date;
                   }}/>
-              <TouchableOpacity onPress={() => {
-                exportFile(state.chartData, params.price, params.unit)
+              <TouchableOpacity 
+                style={{width: cx(30)}}
+                onPress={() => {
+                  const values = state.chartData.map(item => [item.key, item.value, (Number(params.price) * Number(item.value)).toFixed(2)])
+                  exportEnergyCsv(values, params.unit)
               }}>
                 <Image
                     style={styles.downloadIcon}

package/src/newModules/energyConsumption/EnergyConsumptionDetail.tsx

@@ -13,7 +13,7 @@ import {getDataWithSpecified, getDpResultByHour} from "@ledvance/base/src/models
 import {useDeviceId, useEngergyGeneration, useTimeZoneCity} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {cloneDeep, isEmpty} from "lodash";
 import {OverviewItem, PopupType} from "./EnergyConsumptionPage";
-import {exchangeNumber, exportFile, localeNumber, loopsText} from '@ledvance/base/src/utils/common'
+import {exchangeNumber, localeNumber, loopsText} from '@ledvance/base/src/utils/common'
 import dayjs from "dayjs";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 import {EnergyConsumptionChartProps} from "./EnergyConsumptionChart";
@@ -21,6 +21,7 @@ import {overDays} from "@ledvance/base/src/utils";
 import EnergyPopup, {EnergyData} from "./component/EnergyModal";
 import {carbonDioxideEmission, countryAndRegion} from "./co2Data";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { exportEnergyCsv } from "./EnergyConsumptionActions";
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -191,7 +192,8 @@ const EnergyConsumptionDetail = (props: {theme?: ThemeType}) => {
       headlineText={params.curMonth.key}
       headlineIcon={state.overviewList.length ? res.download_icon : undefined}
       onHeadlineIconClick={() => {
-        exportFile(state.overviewList, params.price, params.unit);
+        const values = state.overviewList.map(item => [item.key, item.value, (Number(params.price) * Number(item.value)).toFixed(2)])
+        exportEnergyCsv(values, params.unit)
       }}
       showGreenery={false}
       greeneryIcon={res.energy_consumption_greenery}

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -14,7 +14,7 @@ import { getDpResultByMonth } from "@ledvance/base/src/models/TuyaApi";
 import {useDeviceId, useEngergyGeneration, useTimeZoneCity} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { flattenDeep, isEmpty } from "lodash";
 import { exchangeNumber, exportFile, localeNumber, monthFormat, monthFormatShort } from "@ledvance/base/src/utils/common";
-import {updatePrice, useElectricCurrent, usePower, useVoltage} from "./EnergyConsumptionActions";
+import {exportEnergyCsv, updatePrice, useElectricCurrent, usePower, useVoltage} from "./EnergyConsumptionActions";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 import { EnergyConsumptionDetailProps } from "./EnergyConsumptionDetail";
 import { EnergyConsumptionChartProps } from "./EnergyConsumptionChart";
@@ -242,7 +242,8 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
           headlineText={I18n.getLang(isSolarPlug ? 'sockets_headline_power' : 'consumption_data_annual_bar_chart_system_back_text')}
           headlineIcon={state.overviewList.length ? res.download_icon : undefined}
           onHeadlineIconClick={() => {
-            exportFile(state.overviewList, state.price, state.unit);
+            const values = state.overviewList.map(item => [item.key, item.value, (Number(state.price) * Number(item.value)).toFixed(2)])
+            exportEnergyCsv(values, state.unit)
           }}
           showGreenery={isSolarPlug}
           greeneryIcon={res.energy_consumption_greenery}
@@ -252,7 +253,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
             {/* tip */}
             <Spacer height={cx(15)} />
             <View style={styles.showTip}>
-              <Text style={{ fontSize: cx(14) }}>{I18n.getLang(isSolarPlug ? 'generation_data_description_text' : 'consumption_data_description_text')}</Text>
+              <Text style={{ fontSize: cx(14), color: props.theme?.global.fontColor, }}>{I18n.getLang(isSolarPlug ? 'generation_data_description_text' : 'consumption_data_description_text')}</Text>
             </View>
             <Spacer />
             {/* Today */}

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -76,7 +76,7 @@ const FixedTimeDetailPage = (props: { theme?: ThemeType }) => {
   }, [state.initFixedTime, JSON.stringify(state.fixedTime)])
 
   const canSubmit = useMemo(() => {
-    return state.fixedTime.name?.length > 0 && state.fixedTime.name?.length < 33 && !checkItemChanged && inRangeTime && state.fixedTime.channel !== undefined
+    return state.fixedTime.name?.length > 0 && state.fixedTime.name?.length < 33 && (!checkItemChanged || params.mode === 'add') && inRangeTime && state.fixedTime.channel !== undefined
   }, [JSON.stringify(state.fixedTime), checkItemChanged, inRangeTime])
 
   const styles = StyleSheet.create({
@@ -160,6 +160,7 @@ const FixedTimeDetailPage = (props: { theme?: ThemeType }) => {
         />
         {/* pick */}
         <TimerPicker
+          key={props.theme?.type}
           itemTextColor='#aeadb5'
           style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
           pickerFontColor={props.theme?.global.fontColor}

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -339,7 +339,7 @@ const FixedTimeCard = memo((props: {
 const newFixedTime = (isPlug: boolean) => {
   const startTime = dayjs().hour() * 60 + dayjs().minute()
   return {
-    name: '',
+    name: I18n.getLang('fixedTimeCycle_socket_headline'),
     enable: true,
     weeks: [0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,

package/src/newModules/mood/MoodActions.ts

@@ -201,10 +201,7 @@ export const useMoodScene = (params: MoodPageParams): [MoodInfo, (moodInfo: Mood
       }
       mainLamp[params.switchLedDp] = true
     }
-    return setDps({
-      ...mainDps,
-      version: params.isStripLight ? 1 : 0
-    })
+    return setDps(mainDps)
   };
   return [moodState, setMoodFn];
 };
@@ -285,4 +282,4 @@ export function useSceneStatusId(params: SceneStatusParams): [number, (moodId: n
   }, [])
 
   return [sceneStatusId, setSceneStatusIdRemote]
-}
+}

package/src/newModules/randomTime/RandomTimeDetailPage.tsx

@@ -62,7 +62,7 @@ const RandomTimeDetailPage = (props: { theme?: ThemeType }) => {
   }, [JSON.stringify(state.initRandomTime), JSON.stringify(state.randomTime)])
 
   const canSubmit = useMemo(() => {
-    return state.randomTime.name?.length > 0 && state.randomTime.name?.length < 33 && !checkItemChanged && state.randomTime.channel !== undefined
+    return state.randomTime.name?.length > 0 && state.randomTime.name?.length < 33 && (!checkItemChanged || params.mode === 'add') && state.randomTime.channel !== undefined
   }, [JSON.stringify(state.randomTime), checkItemChanged])
 
   const styles = StyleSheet.create({
@@ -152,6 +152,7 @@ const RandomTimeDetailPage = (props: { theme?: ThemeType }) => {
         />
         {/* pick */}
         <TimerPicker
+          key={props.theme?.type}
           itemTextColor='#aeadb5'
           style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
           pickerFontColor={props.theme?.global.fontColor}

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -210,7 +210,7 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
       onBackClick={navigation.goBack}
       loading={state.loading}
       onHeadlineIconClick={() => {
-        navigateToEdit('add', newRandomTime(params.isPlug))
+        navigateToEdit('add', newRandomTime(!!params.isPlug))
       }}
     >
       <ScrollView nestedScrollEnabled={true}>
@@ -291,7 +291,7 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
                 }}
                 textStyle={{ color: props.theme?.button.fontColor }}
                 onPress={() => {
-                  navigateToEdit('add', newRandomTime(params.isPlug))
+                  navigateToEdit('add', newRandomTime(!!params.isPlug))
                 }} />}
           </View>}
       </ScrollView>
@@ -337,10 +337,10 @@ const RandomTimeCard = (props: {
   )
 }
 
-const newRandomTime = (isPlug?: boolean) => {
+const newRandomTime = (isPlug: boolean) => {
   const startTime = dayjs().hour() * 60 + dayjs().minute()
   return {
-    name: '',
+    name: I18n.getLang('randomtimecycle_sockets_headline_text'),
     enable: true,
     weeks: [0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,

package/src/newModules/sleepWakeUp/SleepWakeUpDetailPage.tsx

@@ -113,7 +113,7 @@ const SleepWakeUpDetailPage = (props: { theme?: ThemeType }) => {
   }, [params.scheduleItem, JSON.stringify(state.sleepWakeUp), params.mode])
 
   const canSubmit = useMemo(() => {
-    return state.sleepWakeUp.name?.length > 0 && state.sleepWakeUp.name?.length < 33 && !checkItemChanged
+    return state.sleepWakeUp.name?.length > 0 && state.sleepWakeUp.name?.length < 33 && (!checkItemChanged || params.mode === 'add')
   }, [state.sleepWakeUp.name, checkItemChanged]);
 
   const mixLightCard = useMemo(() => {
@@ -203,7 +203,7 @@ const SleepWakeUpDetailPage = (props: { theme?: ThemeType }) => {
     picker: {
       marginHorizontal: cx(24),
       marginVertical: cx(15),
-      color: props.theme?.global.backgournd,
+      color: props.theme?.global.background,
     },
     week: {},
     itemTitle: {
@@ -328,6 +328,7 @@ const SleepWakeUpDetailPage = (props: { theme?: ThemeType }) => {
         />
         {/* pick */}
         <TimerPicker
+          key={props.theme?.type}
           itemTextColor="#aeadb5"
           style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
           pickerFontColor={props.theme?.global.fontColor}

package/src/newModules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -492,7 +492,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
             isMax: isWakeUpMax
           },
         ]}
-        onItemPress={(isSleep) => onAddScheduleDialogItemClick(isSleep, 'add', getNewSleepWakeUp(isSleep, params))}
+        onItemPress={(isSleep) => onAddScheduleDialogItemClick(isSleep, 'add', getNewSleepWakeUp(isSleep, params, isSleep ? sleepList.length + 1 : wakeUpList.length + 1))}
       />
     </>
   )
@@ -534,7 +534,7 @@ const SleepWakeUpCard = (props: {
 
 const getNewSleepWakeUp = (isSleep: boolean, params: SleepWakeUpPageRouteParams) => {
   const def = {
-    name: '',
+    name: `${I18n.getLang(isSleep ? 'sleepwakeschedule_field_3_Times_chips2_text' : 'sleepwakeschedule_field_3_Times_chips_text')}`,
     weeks: [0, 0, 0, 0, 0, 0, 0],
     delay: 6,
     hour: isSleep ? 23 : 7,

package/src/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -215,7 +215,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
       !!(state.timeSchedule.name.length && state.timeSchedule.name.length < 33) &&
       !!state.selectedSkill.length &&
       (state.isManual || !!state.mood) &&
-      !isModify &&
+      (!isModify || params.mode === 'add') &&
       !showMoodFanSelectText
     );
   }, [state.timeSchedule.name, state.selectedSkill, isModify, state.isManual, state.mood, showMoodFanSelectText]);
@@ -331,7 +331,6 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
             state.selectedSkill
           ),
         });
-        console.log(res, '< ---- resss');
         state.loading = false;
         if (res.success) {
           navigation.goBack();
@@ -357,6 +356,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
 
         {/* pick */}
         <TimerPicker
+          key={props.theme?.type}
           itemTextColor="#aeadb5"
           style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
           pickerFontColor={props.theme?.global.fontColor}
@@ -686,7 +686,7 @@ const newTimeSchedule = () => {
     enable: true,
     loops: '0000000',
     notification: false,
-    name: '',
+    name: I18n.getLang('timeschedule_add_schedule_system_back_text'),
     time: `${toFixedString(new Date().getHours(), 2)}:${toFixedString(new Date().getMinutes(), 2)}`,
     dps: {},
     id: -1,

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -124,6 +124,7 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
       refreshFn: () => {
         state.flag = Symbol();
       },
+      newScheduleId: state.originList.length + 2,
       ...params,
     });
   }, []);