@ledvance/ui-biz-bundle 1.1.152 → 1.1.154

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -61,13 +61,8 @@ export async function getElectricity(devId: string, addEleDpCode: string, date:
   return res
 }
 
-let dpResultByMonthCache: DpResultByMonthResData | undefined = undefined
 const getDpResultByYear = async (devId: string, addEleDpCode: string, dateStr: string): Promise<OverviewItem[]> => {
-  let res: DpResultByMonthResData | undefined
-  if (!dpResultByMonthCache) {
-    dpResultByMonthCache = await getDpResultByMonth(devId, addEleDpCode, 'sum')
-  }
-  res = dpResultByMonthCache
+  const res = await getDpResultByMonth(devId, addEleDpCode, 'sum')
   if (!isEmpty(res)) {
     if (!isEmpty(res.years)) {
       const year = dateStr
@@ -75,7 +70,7 @@ const getDpResultByYear = async (devId: string, addEleDpCode: string, dateStr: s
       if (!curMonth) {
         return []
       }
-      const curMonthList = Object.keys(curMonth).sort((a, b) => parseInt(b) - parseInt(a))
+      const curMonthList = Object.keys(curMonth).sort((a, b) => parseInt(a) - parseInt(b))
       return curMonthList.map(month => {
         return {
           key: `${monthFormat(month)} ${year}`,

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

@@ -3,7 +3,6 @@ import res from '@ledvance/base/src/res'
 import React, { useCallback } from 'react'
 import { Image, TouchableOpacity, View } from 'react-native'
 import { Utils } from 'tuya-panel-kit'
-import DateSelectedItem from '../component/DateSelectedItem'
 import DateSwitch from '../component/DateSwitch'
 import { DateType } from '../co2Data'
 import DateTypeItem from '../component/DateTypeItem'
@@ -33,30 +32,13 @@ export const EnergyChartSection = ({ isLandscape, state, actions, params, styles
 
   return (
     <>
-      {!isLandscape && (
-        <View style={styles.dateSwitchContainer}>
-          <DateSwitch
-            style={{ flex: 1 }}
-            date={state.date}
-            dateType={state.dateType}
-            headlineText={state.headlineText}
-            onDateChange={actions.setDate}
-          />
-          <TouchableOpacity style={{ width: cx(30) }} onPress={handleExportCsv}>
-            <Image
-              style={styles.downloadIcon}
-              source={{ uri: !isDataEmpty ? res.download_icon : undefined }}
-            />
-          </TouchableOpacity>
-        </View>
-      )}
       <View style={styles.dateTypeContainer}>
         <DateTypeItem
-          style={{ flex: 1, marginHorizontal: cx(5) }}
+          style={{ flex: 0.5 }}
           dateType={state.dateType}
           onDateTypeChange={actions.setDateType}
         />
-        <DateSelectedItem
+        <DateSwitch
           style={{ flex: 1 }}
           dateType={state.dateType}
           date={state.date}
@@ -67,8 +49,18 @@ export const EnergyChartSection = ({ isLandscape, state, actions, params, styles
       {(state.loading || isDataEmpty) ? (
         <EmptyDataView text={getEmptyDataTip()} theme={theme} styles={styles}/>
       ) : (
-        !state.loading &&
-        <NewBarChart height={chartHeight} data={state.chartData} price={state.price} unit={params.unit}/>
+        !state.loading && <>
+          {!isLandscape && <View style={styles.downloadContainer}>
+              <TouchableOpacity
+                  style={{ width: cx(30) }}
+                  onPress={handleExportCsv}>
+                  <Image
+                      style={styles.downloadIcon}
+                      source={{ uri: res.download_icon }}/>
+              </TouchableOpacity>
+          </View>}
+            <NewBarChart height={chartHeight} data={state.chartData} price={state.price} unit={params.unit}/>
+        </>
       )}
     </>
   )

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

@@ -16,13 +16,17 @@ export const getStyles = (theme: ThemeType | undefined) => StyleSheet.create({
   listEmptyText: {
     flex: 0,
   },
+  downloadContainer: {
+    flexDirection: 'row',
+    justifyContent: 'flex-end',
+    // marginHorizontal: cx(24),
+    marginTop: cx(15),
+    marginBottom: cx(-15)
+  },
   downloadIcon: {
     width: cx(24),
     height: cx(24),
     tintColor: theme?.global.brand,
-    position: 'absolute',
-    right: 0,
-    top: cx(10),
   },
   intervalContainer: {
     flexDirection: 'row',
@@ -79,7 +83,8 @@ export const getStyles = (theme: ThemeType | undefined) => StyleSheet.create({
   },
   dateTypeContainer: {
     flexDirection: 'row',
-    marginBottom: cx(15),
+    marginTop: cx(15),
+    // marginBottom: cx(15),
   },
   scrollViewContent: {
     marginHorizontal: cx(24),

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

@@ -9,9 +9,11 @@ import { useCallback, useEffect } from 'react'
 import { ChartType, DateType } from '../co2Data'
 import { getElectricity, getPowerData, PowerDataItem } from '../EnergyConsumptionActions'
 import { EnergyConsumptionChartProps } from '../EnergyConsumptionChart'
+import {useIsPad} from "@ledvance/base/src/models/modules/NativePropsSlice"
 
 export const useEnergyData = (params: EnergyConsumptionChartProps, devId: string) => {
   const isFocused = useIsFocused()
+  const isPad = useIsPad()
   const { addEleDpCode, powerDpCode, price, unit, date, over365Days, over7Days, chartData } = params
 
   const getDateType = useCallback((d: string) => {
@@ -26,7 +28,7 @@ export const useEnergyData = (params: EnergyConsumptionChartProps, devId: string
 
   const state = useReactive({
     loading: false,
-    isSupportLandscape: OrientationService.isSupported(),
+    isSupportLandscape: OrientationService.isSupported() && !isPad,
     isLandscape: false,
     chartType: ChartType.kWh as ChartType,
     dateType: getDateType(date),

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

@@ -1,6 +1,7 @@
 import ThemeType from "@ledvance/base/src/config/themeType";
+import DateSelectedItem from './DateSelectedItem'
 import React, {PropsWithChildren, useCallback, useEffect} from "react";
-import {Image, Text, TouchableOpacity, View, ViewProps} from "react-native";
+import {Image, TouchableOpacity, View, ViewProps} from "react-native";
 import {Utils} from "tuya-panel-kit";
 import {useReactive} from "ahooks";
 import {DateType} from "../co2Data";
@@ -79,33 +80,34 @@ export default withTheme(function DateSwitch(props: DateSwitchProps) {
 
     return (<View style={[props.style, {flexDirection: 'row', alignItems: 'center', justifyContent: 'center'}]}>
         <TouchableOpacity
-            disabled={state.disableArrowLeft}
-            onPress={() => {
-                changeDate(false);
-            }}>
+          disabled={state.disableArrowLeft}
+          onPress={() => {
+              changeDate(false);
+          }}>
             <Image
-                source={{ uri: res.arrow_left}}
-                style={{tintColor: state.disableArrowLeft ? theme?.global.disabledFontColor : theme?.global.brand}}
-                height={cx(36)}
-                width={cx(36)}/>
+              source={{ uri: res.arrow_left}}
+              style={{tintColor: state.disableArrowLeft ? theme?.global.disabledFontColor : theme?.global.brand}}
+              height={cx(36)}
+              width={cx(36)}/>
         </TouchableOpacity>
-        <Text style={{
-            fontSize: cx(24),
-            minWidth: cx(200),
-            textAlign: 'center',
-            color: theme?.global.brand,
-            // fontFamily: 'helvetica_neue_lt_std_roman',
-        }}>{state.headlineText}</Text>
+        <DateSelectedItem
+          style={{flex: 1}}
+          dateType={state.dateType}
+          date={state.date}
+          onDateChange={date => {
+              props.onDateChange(date)
+          }}
+        />
         <TouchableOpacity
-            disabled={state.disableArrowRight}
-            onPress={() => {
-                changeDate(true);
-            }}>
+          disabled={state.disableArrowRight}
+          onPress={() => {
+              changeDate(true);
+          }}>
             <Image
-                source={{ uri: res.arrow_right}}
-                style={{tintColor: state.disableArrowRight ? theme?.global.disabledFontColor : theme?.global.brand}}
-                height={cx(36)}
-                width={cx(36)}/>
+              source={{ uri: res.arrow_right}}
+              style={{tintColor: state.disableArrowRight ? theme?.global.disabledFontColor : theme?.global.brand}}
+              height={cx(36)}
+              width={cx(36)}/>
         </TouchableOpacity>
     </View>)
 })

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

@@ -62,6 +62,7 @@ const BarChartWithTouch = (props: BarChartProps) => {
       legend: {
         show: true,
         data: ['kWh', unit],
+        top: '5%',
         textStyle: {
           color: theme?.global?.fontColor,
         }

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

@@ -281,7 +281,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 +316,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 +335,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'
     },
   });