@ledvance/group-ui-biz-bundle 1.0.65 → 1.0.67

package/package.json

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

package/src/modules/flags/FlagEditPage.tsx

@@ -56,11 +56,15 @@ const FlagEditPage = () => {
   }, [state.currentNode, state.currentWhiteNode])
 
   useUpdateEffect(() =>{
-    state.currentNode = state.mood.colors[state.colorPaintBucketIdx]
+    if (state.colorPaintBucketIdx < state.mood.colors.length){
+      state.currentNode = state.mood.colors[state.colorPaintBucketIdx]
+    }
   }, [JSON.stringify(state.mood.colors), state.colorPaintBucketIdx])
 
   useUpdateEffect(() =>{
-    state.currentWhiteNode = state.mood.whiteColors[state.whitePaintBucketIdx]
+    if (state.whitePaintBucketIdx < state.mood.whiteColors.length ){
+      state.currentWhiteNode = state.mood.whiteColors[state.whitePaintBucketIdx]
+    }
   }, [JSON.stringify(state.mood.whiteColors), state.whitePaintBucketIdx])
 
   const checkMoodDataChanged = useMemo(() =>{

package/src/modules/remoteSwitch/RemoteSwitchPage.tsx

@@ -7,6 +7,7 @@ import {useReactive} from "ahooks";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import {useRemoteSwitch} from "./RemoteSwitchAction";
 import {View, Text, StyleSheet} from "react-native";
+import {showDialog} from "@ledvance/base/src/utils/common";
 
 const { convertX: cx } = Utils.RatioUtils
 
@@ -24,9 +25,26 @@ const RemoteSwitchPage = () => {
       <View style={[styles.colorBlock, { backgroundColor: 'red', opacity: 0 }]} />
       <Spacer style={{ flex: 1 }} height={0} width={0} />
       <SwitchButton value={remoteSwitch} onValueChange={async v => {
-        state.loading = true
-        await setRemoteSwitch(v)
-        state.loading = false
+        if (state.loading) {
+          return
+        }
+        if (v) {
+          showDialog({
+            method: 'confirm',
+            title: I18n.getLang('Remotecontrol_Title'),
+            subTitle: I18n.getLang('Remotecontrol_description'),
+            onConfirm: async (_, { close }) => {
+              close()
+              state.loading = true
+              await setRemoteSwitch(v)
+              state.loading = false
+            }
+          })
+        } else {
+          state.loading = true
+          await setRemoteSwitch(v)
+          state.loading = false
+        }
       } } />
     </View>
   </Page>)

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -14,11 +14,12 @@ import Spacer from '@ledvance/base/src/components/Spacer';
 import InfoText from '@ledvance/base/src/components/InfoText';
 import DeleteButton from '@ledvance/base/src/components/DeleteButton';
 import { useReactive, useUpdateEffect } from 'ahooks';
-import { addTimeSchedule, modDelTimeSchedule, getTimeSchedule, modifyTimeSchedule } from "@ledvance/group-ui-biz-bundle/src/modules/timeSchedule/TimeScheduleActions";
-import { ApplyForItem, DeviceStateType, Timer } from '@ledvance/group-ui-biz-bundle/src/modules/timeSchedule/Interface';
+import { addTimeSchedule, modDelTimeSchedule, getTimeSchedule, modifyTimeSchedule } from "./TimeScheduleActions";
+import { DeviceStateType, Timer } from './Interface';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
-import ScheduleCard from '@ledvance/group-ui-biz-bundle/src/modules/timeSchedule/components/ScheduleCard';
-import { ui_biz_routerKey } from "@ledvance/group-ui-biz-bundle/src/navigation/Routers";
+import ScheduleCard from './components/ScheduleCard';
+import { ui_biz_routerKey } from "../../navigation/Routers";
+import { ApplyForItem } from '@ledvance/base/src/utils/interface';
 
 const { convertX: cx } = Utils.RatioUtils;
 const MAX_NUM = 30;
@@ -141,6 +142,7 @@ const TimeSchedulePage = () => {
             iconStyle={{ tintColor: '#ff9500' }}
           />
         )}
+        { state.timeScheduleList.length > 0 ?
         <FlatList
           data={state.timeScheduleList}
           renderItem={({ item }) => (
@@ -161,36 +163,36 @@ const TimeSchedulePage = () => {
             />
           )}
           keyExtractor={item => item.id.toString()}
-          ListEmptyComponent={() => (
-            <View style={styles.emptyContainer}>
-              <Spacer height={cx(60)} />
-              <Image
-                style={styles.emptyImage}
-                source={{ uri: res.ldv_timer_empty }}
-                resizeMode="contain"
-              />
-              <InfoText
-                icon={res.device_panel_schedule_alert}
-                text={I18n.getLang('timeschedule_overview_empty_information_text')}
-                style={{ width: 'auto', alignItems: 'center' }}
-                textStyle={{ color: '#000', fontSize: cx(12), flex: undefined }}
-                iconStyle={{ tintColor: '#000' }}
-              />
-              <Spacer height={cx(16)} />
-              <DeleteButton
-                style={styles.addBtn}
-                text={`${I18n.getLang('timeschedule_overview_empty_button_add_text')}`}
-                textStyle={{ fontSize: cx(12) }}
-                onPress={() => {
-                  navigateToEdit('add');
-                }}
-              />
-            </View>
-          )}
+          ListEmptyComponent={<Spacer />}
           ListHeaderComponent={() => <Spacer height={cx(10)} />}
           ItemSeparatorComponent={() => <Spacer />}
           ListFooterComponent={() => <Spacer height={cx(30)} />}
-        />
+        /> :
+          <View style={styles.emptyContainer}>
+            <Spacer height={cx(60)}/>
+            <Image
+              style={styles.emptyImage}
+              source={{uri: res.ldv_timer_empty}}
+              resizeMode="contain"
+            />
+            <InfoText
+              icon={res.device_panel_schedule_alert}
+              text={I18n.getLang('timeschedule_overview_empty_information_text')}
+              style={{width: 'auto', alignItems: 'center'}}
+              textStyle={{color: '#000', fontSize: cx(12), flex: undefined}}
+              iconStyle={{tintColor: '#000'}}
+            />
+            <Spacer height={cx(16)}/>
+            <DeleteButton
+              style={styles.addBtn}
+              text={`${I18n.getLang('timeschedule_overview_empty_button_add_text')}`}
+              textStyle={{fontSize: cx(12)}}
+              onPress={() => {
+                navigateToEdit('add');
+              }}
+            />
+          </View>
+        }
       </ScrollView>
     </Page>
   );

package/src/modules/timeSchedule/components/ManuaSettings.tsx

@@ -71,7 +71,7 @@ function ManualSettings(props: ManualSettingProps) {
           <View key={item.dp}>
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
-                title={item.key}
+                title={item.name || item.key}
                 color={'#fff'}
                 colorAlpha={1}
                 enable={item.enable}
@@ -170,7 +170,7 @@ function ManualSettings(props: ManualSettingProps) {
                   // @ts-ignore
                   fanSpeed={deviceData.fanSpeed}
                   onFanSwitch={() => {}}
-                  onFanSpeedChangeComplete={(fanSpeed) => { 
+                  onFanSpeedChangeComplete={(fanSpeed) => {
                     state.deviceData = {
                       ...state.deviceData,
                       fanSpeed