@ledvance/ui-biz-bundle 1.1.59 → 1.1.61

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

@@ -10,8 +10,10 @@ import { EnergyConsumptionChartProps } from "../EnergyConsumptionChart";
 import { useRoute } from '@react-navigation/core'
 
 const { convertX: cx } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
 
 interface OverViewProps {
+  theme?: any
   style?: StyleProp<ViewStyle>
   headlineText?: string
   headlineClick?: () => void
@@ -20,19 +22,43 @@ interface OverViewProps {
 }
 const OverView = (props: OverViewProps) => {
   const { over365Days} = useRoute().params as EnergyConsumptionChartProps
+
+  const styles = StyleSheet.create({
+    listEmptyContainer: {
+      alignItems: 'center'
+    },
+    listEmptyImage: {
+      width: cx(200),
+      height: cx(200),
+    },
+    listEmptyTextIcon: {
+      width: cx(16),
+      height: cx(16),
+      tintColor: props.theme.global.fontColor,
+    },
+    listEmptyText: {
+      color: props.theme.global.fontColor,
+      fontSize: cx(12),
+      fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+    overviewItemText: {
+      color: props.theme.global.fontColor,
+      fontSize: cx(14)
+    },
+  })
   return (
     <View style={[props.style]}>
       <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
-        <Text style={{ color: '#000', fontWeight: 'bold' }}>{props.headlineText}</Text>
+        <Text style={{ color: props.theme.global.fontColor, fontWeight: 'bold' }}>{props.headlineText}</Text>
         {!isEmpty(props.overViewList) && <TouchableOpacity
-          onPress={() => {
-            props.headlineClick && props.headlineClick()
-          }}
+            onPress={() => {
+              props.headlineClick && props.headlineClick()
+            }}
         >
-          <Image
-            source={res.energy_consumption_chart}
-            style={{ width: cx(16), height: cx(16), marginLeft: cx(8) }}
-          />
+            <Image
+                source={res.energy_consumption_chart}
+                style={{ width: cx(16), height: cx(16), marginLeft: cx(8) }}
+            />
         </TouchableOpacity>}
       </View>
       <Spacer />
@@ -45,12 +71,12 @@ const OverView = (props: OverViewProps) => {
                 props.overviewItemClick && props.overviewItemClick(item)
               }}
             >
-              <View style={{ backgroundColor: '#fff', alignItems: 'center', justifyContent: 'space-between', flexDirection: 'row', }}>
+              <View style={{ backgroundColor: props.theme.card.background, alignItems: 'center', justifyContent: 'space-between', flexDirection: 'row', }}>
                 <Text style={styles.overviewItemText}>{item.key}</Text>
                 <View style={{ flexDirection: 'row', justifyContent: 'center', alignItems: 'center' }}>
                   <View style={{ flexDirection: 'row' }}>
-                    <Text style={[styles.overviewItemText, { color: '#999' }]}>{item.value}</Text>
-                    <Text style={[styles.overviewItemText, { color: '#999' }]}> kWh</Text>
+                    <Text style={[styles.overviewItemText, { color: props.theme.global.secondFontColor }]}>{item.value}</Text>
+                    <Text style={[styles.overviewItemText, { color: props.theme.global.secondFontColor }]}> kWh</Text>
                   </View>
                   <Image
                     source={res.energy_consumption_right}
@@ -89,28 +115,4 @@ const OverView = (props: OverViewProps) => {
   )
 }
 
-const styles = StyleSheet.create({
-  listEmptyContainer: {
-    alignItems: 'center'
-  },
-  listEmptyImage: {
-    width: cx(200),
-    height: cx(200),
-  },
-  listEmptyTextIcon: {
-    width: cx(16),
-    height: cx(16),
-    tintColor: '#000',
-  },
-  listEmptyText: {
-    color: '#000',
-    fontSize: cx(12),
-    fontFamily: 'helvetica_neue_lt_std_roman',
-  },
-  overviewItemText: {
-    color: '#000',
-    fontSize: cx(14)
-  },
-})
-
-export default OverView
+export default withTheme(OverView)

package/src/newModules/mood/AddMoodPage.tsx

@@ -14,16 +14,17 @@ import {
   MoodJumpGradientMode,
 } from './Interface';
 import { Result } from '@ledvance/base/src/models/modules/Result';
-import { RouterKey } from 'navigation/Router';
-import { difference, head, map, range } from 'lodash';
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import { difference, head, range } from 'lodash';
 import { RecommendMood, getRecommendMixMoods, getRecommendMoods } from './MoodInfo';
 
 const cx = Utils.RatioUtils.convertX;
 
 export interface AddMoodPageParams {
   isStatic: boolean;
-  moods: MoodUIInfo[];
+  moodIds: number[];
   moduleParams: MoodPageParams;
+  nameRepeat: (mood: MoodUIInfo) => boolean
   modDeleteMood: (mode: 'add' | 'edit' | 'del', currentMood: MoodUIInfo) => Promise<Result<any>>;
 }
 
@@ -56,24 +57,21 @@ const AddMoodPage = () => {
 
   const onMoodItemClick = useCallback(
     (moodItem: RecommendMood) => {
-      const useIds = map(routeParams.moods, 'id');
       const idRange = range(0, 256);
-      const id: number = head(difference(idRange, useIds)) || -1;
-      console.log(id, '< --- id ---- >')
+      const mainId: number = head(difference(idRange, routeParams.moodIds)) || 0;
+      const secondaryId: number = moduleParams.isCeilingLight ? head(difference(idRange, [...routeParams.moodIds, mainId])) || 0 : 0
       const url = routeParams.isStatic
-        ? RouterKey.ui_biz_static_mood_edit
+        ? ui_biz_routerKey.ui_biz_static_mood_edit
         : !!(moduleParams.isCeilingLight || moduleParams.isMixLight)
-        ? RouterKey.ui_biz_dynamic_mix_mood_edit
-        : RouterKey.ui_biz_dynamic_mood_edit;
+          ? ui_biz_routerKey.ui_biz_dynamic_mix_mood_edit
+          : ui_biz_routerKey.ui_biz_dynamic_mood_edit;
       const currentMood = moodItem.mainLamp
-        ? { ...moodItem, id }
-        : newMood(id, moduleParams.isSupportColor, routeParams.isStatic, moduleParams);
+        ? { ...moodItem, id: mainId, mainLamp: { ...moodItem.mainLamp, id: mainId }, secondaryLamp: { ...moodItem.secondaryLamp, id: secondaryId } }
+        : newMood(mainId, secondaryId, moduleParams.isSupportColor, routeParams.isStatic, moduleParams);
       navigation.navigate(url, {
+        ...routeParams,
         mode: 'add',
         currentMood,
-        moods: routeParams.moods,
-        moduleParams,
-        modDeleteMood: routeParams.modDeleteMood,
       });
     },
     [routeParams]
@@ -105,6 +103,7 @@ const AddMoodPage = () => {
                 title={item.name}
                 isMix={isMix}
                 mood={getFormateItem(item)}
+                deviceTypeOption={moduleParams}
                 onPress={() => {
                   onMoodItemClick(item);
                 }}
@@ -136,8 +135,20 @@ const styles = StyleSheet.create({
 
 export default AddMoodPage;
 
+const defStripConfig = {
+  version: 0,
+  expand: 0,
+  reserved1: 0,
+  reserved2: 0,
+  segmented: 0,
+  loop: 0,
+  excessive: 0,
+  direction: 0,
+}
+
 function newMood(
-  id: number,
+  mainId: number,
+  secondaryId: number,
   isColorMode: boolean,
   isStatic: boolean,
   moduleParams: MoodPageParams
@@ -145,8 +156,8 @@ function newMood(
   const jump = moduleParams.isStringLight
     ? MoodJumpGradientMode.StringJump
     : moduleParams.isStripLight
-    ? MoodJumpGradientMode.StripJump
-    : MoodJumpGradientMode.SourceJump;
+      ? MoodJumpGradientMode.StripJump
+      : MoodJumpGradientMode.SourceJump;
   const node = {
     brightness: 100,
     colorTemp: 100,
@@ -159,20 +170,25 @@ function newMood(
     version: 0,
     name: '',
     image: '',
-    id,
+    id: mainId,
     mainLamp: {
+      id: mainId,
       speed: 75,
       enable: true,
       fanEnable: true,
       fanSpeed: 1,
+      ...defStripConfig,
       mode: isStatic ? MoodNodeTransitionMode.Static : jump,
       nodes: isStatic ? [node] : [node, { ...node }],
     },
     secondaryLamp: {
-      enable: false,
-      mode: 0,
+      id: secondaryId,
+      enable: true,
+      mode: MoodJumpGradientMode.StripJump,
       speed: 75,
-      nodes: [],
+      ...defStripConfig,
+      version: 1,
+      nodes: isStatic ? [] : [{ ...node, isColorNode: true }, { ...node, isColorNode: true }],
     },
   };
 }

package/src/newModules/mood/DynamicMoodEditorPage.tsx

@@ -135,11 +135,14 @@ const DynamicMoodEditorPage = () => {
     return !!find(params.moods, m => m.id !== state.mood.id && m.name === state.mood.name);
   }, [state.mood.name]);
 
+  const showBackDialog = (): boolean => {
+    return !isEqual(state.mood, routeParams.currentMood);
+  }
 
   return (
     <Page
       backText={Strings.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={showBackDialog()}
       backDialogTitle={Strings.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
@@ -152,8 +155,10 @@ const DynamicMoodEditorPage = () => {
       )}
       headlineText={state.headline}
       rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
-      rightButtonDisabled={getButtonStatus()}
       rightButtonIconClick={async () => {
+        if (getButtonStatus()) {
+          return
+        }
         if (state.loading) return;
         state.loading = true;
         const res = await params.modDeleteMood(params.mode, cloneDeep(state.mood));

package/src/newModules/mood/MixDynamicMoodEditor.tsx

@@ -132,10 +132,14 @@ const MixDynamicMoodEditorPage = () => {
     return !!find(params.moods, m => m.id !== state.mood.id && m.name === state.mood.name);
   }, [state.mood.name]);
 
+  const showBackDialog = (): boolean => {
+    return !isEqual(state.mood, routeParams.currentMood);
+  }
+
   return (
     <Page
       backText={Strings.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={showBackDialog()}
       backDialogTitle={Strings.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
@@ -148,8 +152,10 @@ const MixDynamicMoodEditorPage = () => {
       )}
       headlineText={state.headline}
       rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
-      rightButtonDisabled={getButtonStatus()}
       rightButtonIconClick={async () => {
+        if (getButtonStatus()) {
+          return
+        }
         if (state.loading) return;
         state.loading = true;
         const newMood = cloneDeep(state.mood)

package/src/newModules/mood/StaticMoodEditorPage.tsx

@@ -73,6 +73,9 @@ const StaticMoodEditorPage = () => {
   }, []);
 
   const onRightClick = async () => {
+    if (getButtonStatus()) {
+      return
+    }
     if (state.loading) return;
     state.loading = true;
     const newMood: MoodUIInfo = {
@@ -120,10 +123,15 @@ const StaticMoodEditorPage = () => {
     console.log(params.currentMood, '< --- currentMood --- >')
   }, [JSON.stringify(state.mood)])
 
+
+  const showBackDialog = (): boolean => {
+    return !isEqual(state.mood, routeParams.currentMood);
+  }
+
   return (
     <Page
       backText={I18n.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={showBackDialog()}
       backDialogTitle={I18n.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
@@ -136,7 +144,6 @@ const StaticMoodEditorPage = () => {
       )}
       headlineText={state.headline}
       rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
-      rightButtonDisabled={getButtonStatus()}
       rightButtonIconClick={onRightClick}
       loading={state.loading}
     >

package/src/newModules/timeSchedule/Interface.ts

@@ -43,6 +43,7 @@ interface judgmentSupport {
 }
 
 export interface ManualSettingProps extends judgmentSupport {
+  theme?: any
   applyForList: ApplyForItem[];
   dps: Record<string, any>;
   manualData: ComponentConfig;