@ledvance/ui-biz-bundle 1.1.153 → 1.1.155

package/package.json

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

package/src/modules/flags/FlagEditPage.tsx

@@ -103,7 +103,7 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
     light: {
       color: props.theme?.global.fontColor,
       fontSize: cx(18),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     transitionMode: {
       marginHorizontal: cx(16),
@@ -171,7 +171,7 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
     deleteBtnText: {
       color: props.theme?.button.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
   })
 

package/src/modules/flags/FlagItem.tsx

@@ -37,7 +37,7 @@ function FlagItem(props: RecommendMoodItemProps) {
     headText: {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       lineHeight: cx(20),
       flex: 1
     },

package/src/modules/history/HistoryPage.tsx

@@ -124,13 +124,13 @@ const SwitchHistoryPage = (props: { theme?: ThemeType }) => {
     listEmptyText: {
       color: props.theme?.global.fontColor,
       fontSize: cx(12),
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
     },
     titleText: {
       marginHorizontal: cx(24),
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
     },
     switchHistoryItem: {
       marginHorizontal: cx(24),
@@ -138,7 +138,7 @@ const SwitchHistoryPage = (props: { theme?: ThemeType }) => {
     switchHistoryItemTitle: {
       color: props.theme?.global.fontColor,
       fontSize: cx(18),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     switchHistoryItemActionItem: {
       flexDirection: 'row',
@@ -168,7 +168,7 @@ const SwitchHistoryPage = (props: { theme?: ThemeType }) => {
     switchHistoryItemActionItemText: {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
     },
     switchHistoryItemTag: {
       paddingHorizontal: cx(10),

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -475,7 +475,7 @@ const styles = StyleSheet.create({
   light: {
     color: '#000',
     fontSize: cx(18),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
   transitionMode: {
     marginHorizontal: cx(16),
@@ -543,7 +543,7 @@ const styles = StyleSheet.create({
   deleteBtnText: {
     color: '#fff',
     fontSize: cx(16),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
 })
 export default DynamicMoodEditorPage

package/src/modules/mood/FantasyMoodEditPage.tsx

@@ -510,7 +510,7 @@ const styles = StyleSheet.create({
   light: {
     color: '#000',
     fontSize: cx(18),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
   transitionMode: {
     marginHorizontal: cx(16),
@@ -576,7 +576,7 @@ const styles = StyleSheet.create({
   deleteBtnText: {
     color: '#fff',
     fontSize: cx(16),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
 })
 export default FantasyMoodEditPage

package/src/modules/mood/FantasyMoodItem.tsx

@@ -74,7 +74,7 @@ const styles = StyleSheet.create({
         flex: 1,
         color: '#000',
         fontSize: cx(16),
-        fontFamily: 'helvetica_neue_lt_std_bd',
+        // fontFamily: 'helvetica_neue_lt_std_bd',
         lineHeight: cx(20),
     },
     gradientItem: {
@@ -97,7 +97,7 @@ const styles = StyleSheet.create({
         color: '#000000DD',
         fontSize: cx(10),
         textAlignVertical: 'center',
-        fontFamily: 'helvetica_neue_lt_std_roman',
+        // fontFamily: 'helvetica_neue_lt_std_roman',
         lineHeight: cx(16),
     },
 })

package/src/modules/mood/MixMood/MixMoodEditPage.tsx

@@ -617,7 +617,7 @@ const styles = StyleSheet.create({
   light: {
     color: '#000',
     fontSize: cx(18),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
   transitionMode: {
     marginHorizontal: cx(16),
@@ -685,7 +685,7 @@ const styles = StyleSheet.create({
   deleteBtnText: {
     color: '#fff',
     fontSize: cx(16),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
 })
 

package/src/modules/mood/MixMood/MixMoodItem.tsx

@@ -92,7 +92,7 @@ const styles = StyleSheet.create({
     flex: 1,
     color: '#000',
     fontSize: cx(16),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
     lineHeight: cx(20),
   },
   gradientItem: {
@@ -128,7 +128,7 @@ const styles = StyleSheet.create({
     color: '#000000DD',
     fontSize: cx(10),
     textAlignVertical: 'center',
-    fontFamily: 'helvetica_neue_lt_std_roman',
+    // fontFamily: 'helvetica_neue_lt_std_roman',
     lineHeight: cx(16),
   },
 })

package/src/modules/mood/MixMood/RecommendMixMoodItem.tsx

@@ -59,7 +59,7 @@ const styles = StyleSheet.create({
   title: {
     color: '#000',
     fontSize: cx(16),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
   lineStyle: {
     alignItems: 'center',

package/src/modules/mood/MoodItem.tsx

@@ -84,7 +84,7 @@ const styles = StyleSheet.create({
         flex: 1,
         color: '#000',
         fontSize: cx(16),
-        fontFamily: 'helvetica_neue_lt_std_bd',
+        // fontFamily: 'helvetica_neue_lt_std_bd',
         lineHeight: cx(20),
     },
     gradientItem: {
@@ -107,7 +107,7 @@ const styles = StyleSheet.create({
         color: '#000000DD',
         fontSize: cx(10),
         textAlignVertical: 'center',
-        fontFamily: 'helvetica_neue_lt_std_roman',
+        // fontFamily: 'helvetica_neue_lt_std_roman',
         lineHeight: cx(16),
     },
 })

package/src/modules/mood/RecommendMoodItem.tsx

@@ -66,7 +66,7 @@ const styles = StyleSheet.create({
     title: {
         color: '#000',
         fontSize: cx(16),
-        fontFamily: 'helvetica_neue_lt_std_bd',
+        // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     lineStyle: {
         alignItems: 'center',

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -297,7 +297,7 @@ const styles = StyleSheet.create({
   light: {
     color: '#000',
     fontSize: cx(18),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
   preview: {
     width: cx(20),
@@ -314,7 +314,7 @@ const styles = StyleSheet.create({
   deleteBtnText: {
     color: '#fff',
     fontSize: cx(16),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
 })
 

package/src/modules/music/MusicPage.tsx

@@ -257,7 +257,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
     tiptext: {
       color: props.theme?.global.fontColor,
       fontSize: cx(14),
-      lineHeight: cx(14),
+      // lineHeight: cx(14),
     }
   })
 

package/src/modules/music/SelecetGenre.tsx

@@ -31,7 +31,7 @@ const styles = StyleSheet.create({
         fontSize: cx(12),
         marginStart: cx(13),
         color: '#666',
-        fontFamily: 'helvetica_neue_lt_std_bd',
+        // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     textInputGroup: {
         flexDirection: 'row',
@@ -49,7 +49,7 @@ const styles = StyleSheet.create({
     textInput: {
         fontSize: cx(16),
         color: '#000',
-        fontFamily: 'helvetica_neue_lt_std_roman',
+        // fontFamily: 'helvetica_neue_lt_std_roman',
     },
     line: {
         height: 1,

package/src/modules/scene/SceneDetailPage.tsx

@@ -159,7 +159,7 @@ export default function SceneDetailPage() {
                           marginStart: cx(24),
                           fontSize: cx(14),
                           color: '#000',
-                          fontFamily: 'helvetica_neue_lt_std_roman',
+                          // fontFamily: 'helvetica_neue_lt_std_roman',
                       }}>{Strings.getLang('Transform time')}</Text>
                       <Slider.Horizontal
                         value={state.transitionTime}
@@ -262,7 +262,7 @@ export default function SceneDetailPage() {
                             tabTextStyle={{
                                 fontSize: cx(14),
                                 color: '#666',
-                                fontFamily: 'helvetica_neue_lt_std_roman',
+                                // fontFamily: 'helvetica_neue_lt_std_roman',
                             }}
                             tabActiveTextStyle={{ color: '#f60' }}
                             tabBarUnderlineStyle={{ backgroundColor: '#f60' }}
@@ -294,12 +294,12 @@ export default function SceneDetailPage() {
                                         <Text style={{
                                             fontSize: cx(14),
                                             color: '#000',
-                                            fontFamily: 'helvetica_neue_lt_std_roman',
+                                            // fontFamily: 'helvetica_neue_lt_std_roman',
                                         }}>{'亮度'}</Text>
                                         <Text style={{
                                             fontSize: cx(14),
                                             color: '#000',
-                                            fontFamily: 'helvetica_neue_lt_std_roman',
+                                            // fontFamily: 'helvetica_neue_lt_std_roman',
                                         }}>{state.currentNode.v}%</Text>
                                     </View>
                                     <Slider.Horizontal
@@ -351,12 +351,12 @@ export default function SceneDetailPage() {
                                         <Text style={{
                                             fontSize: cx(14),
                                             color: '#000',
-                                            fontFamily: 'helvetica_neue_lt_std_roman',
+                                            // fontFamily: 'helvetica_neue_lt_std_roman',
                                         }}>{Strings.getLang('add_new_trigger_time_field_brightness_text')}</Text>
                                         <Text style={{
                                             fontSize: cx(14),
                                             color: '#000',
-                                            fontFamily: 'helvetica_neue_lt_std_roman',
+                                            // fontFamily: 'helvetica_neue_lt_std_roman',
                                         }}>{state.currentNode.brightness}%</Text>
                                     </View>
                                     <Slider.Horizontal

package/src/modules/scene/ScenePage.tsx

@@ -66,7 +66,7 @@ const ScenePage = () => {
                         color: '#fff',
                         fontSize: cx(18),
                         letterSpacing: 0.2,
-                        fontFamily: 'helvetica_neue_lt_std_roman',
+                        // fontFamily: 'helvetica_neue_lt_std_roman',
                     }}>{item.name}</Text>
                 </ImageBackground>
             </TouchableOpacity>
@@ -99,7 +99,7 @@ const ScenePage = () => {
                         color: '#fff',
                         fontSize: cx(40),
                         letterSpacing: 4,
-                        fontFamily: 'helvetica_neue_lt_std_roman',
+                        // fontFamily: 'helvetica_neue_lt_std_roman',
                     }}>{state.currentScene?.name}</Text>
                 </View>
                 <View
@@ -114,7 +114,7 @@ const ScenePage = () => {
                         style={{
                             color: '#fff',
                             fontSize: cx(16),
-                            fontFamily: 'helvetica_neue_lt_std_roman',
+                            // fontFamily: 'helvetica_neue_lt_std_roman',
                         }}>{Strings.getLang('Current scene')}</Text>
                     <TouchableOpacity
                         style={{ padding: cx(10) }}

package/src/modules/select/SelectPage.tsx

@@ -95,7 +95,7 @@ const styles = StyleSheet.create({
     marginStart: cx(16),
     color: '#f60',
     fontSize: cx(17),
-    fontFamily: 'helvetica_neue_lt_std_roman',
+    // fontFamily: 'helvetica_neue_lt_std_roman',
   },
   title: {
     width: '100%',
@@ -105,7 +105,7 @@ const styles = StyleSheet.create({
     color: '#000',
     fontSize: cx(17),
     paddingHorizontal: cx(110),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
   card: {
     marginHorizontal: cx(16),
@@ -120,7 +120,7 @@ const styles = StyleSheet.create({
     marginStart: cx(13),
     color: '#000',
     fontSize: cx(17),
-    fontFamily: 'helvetica_neue_lt_std_roman',
+    // fontFamily: 'helvetica_neue_lt_std_roman',
   },
   itemLine: {
     height: cx(1),

package/src/modules/timeSchedule/LdvScheduleItem.tsx

@@ -89,19 +89,19 @@ const styles = StyleSheet.create({
     time: {
         marginBottom: convertX(5),
         fontSize: 16,
-        fontFamily: 'helvetica_neue_lt_std_bd',
+        // fontFamily: 'helvetica_neue_lt_std_bd',
         fontWeight: 'bold',
     },
     loop: {
         color: '#000',
         fontSize: convertX(14),
-        fontFamily: 'helvetica_neue_lt_std_bd',
+        // fontFamily: 'helvetica_neue_lt_std_bd',
         marginTop: convertX(8),
     },
     name: {
         color: '#000',
         fontSize: convertX(14),
-        fontFamily: 'helvetica_neue_lt_std_bd',
+        // fontFamily: 'helvetica_neue_lt_std_bd',
         marginTop: convertX(8),
     },
     switchContainer: {

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -692,7 +692,7 @@ const styles = StyleSheet.create({
   },
   loopText: {
     fontSize: cx(14),
-    fontFamily: 'PingFangSC-Medium',
+    // fontFamily: 'PingFangSC-Medium',
     color: '#999999',
     marginTop: cx(10),
   },
@@ -700,7 +700,7 @@ const styles = StyleSheet.create({
     color: '#000',
     fontSize: cx(16),
     fontWeight: 'bold',
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
     marginTop: cx(30),
     marginBottom: cx(10),
   },
@@ -723,7 +723,7 @@ const styles = StyleSheet.create({
   switchCardTitle: {
     color: '#000',
     fontSize: cx(16),
-    fontFamily: 'helvetica_neue_lt_std_bd',
+    // fontFamily: 'helvetica_neue_lt_std_bd',
   },
   skillListItem: {
     flexDirection: 'row',

package/src/modules/timer/TimerPage.tsx

@@ -170,7 +170,7 @@ const TimerPage = (props: {theme?: ThemeType}) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       marginTop: cx(30),
       marginBottom: cx(10)
     },

package/src/newModules/biorhythm/BiorhythmEditPage.tsx

@@ -112,7 +112,7 @@ const BiorhythmEditPage = (props: { theme?: ThemeType }) => {
     title: {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       paddingVertical: cx(16),
     },
   })
@@ -195,7 +195,13 @@ const BiorhythmEditPage = (props: { theme?: ThemeType }) => {
             </TouchableOpacity>
           </View>
           <Text
-            style={{ fontSize: cx(16), color: props.theme?.global.fontColor, fontFamily: 'helvetica_neue_lt_std_bd', marginTop: cx(33), marginBottom: cx(16) }}>
+            style={{
+              fontSize: cx(16),
+              color: props.theme?.global.fontColor,
+              // fontFamily: 'helvetica_neue_lt_std_bd',
+              marginTop: cx(33),
+              marginBottom: cx(16)
+          }}>
             {I18n.getLang('add_new_trigger_time_subheadline_text')}
           </Text>
           <Card>

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -224,7 +224,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
             <Text
                 onPress={openLink}
                 style={{
-                  fontFamily: 'helvetica_neue_lt_std_roman',
+                  // fontFamily: 'helvetica_neue_lt_std_roman',
                   color: props.theme?.button.primary,
                   textDecorationLine: 'underline',
                   flexWrap: 'wrap',
@@ -343,7 +343,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                 <Text style={{
                   fontSize: cx(16),
                   color: props.theme?.textInput.fontColor,
-                  fontFamily: 'helvetica_neue_lt_std_roman',
+                  // fontFamily: 'helvetica_neue_lt_std_roman',
                   paddingLeft: cx(16),
                 }}>
                   {
@@ -524,7 +524,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                           style={{
                             fontSize: cx(16),
                             color: props.theme?.global.fontColor,
-                            fontFamily: 'helvetica_neue_lt_std_roman',
+                            // fontFamily: 'helvetica_neue_lt_std_roman',
                           }}
                         >
                           {convertMinutesTo12HourFormat(item.time, is24Hour)}
@@ -546,7 +546,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                         style={{
                           fontSize: cx(12),
                           color: props.theme?.global.secondFontColor,
-                          fontFamily: 'helvetica_neue_lt_std_roman',
+                          // fontFamily: 'helvetica_neue_lt_std_roman',
                           paddingLeft: cx(20),
                         }}
                       >
@@ -576,7 +576,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                     text={I18n.getLang('bio_ryhthm_default_button_reset_text')}
                     textStyle={{
                       fontSize: cx(16),
-                      fontFamily: 'helvetica_neue_lt_std_roman',
+                      // fontFamily: 'helvetica_neue_lt_std_roman',
                     }}
                     onPress={() => {
                       showCommonDialog({

package/src/newModules/childLock/ChildLockPage.tsx

@@ -48,7 +48,7 @@ const ChildLockPage = (props: { theme?: ThemeType }) => {
     title: {
       color: props.theme?.global.fontColor,
       fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       paddingVertical: cx(16),
     },
     shadow: {

package/src/newModules/diyScene/DiySceneEditorPage.tsx

@@ -180,7 +180,7 @@ const DiySceneEditorPage = (props: { theme?: ThemeType }) => {
     deleteBtnText: {
       color: props.theme?.button.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
   })
 

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -43,6 +43,7 @@ export async function updatePrice(devId: string, energyData: EnergyData) {
 export async function resetElectricity(devId) {
   const res = await TYSdk.apiRequest('tuya.m.dp.statistics.reset', {devId}, '1.0')
   xLog('resetElectricity res', res)
+  return res
 }
 
 export async function getElectricity(devId: string, addEleDpCode: string, date: string, dateType: DateType): Promise<OverviewItem[]> {

package/src/newModules/energyConsumption/EnergyConsumptionCard.tsx

@@ -148,7 +148,7 @@ const EnergyConsumptionCard = (props: EnergyConsumptionProp) => {
       addEleDpCode: props.addEleDpCode,
     } as EnergyConsumptionPageProps)}>
     <Spacer height={cx(16)}/>
-    <View style={styles.consumedEnergyHeadline}>
+    <View accessibilityLabel={'AdvanceCard'} accessibilityHint={I18n.getLang(state.isGeneration ? 'sockets_headline_power' : 'sockets_ce')} style={styles.consumedEnergyHeadline}>
       <Text
         style={styles.consumedEnergyCardTitle}>{I18n.getLang(state.isGeneration ? 'sockets_headline_power' : 'sockets_ce')}</Text>
       <Image source={Res.energyChart} style={{ width: cx(24), height: cx(24), tintColor: props.theme?.icon.normal }}/>

package/src/newModules/energyConsumption/EnergyConsumptionChart/EnergyChartSection.tsx

@@ -34,7 +34,7 @@ export const EnergyChartSection = ({ isLandscape, state, actions, params, styles
     <>
       <View style={styles.dateTypeContainer}>
         <DateTypeItem
-          style={{ flex: 0.5 }}
+          style={{ flex: 1 }}
           dateType={state.dateType}
           onDateTypeChange={actions.setDateType}
         />

package/src/newModules/energyConsumption/EnergyConsumptionChart/useEnergyData.ts

@@ -121,6 +121,9 @@ export const useEnergyData = (params: EnergyConsumptionChartProps, devId: string
 
   // 封装所有修改状态的函数
   const actions = {
+    cleanChartData: useCallback(() => {
+      state.chartData = []
+    }, []),
     setChartType: useCallback((type: ChartType) => {
       state.chartType = type
     }, []),

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -1,4 +1,5 @@
 import Segmented from '@ledvance/base/src/components/Segmented'
+import { resetElectricity } from './EnergyConsumptionActions'
 import { ChartType } from './co2Data'
 import { EnergyChartSection } from './EnergyConsumptionChart/EnergyChartSection'
 import { PowerChartSection } from './EnergyConsumptionChart/PowerChartSection'
@@ -21,8 +22,10 @@ import {useDeviceId, useSolarPlug, useTimeZoneCity} from "@ledvance/base/src/mod
 import { flattenDeep, isEmpty } from "lodash";
 import { exchangeNumber, localeNumber, monthFormat, monthFormatShort, showDialog } from "@ledvance/base/src/utils/common";
 import {
-  EnergyGeneration, EnergyHistory,
-  exportEnergyCsv, getEnergyGenerationValue, setEnergyGenerationValue,
+  EnergyGeneration,
+  EnergyHistory,
+  getEnergyGenerationValue,
+  setEnergyGenerationValue,
   updatePrice,
   useElectricCurrent,
   usePower,
@@ -136,8 +139,8 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
   }, [isSolarPlug, state.generationMode])
 
   const totalElectricity = useMemo(() => {
-    return Math.max(Number(state.totalElectricity) - (state.energyGeneration.totalElectricity || 0), 0)
-  }, [state.totalElectricity, state.energyGeneration.totalElectricity])
+    return Number(state.totalElectricity)
+  }, [state.totalElectricity])
 
   useUpdateEffect(() =>{
     if(totalElectricity >= 0 && timeZoneCity){
@@ -167,16 +170,17 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
     const item: EnergyHistory = {
       time,
       generationMode: value,
-      value: Number(state.totalElectricity) || 0,
+      value: 0,
       type: isSolarPlug ? (value ? 'Consumption' : 'Generation') : (value ? 'Generation' : 'Consumption')
     }
     const data: EnergyGeneration = {
       generationMode: value,
-      totalElectricity: Number(state.totalElectricity) || 0,
+      totalElectricity: 0,
       history: [item, ...state.energyGeneration.history]
     }
     const res = await setEnergyGenerationValue(devId, data)
     if (res) {
+      await cleanEnergyData()
       state.generationMode = value
       state.energyGeneration = data
     } else {
@@ -185,9 +189,15 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
     state.loading = false
   }
 
-  const onceByDay = () => {
-    const currentDay = dayjs().startOf('day').valueOf()
-    return !!state.energyGeneration.history.find(item => item.time === currentDay)
+  const cleanEnergyData = async () => {
+    const res = await resetElectricity(devId)
+    if (res) {
+      state.todayElectricity = 0
+      state.totalElectricity = 0
+      state.overviewList = []
+      actions.cleanChartData()
+    }
+    return res
   }
 
   const getElectricity = async () => {
@@ -212,6 +222,8 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
           return monthData
         })
         state.overviewList = flattenDeep(monthList)
+      } else {
+        state.overviewList = []
       }
     }
   }
@@ -344,10 +356,17 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
       style={{ position: 'relative' }}
       backText={backTitle}
       headlineText={backTitle}
-      headlineIcon={state.overviewList.length ? res.download_icon : undefined}
+      headlineIcon={res.ic_refresh}
       onHeadlineIconClick={() => {
-        const values = state.overviewList.map(item => [item.key, item.value, (Number(state.price) * Number(item.value)).toFixed(2)])
-        exportEnergyCsv(values, state.unit)
+        showDialog({
+          method: 'confirm',
+          title: I18n.getLang('reset_energy'),
+          subTitle: '',
+          onConfirm: (_, { close }) => {
+            close()
+            cleanEnergyData().then()
+          }
+        })
       }}
       showGreenery={isGeneration}
       greeneryIcon={res.energy_consumption_greenery}
@@ -508,17 +527,6 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
                 if (state.loading) {
                   return
                 }
-                if (onceByDay()) {
-                  showDialog({
-                    method: 'alert',
-                    title: I18n.getLang('switchonlyonce', 'Switching the mode is only allowed once a day.'),
-                    confirmText: I18n.getLang('home_screen_home_dialog_yes_con'),
-                    onConfirm: (_, {close}) => {
-                      close()
-                    }
-                  })
-                  return
-                }
                 showDialog({
                   method: 'confirm',
                   title: getEnergyModeTitle(value),

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -87,7 +87,7 @@ const FixedTimeDetailPage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     applyContent: {
       backgroundColor: props.theme?.container.background,

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -150,13 +150,13 @@ const FixedTimePage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     switchBtn: {},
     loopText: {
       color: props.theme?.global.fontColor,
       fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
     },
     categoryList: {
       display: 'flex',
@@ -179,7 +179,7 @@ const FixedTimePage = (props: { theme?: ThemeType }) => {
     tagTitle: {
       fontSize: cx(10),
       textAlign: 'center',
-      fontFamily: 'PingFangSC-Medium',
+      // fontFamily: 'PingFangSC-Medium',
       color: props.theme?.tag.fontColor,
     },
   })

package/src/newModules/lightMode/LightModePage.tsx

@@ -84,7 +84,7 @@ const LightModePage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
   })
 

package/src/newModules/mood/DynamicMoodEditorPage.tsx

@@ -158,7 +158,7 @@ const DynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
     light: {
       color: props.theme?.global.fontColor,
       fontSize: cx(18),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     transitionMode: {
       marginHorizontal: cx(16),
@@ -224,7 +224,7 @@ const DynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
     deleteBtnText: {
       color: props.theme?.button.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
   })
 

package/src/newModules/mood/MixDynamicMoodEditor.tsx

@@ -170,7 +170,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
     light: {
       color: props.theme?.global.fontColor,
       fontSize: cx(18),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     transitionMode: {
       marginHorizontal: cx(16),
@@ -236,7 +236,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
     deleteBtnText: {
       color: props.theme?.button.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
   })
 

package/src/newModules/mood/MoodItem.tsx

@@ -57,7 +57,7 @@ const MoodItem = (props: MoodItemProps) => {
       flex: 1,
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       lineHeight: cx(20),
     },
     checkbox: {
@@ -80,7 +80,7 @@ const MoodItem = (props: MoodItemProps) => {
       color: props.theme?.tag.fontColor,
       fontSize: cx(10),
       textAlignVertical: 'center',
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
       lineHeight: cx(16),
     },
   })

package/src/newModules/mood/RecommendMoodItem.tsx

@@ -49,7 +49,7 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
     title: {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     lineStyle: {
       alignItems: 'center',

package/src/newModules/mood/StaticMoodEditorPage.tsx

@@ -149,7 +149,7 @@ const StaticMoodEditorPage = (props: { theme?: ThemeType }) => {
     deleteBtnText: {
       color: props.theme?.button.fontColor,
       fontSize: cx(16),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
   })
 

package/src/newModules/overchargeSwitch/OverchargeSwitchPage.tsx

@@ -36,7 +36,7 @@ const OverchargeSwitchPage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       paddingTop: cx(16),
       paddingHorizontal: cx(16),
     },

package/src/newModules/powerOnBehavior/LightBehaviorPage.tsx

@@ -55,7 +55,7 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
       marginHorizontal: cx(24),
       color: props.theme?.global.fontColor,
       fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
     },
     modeSelectGroup: {
       marginHorizontal: cx(24),
@@ -210,7 +210,7 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
                     marginHorizontal: cx(8),
                     color: props.theme?.global.fontColor,
                     fontSize: cx(12),
-                    fontFamily: 'helvetica_neue_lt_std_roman',
+                    // fontFamily: 'helvetica_neue_lt_std_roman',
                   }}>
                 {I18n.getLang('groups_settings_power_on_behavior_disturbbox_note')}
               </Text>

package/src/newModules/randomTime/RandomTimeDetailPage.tsx

@@ -73,7 +73,7 @@ const RandomTimeDetailPage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     applyContent: {
       backgroundColor: props.theme?.container.background,

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -152,13 +152,13 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     switchBtn: {},
     loopText: {
       color: props.theme?.global.fontColor,
       fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
     },
     categoryList: {
       display: 'flex',
@@ -181,7 +181,7 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
     tagTitle: {
       fontSize: cx(10),
       textAlign: 'center',
-      fontFamily: 'PingFangSC-Medium',
+      // fontFamily: 'PingFangSC-Medium',
       color: props.theme?.tag.fontColor
     },
   })

package/src/newModules/randomTime/Summary.tsx

@@ -29,7 +29,7 @@ const Summary = (props: SummaryProps) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     summaryContainer: {
       flex: 1,

package/src/newModules/select/SelectPage.tsx

@@ -47,7 +47,7 @@ const SelectPage = (props: { theme?: ThemeType }) => {
       marginStart: cx(16),
       color: props.theme?.button.cancel,
       fontSize: cx(17),
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
     },
     title: {
       width: '100%',
@@ -57,7 +57,7 @@ const SelectPage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(17),
       paddingHorizontal: cx(110),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     card: {
       backgroundColor: props.theme?.card.background,
@@ -73,7 +73,7 @@ const SelectPage = (props: { theme?: ThemeType }) => {
       marginStart: cx(13),
       color: props.theme?.global.fontColor,
       fontSize: cx(17),
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
     },
     itemLine: {
       height: cx(1),

package/src/newModules/sleepWakeUp/SleepWakeUpDetailPage.tsx

@@ -210,7 +210,7 @@ const SleepWakeUpDetailPage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       marginBottom: cx(10),
     },
     skillListItem: {

package/src/newModules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo } from "react";
-import { StyleSheet, View, Text, Image, FlatList } from 'react-native'
+import { StyleSheet, View, Text, Image, FlatList, Platform } from 'react-native'
 import Page from '@ledvance/base/src/components/Page'
 import Tag from '@ledvance/base/src/components/Tag'
 import Spacer from '@ledvance/base/src/components/Spacer'
@@ -256,8 +256,9 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
     addMoodPopover: {
       width: cx(210),
       height: cx(90.5),
-      marginStart: cx(115),
-      marginTop: cx(100),
+      position: 'absolute',
+      right: cx(60),
+      top: Platform.OS === 'android' ? cx(90) : cx(130),
       backgroundColor: props.theme?.card.background,
     },
     popoverItem: {
@@ -281,7 +282,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
       fontSize: cx(12),
       lineHeight: cx(20),
       textAlign: 'center',
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
       color: props.theme?.global.fontColor
     },
     emptyBtnView: {
@@ -316,13 +317,13 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     switchBtn: {},
     loopText: {
       color: props.theme?.global.fontColor,
       fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
+      // fontFamily: 'helvetica_neue_lt_std_roman',
       height: cx(20)
     },
     tag: {
@@ -335,7 +336,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
     tagTitle: {
       fontSize: cx(10),
       textAlign: 'center',
-      fontFamily: 'PingFangSC-Medium',
+      // fontFamily: 'PingFangSC-Medium',
       color: props.theme?.tag.fontColor
     },
   })

package/src/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -271,7 +271,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
       color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
     },
     applyContent: {
       backgroundColor: props.theme?.container.background,

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -114,6 +114,17 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
       return {
         success: true,
       };
+    } else {
+      if (mode === 'add') {
+        const title = res.msg?.includes('LINKAGE_TIMER_OVER_MAX_LIMIT_30') ? I18n.getLang('repeater_schedule_error_limit') :I18n.getLang('repeater_schedule_error_common.add_fail')
+        showDialog({
+          method: 'alert',
+          title: title,
+          onConfirm: (_, { close }) => {
+            close()
+          }
+        })
+      }
     }
     return res;
   };
@@ -207,44 +218,44 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
         )}
         {params.applyForList.length > 1 && !!state.originList.length && !(params.isCeilingLight || params.isMixLight) && showTags}
         {state.timeScheduleList.length > 0 ? <FlatList
-          data={state.timeScheduleList}
-          renderItem={({ item }) => (
-            <ScheduleCard
-              item={item}
-              tags={params.applyForList}
-              showTag={params.applyForList.length > 1}
-              onEnableChange={async enable => {
-                state.loading = true;
-                await modDeleteTimeSchedule('update', {
-                  ...item,
-                  enable,
-                });
-                state.loading = false;
-              }}
-              onPress={() => {
-                navigateToEdit('update', item);
-              }}
-              onLongPress={() =>{
-                showDialog({
-                  method: 'confirm',
-                  title: I18n.getLang('cancel_dialog_delete_item_timeschedule_titel'),
-                  subTitle: I18n.getLang('cancel_dialog_delete_item_timeschedule_description'),
-                  onConfirm: async (_, { close }) => {
-                    state.loading = true;
-                    close();
-                    await modDeleteTimeSchedule('delete', item);
-                    state.loading = false;
-                  },
-                });
-              }}
-            />
-          )}
-          keyExtractor={item => item.id.toString()}
-          ListEmptyComponent={<Spacer />}
-          ListHeaderComponent={() => <Spacer height={cx(10)} />}
-          ItemSeparatorComponent={() => <Spacer />}
-          ListFooterComponent={() => <Spacer height={cx(30)} />}
-        /> :
+            data={state.timeScheduleList}
+            renderItem={({ item }) => (
+              <ScheduleCard
+                item={item}
+                tags={params.applyForList}
+                showTag={params.applyForList.length > 1}
+                onEnableChange={async enable => {
+                  state.loading = true;
+                  await modDeleteTimeSchedule('update', {
+                    ...item,
+                    enable,
+                  });
+                  state.loading = false;
+                }}
+                onPress={() => {
+                  navigateToEdit('update', item);
+                }}
+                onLongPress={() =>{
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang('cancel_dialog_delete_item_timeschedule_titel'),
+                    subTitle: I18n.getLang('cancel_dialog_delete_item_timeschedule_description'),
+                    onConfirm: async (_, { close }) => {
+                      state.loading = true;
+                      close();
+                      await modDeleteTimeSchedule('delete', item);
+                      state.loading = false;
+                    },
+                  });
+                }}
+              />
+            )}
+            keyExtractor={item => item.id.toString()}
+            ListEmptyComponent={<Spacer />}
+            ListHeaderComponent={() => <Spacer height={cx(10)} />}
+            ItemSeparatorComponent={() => <Spacer />}
+            ListFooterComponent={() => <Spacer height={cx(30)} />}
+          /> :
           <View style={styles.emptyContainer}>
             <Spacer height={cx(60)} />
             <Image

package/src/newModules/timeSchedule/components/ScheduleCard.tsx

@@ -47,19 +47,19 @@ const ScheduleCard = (props: ScheduleCardProps) => {
       color: props.theme?.global.fontColor,
       marginBottom: cx(5),
       fontSize: 16,
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       fontWeight: 'bold',
     },
     loop: {
       color: props.theme?.global.fontColor,
       fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       marginTop: cx(8),
     },
     name: {
       color: props.theme?.global.fontColor,
       fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_bd',
+      // fontFamily: 'helvetica_neue_lt_std_bd',
       marginTop: cx(8),
     },
     switchContainer: {
@@ -84,7 +84,7 @@ const ScheduleCard = (props: ScheduleCardProps) => {
     tagTitle: {
       fontSize: cx(10),
       textAlign: 'center',
-      fontFamily: 'PingFangSC-Medium',
+      // fontFamily: 'PingFangSC-Medium',
       color: '#000'
     },
   });