@ledvance/ui-biz-bundle 1.1.46 → 1.1.49

package/package.json

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

package/src/modules/flags/FlagPage.tsx

@@ -162,9 +162,17 @@ const FlagPage = () => {
     if (res.success) {
       state.flags = cloneDeep(newScene)
       setFlags(cloneDeep(newScene))
-      if(mode === 'del' && currentMood.id !== flagId){
-        return {
-          success: true
+      if(mode === 'del'){
+        const isDrawTool = !!(params.isCeilingLight || params.isStripLight)
+        if(!isDrawTool && (dps[params.workModeCode] !== WORK_MODE.SCENE || currentMood.id !== flagId)){
+          return {
+            success: true
+          }
+        }
+        if(isDrawTool && !flagMode.flagMode){
+          return {
+            success: true
+          }
         }
       }
       if(mood){
@@ -225,7 +233,7 @@ const FlagPage = () => {
           enable={flagMode?.flagMode && dps[params.workModeCode] === (params.isCeilingLight ? WORK_MODE.WHITE : params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === item.id}
           title={item.name}
           icon={item.icon}
-          colors={(params.isStripLight || params.isCeilingLight) ? item.colors.map(item => hsv2Hex(item.h, item.s, item.v)).reverse() : item.colors.map(item => hsv2Hex(item.h, item.s, item.v))}
+          colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v)).reverse()}
           onSwitch={async (enable) => {
             if (enable) {
               await setFlag(item)

package/src/modules/mood/FantasyMoodEditPage.tsx

@@ -133,6 +133,27 @@ const FantasyMoodEditPage = () => {
     routeParams.onSave()
   }, [params.moods])
 
+  const onPreview = async () => {
+    const maxModeObject = maxBy(params.moods, 'id');
+    const currentMood = {
+      ...state.mood,
+      nodes: state.mood.nodes.map(node => {
+        if (node.isColorNode) {
+          node.brightness = 0;
+          node.colorTemp = 0;
+        } else {
+          node.h = 0
+          node.s = 0
+          node.v = 0
+        }
+        return node
+      }),
+      id: params.mode === 'add' ? maxModeObject && maxModeObject.id > 200 ? maxModeObject.id + 1 : 201 : state.mood.id
+    }
+
+    await setFantasyScene(currentMood)
+  }
+
   const createSelectModeData = useCallback(() => {
     return Object.values(state.sceneMode).map(scene => {
       return {
@@ -154,7 +175,7 @@ const FantasyMoodEditPage = () => {
   }, [state.mood.expand])
 
   const getSelectOther = useCallback((otherData) =>{
-    const currentOther = otherData.find(other => other.value === state.mood.expand) 
+    const currentOther = otherData.find(other => other.value === state.mood.expand)
     return currentOther.label
   }, [state.mood.expand])
 
@@ -212,10 +233,11 @@ const FantasyMoodEditPage = () => {
             errorText={I18n.getLang(nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')} />
           <Card style={styles.adjustCard}>
             <Spacer height={cx(16)} />
-            <View style={styles.lightLine}>
+            <View style={styles.lightPreviewLine}>
               <Text style={styles.light}>
                 {I18n.getLang('light_sources_tile_tw_lighting_headline')}
               </Text>
+              <TextButton text={I18n.getLang('mood_preview')} onPress={onPreview} />
             </View>
             <Spacer height={cx(18)} />
             <TextFieldStyleButton
@@ -256,7 +278,7 @@ const FantasyMoodEditPage = () => {
                 ]}
                 onChange={(v) => state.mood.direction = Number(v)}
               />
-              <Spacer /> 
+              <Spacer />
             </View>}
             {state.sceneMode[state.mood.mode]?.paragraph && <View style={styles.transitionMode}>
               <Segmented
@@ -478,8 +500,14 @@ const styles = StyleSheet.create({
     marginHorizontal: cx(24),
   },
   lightLine: {
+    flexDirection: 'row',
+    marginHorizontal: cx(16)
+  },
+  lightPreviewLine: {
     flexDirection: 'row',
     marginHorizontal: cx(16),
+    justifyContent: 'space-between',
+    alignItems: 'center'
   },
   light: {
     color: '#000',
@@ -553,4 +581,4 @@ const styles = StyleSheet.create({
     fontFamily: 'helvetica_neue_lt_std_bd',
   },
 })
-export default FantasyMoodEditPage
+export default FantasyMoodEditPage

package/src/modules/scene/SceneInfo.ts

@@ -93,7 +93,7 @@ export interface StripLightSceneMode {
 }
 
 export const CeilingLightSceneMode: StripLightSceneMode = {
-  '1': { title: I18n.getLang('strip_lights_modes_flash_text'), mode: 1 }, 
+  '1': { title: I18n.getLang('strip_lights_modes_flash_text'), mode: 1 },
   '2': { title: I18n.getLang('strip_lights_modes_breath_text'), mode: 2 },
 }
 
@@ -115,10 +115,11 @@ export const stripLightSceneMode: StripLightSceneMode = {
   '4': { title: I18n.getLang('string_lights_modes_blink_text'), mode: 4, paragraph: true }, // 闪烁
   '10': { title: I18n.getLang('strip_lights_modes_flow_text'), mode: 10, turnOn: true }, // 流水
   '11': { title: I18n.getLang('strip_lights_modes_rainbow_text'), mode: 11, turnOn: true }, // 彩虹
-  '5': { title: I18n.getLang('strip_lights_modes_meteor_text'), mode: 5, turnOn: true, other: [
-    { label: I18n.getLang('strip_lights_modes_meteor_text'), value: 0 }, 
-    { label: I18n.getLang('add_new_dynamic_mood_strip_lights_selectionfield2_value_text'), value: 1 }, 
-    { label: I18n.getLang('strip_lights_modes_magic_meteor'), value: 2 }] 
+  '5': {
+    title: I18n.getLang('strip_lights_modes_meteor_text'), mode: 5, turnOn: true, other: [
+      { label: I18n.getLang('strip_lights_modes_meteor_text'), value: 0 },
+      { label: I18n.getLang('add_new_dynamic_mood_strip_lights_selectionfield2_value_text'), value: 1 },
+      { label: I18n.getLang('strip_lights_modes_magic_meteor'), value: 2 }]
   }, // 流星
   '6': { title: I18n.getLang('strip_lights_modes_pileup_text'), mode: 6, turnOn: true, paragraph: true }, // 堆积
   '7': { title: I18n.getLang('strip_lights_modes_fall_text'), mode: 7, turnOn: true, paragraph: true }, // 飘落
@@ -128,9 +129,10 @@ export const stripLightSceneMode: StripLightSceneMode = {
   '13': { title: I18n.getLang('strip_lights_modes_rebound_text'), mode: 13, other: [{ label: I18n.getLang('strip_lights_modes_rebound_text'), value: 0 }, { label: I18n.getLang('strip_lights_modes_magic_rebound_text'), value: 1 }] }, // 反弹
   '14': { title: I18n.getLang('strip_lights_modes_shuttle_text'), mode: 14, }, // 穿梭
   '15': { title: I18n.getLang('strip_lights_modes_random_text'), mode: 15 }, // 乱闪
-  '16': { title: I18n.getLang('strip_lights_modes_switch_text'), mode: 16, other: [
-    { label: I18n.getLang('add_new_dynamic_mood_strip_lights_switch_tab_text5'), value: 0 }, 
-    { label: I18n.getLang('add_new_dynamic_mood_strip_lights_switch_tab_text6'), value: 1 }] 
+  '16': {
+    title: I18n.getLang('strip_lights_modes_switch_text'), mode: 16, other: [
+      { label: I18n.getLang('add_new_dynamic_mood_strip_lights_switch_tab_text5'), value: 0 },
+      { label: I18n.getLang('add_new_dynamic_mood_strip_lights_switch_tab_text6'), value: 1 }]
   } // 开合
 }
 
@@ -321,13 +323,6 @@ function getOnlyRGBDefSceneList(): RemoteSceneInfo[] {
       t: 0,
       e: false,
     },
-    {
-      n: I18n.getLang('mesh_device_detail_lighting_read'),
-      i: '010e0d000084000003e800000000',
-      s: '',
-      t: 0,
-      e: false,
-    },
     {
       n: I18n.getLang('mesh_device_detail_lighting_work'),
       i: '020e0d00001403e803e800000000',
@@ -349,13 +344,6 @@ function getOnlyRGBDefSceneList(): RemoteSceneInfo[] {
       t: 0,
       e: false,
     },
-    {
-      n: I18n.getLang('mesh_device_detail_lighting_white_mode'),
-      i: '0646460100000000000003e8000046460100000000000003e8019046460100000000000003e803e8',
-      s: '',
-      t: 0,
-      e: false,
-    },
     ...defColorSceneList
   ]
 }

package/src/modules/timeSchedule/MoodSetting.tsx

@@ -50,7 +50,7 @@ const MoodSetting = (props: MoodSettingProps) => {
         getRemoteFantasyScene(fantasyFeatureId, devId, { isStringLight, isStripLight }).then(res => {
           if (res.success && res.data) {
             state.scenes = res.data
-            setMoods(res.data)
+            setMoods(cloneDeep(res.data))
             if (isEmpty(actionScene)) state.currentScene = res.data[0]
             setSendDps(state.currentScene, 'actionScene')
           }
@@ -225,4 +225,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default memo(MoodSetting)
+export default memo(MoodSetting)