@ledvance/ui-biz-bundle 1.0.39 → 1.0.41

package/package.json

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

package/src/modules/biorhythm/BiorhythmEditPage.tsx

@@ -28,6 +28,7 @@ export interface BiorhythmEditPageParams {
   isMixRGBWLamp: boolean
   isSupportTemperature: boolean
   isSupportBrightness: boolean
+  showDeleteBtn?: boolean
 }
 
 const BiorhythmEditPage = () => {
@@ -43,6 +44,7 @@ const BiorhythmEditPage = () => {
     isMixRGBWLamp,
     isSupportTemperature,
     isSupportBrightness,
+    showDeleteBtn
   } = route.params as BiorhythmEditPageParams
   const [hour, minute] = planData.startTime.split(':')
   const state = useReactive({
@@ -269,7 +271,7 @@ const BiorhythmEditPage = () => {
           </View>
           <View style={{height: cx(20)}}/>
         </View>
-        {!isAdd &&
+        {!isAdd && showDeleteBtn &&
             <View
                 style={{
                   height: cx(50),

package/src/modules/biorhythm/BiorhythmPage.tsx

@@ -230,6 +230,10 @@ const BiorhythmPage = () => {
     return enable
   }
 
+  const showDeleteBtn = useMemo(() => {
+    return state.planList?.length > 1
+  }, [state.planList?.length])
+
   const {run} = useDebounceFn(requestSetBiorhythm, {wait: 500})
 
   useUpdateEffect(() => {
@@ -556,6 +560,7 @@ const BiorhythmPage = () => {
                             isMixRGBWLamp: params.isMixRGBWLamp,
                             isSupportTemperature: params.isSupportTemperature,
                             isSupportBrightness: params.isSupportBrightness,
+                            showDeleteBtn
                           }
                           navigation.navigate(ui_biz_routerKey.bi_biz_biological_edit, editPageParams)
                         }}>
@@ -607,6 +612,7 @@ const BiorhythmPage = () => {
                         isMixRGBWLamp: params.isMixRGBWLamp,
                         isSupportTemperature: params.isSupportTemperature,
                         isSupportBrightness: params.isSupportBrightness,
+                        showDeleteBtn
                       }
                       navigation.navigate(ui_biz_routerKey.bi_biz_biological_edit, editPageParams)
                     }}
@@ -770,3 +776,7 @@ const BiorhythmPage = () => {
 }
 
 export default BiorhythmPage
+function useMemo(arg0: () => boolean, arg1: any[]) {
+  throw new Error('Function not implemented.')
+}
+

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -1,271 +1,541 @@
-import React, {useCallback, useEffect} from 'react'
 import Page from '@ledvance/base/src/components/Page'
-import {Utils} from 'tuya-panel-kit'
-import {ScenePageUIState, SceneUIState} from '../scene/SceneInfo'
-import {getRemoteSceneList, useScene} from '../scene/SceneAction'
-import {SCENE, useWorkMode} from '../../hooks/DeviceDpStateHooks'
-import {useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
-import {useReactive, useUpdateEffect} from 'ahooks'
 import Strings from '@ledvance/base/src/i18n'
+import {StaticMoodEditorPageParams, StaticMoodEditorPageState} from './StaticMoodEditorPage'
+import {useNavigation, useRoute} from '@react-navigation/native'
+import {StackNavigationProp} from '@react-navigation/stack'
+import React, {useCallback, useEffect, useMemo} from 'react'
+import {useReactive} from 'ahooks'
+import {COLOUR, useWorkMode, WHITE} from 'hooks/DeviceDpStateHooks'
+import {hsv2Hex, mapFloatToRange} from '@ledvance/base/src/utils'
+import {cctToColor} from '@ledvance/base/src/utils/cctUtils'
 import res from '@ledvance/base/src/res'
-import {FlatList, StyleSheet, View} from 'react-native'
-import Tag from '@ledvance/base/src/components/Tag'
+import {cloneDeep, find, isEqual} from 'lodash'
+import {FlatList, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
+import TextField from '@ledvance/base/src/components/TextField'
+import Card from '@ledvance/base/src/components/Card'
 import Spacer from '@ledvance/base/src/components/Spacer'
-import InfoText from '@ledvance/base/src/components/InfoText'
-import CustomListDialog from '@ledvance/base/src/components/CustomListDialog'
-import MoodItem from './MoodItem'
-import {toAddMoodPage, toDynamicMoodEditorPage, toStaticMoodEditorPage} from '../../navigation/tools'
-import {useNavigation, useRoute} from '@react-navigation/core'
-
+import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
+import {Utils} from 'tuya-panel-kit'
+import LdvSlider from '@ledvance/base/src/components/ldvSlider'
+import {saveScene, useScene} from '../scene/SceneAction'
+import {useDeviceId, useFanMaxSpeed} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import TextButton from '@ledvance/base/src/components/TextButton'
+import {SceneNodeInfo, SceneNodeTransitionMode} from '../scene/SceneInfo'
+import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
+import {SelectPageData, SelectPageParams} from '../select/SelectPage'
+import {toSelectPage} from '../../navigation/tools'
+import FanAdjustView from '@ledvance/base/src/components/FanAdjustView'
+import {showDeleteMoodDialog} from './tools'
+import {ui_biz_routerKey} from '../../navigation/Routers'
 const cx = Utils.RatioUtils.convertX
-
-interface MoodPageUIState extends ScenePageUIState {
-  staticTagChecked: boolean
-  dynamicTagChecked: boolean
-  showAddMoodPopover: boolean
-  originScene: SceneUIState[]
-  filteredMoods: SceneUIState[]
-  loading: boolean
+interface DynamicMoodEditorPageState extends StaticMoodEditorPageState {
+  paintBucketSelected: boolean
 }
-
-export interface MoodPageProps {
-  switchLedDpCode: string
-  sceneDpCode: string
-  workModeDpCode: string
-  isRGBWLamp?: boolean
-  isRGBLamp?: boolean
-  isOnlyRGBLamp?: boolean
-  isFanLamp?: boolean
-  isTWLamp?: boolean
-  isDIMLamp?: boolean
-  isSupportColor: boolean
-  isSupportTemperature: boolean
-  isSupportBrightness: boolean
-}
-
-const MAX_MOOD_COUNT = 8
-
-const MoodPage = () => {
-  const routeParams = useRoute().params as MoodPageProps
-  const params: MoodPageProps = {
-    ...routeParams,
-    isRGBWLamp: routeParams.isRGBWLamp || false,
-    isRGBLamp: routeParams.isRGBLamp || false,
-    isOnlyRGBLamp: routeParams.isOnlyRGBLamp || false,
-    isFanLamp: routeParams.isFanLamp || false,
-    isTWLamp: routeParams.isTWLamp || false,
-    isDIMLamp: routeParams.isDIMLamp || false,
-  }
-  const [sceneId, setScene] = useScene(params.sceneDpCode)
-  const [workMode] = useWorkMode(params.workModeDpCode)
-  const deviceInfo = useDeviceInfo()
-  const navigation = useNavigation()
-
-  const state = useReactive<MoodPageUIState>({
-    currentScene: undefined,
-    staticTagChecked: true,
-    dynamicTagChecked: true,
-    showAddMoodPopover: false,
-    scenes: [],
-    flag: Symbol(),
-    originScene: [],
-    filteredMoods: [],
-    loading: false,
+const DynamicMoodEditorPage = () => {
+  const navigation = useNavigation<StackNavigationProp<any>>()
+  const routeParams = useRoute().params as StaticMoodEditorPageParams
+  const params = cloneDeep(routeParams)
+  const moduleParams = params.moduleParams
+  const deviceId = useDeviceId()
+  const [moodId, setScene] = useScene(moduleParams.sceneDpCode)
+  const [, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
+  const state = useReactive<DynamicMoodEditorPageState>({
+    headline: '',
+    mood: params.currentMood,
+    currentNode: params.currentMood.nodes[params.currentMood.nodes.length - 1],
+    paintBucketSelected: false,
   })
-
-  const getSceneList = useCallback(async (currentSceneId: number) => {
-    setTimeout(async () => {
-      const res = await getRemoteSceneList(
-        deviceInfo.devId,
-        params.isRGBWLamp,
-        params.isRGBLamp,
-        params.isOnlyRGBLamp,
-        params.isFanLamp,
-        params.isTWLamp,
-        params.isDIMLamp,
-      )
-      if (res.success) {
-        state.scenes = res.data || []
-        state.currentScene = state.scenes.find(scene => scene.id === currentSceneId)
-      }
-    }, 500)
+  useEffect(() => {
+    state.headline = Strings.getLang(params.mode ? 'add_new_dynamic_mood_headline_text' : 'edit_static_mood_headline_text')
+  }, [params.mode])
+  const getColorBlockColor = useCallback(() => {
+    const s = Math.round(mapFloatToRange(state.currentNode.s / 100, 30, 100))
+    if (moduleParams.isOnlyRGBLamp) {
+      return hsv2Hex(state.currentNode.h, s, 100)
+    }
+    if (moduleParams.isTWLamp) {
+      return cctToColor(state.currentNode.colorTemp.toFixed())
+    }
+    if (moduleParams.isDIMLamp) {
+      return '#fff'
+    }
+    if (state.currentNode.isColorNode) {
+      return hsv2Hex(state.currentNode.h, s, 100)
+    }
+    if (moduleParams.isSupportTemperature) {
+      return cctToColor(state.currentNode.colorTemp.toFixed())
+    }
+  }, [state.currentNode, state.currentNode.colorTemp])
+  const getNodeColor = useCallback((node: SceneNodeInfo) => {
+    if (node.isColorNode) {
+      const s = Math.round(mapFloatToRange(node.s / 100, 30, 100))
+      return hsv2Hex(node.h, s, 100)
+    }
+    return cctToColor(node.colorTemp.toFixed())
   }, [])
-
-  const onAddMoodDialogItemClick = useCallback((isStatic: boolean, _: number) => {
-    if (!!state.scenes) {
-      toAddMoodPage(
-        navigation,
-        {
-          isStatic: isStatic,
-          moods: state.scenes,
-          moduleParams: params,
-          onSave: () => {
-            state.flag = Symbol()
-          },
+  const onPost = useCallback(async (isDelete: boolean) => {
+    const currentMood = {
+      id: params.currentMood.id,
+      name: state.mood.name,
+      image: state.mood.image,
+      fanEnable: state.mood.fanEnable,
+      fanSpeed: state.mood.fanSpeed,
+      nodes: state.mood.nodes,
+    }
+    const list = params.mode === 'add' ? [...params.moods, currentMood] :
+      isDelete ? params.moods.filter(mood => mood.id !== currentMood.id) :
+        params.moods.map(mood => {
+          return mood.id === currentMood.id ? currentMood : mood
         })
+    const saveRes = await saveScene(
+      deviceId,
+      currentMood,
+      state.currentNode.transitionMode,
+      state.currentNode.transitionTime,
+      list,
+      moduleParams.isFanLamp!!,
+    )
+    if (saveRes.success) {
+      if (list.length > 0) {
+        if (isDelete && currentMood.id === moodId) {
+          const setSceneRes = await setScene(
+            deviceId,
+            list[0],
+            moduleParams.sceneDpCode,
+            moduleParams.workModeDpCode,
+            moduleParams.switchLedDpCode,
+            !!moduleParams.isFanLamp
+          )
+          console.log('设置修改后的场景结果', setSceneRes)
+        } else if (!isDelete) {
+          const setSceneRes = await setScene(
+            deviceId,
+            currentMood,
+            moduleParams.sceneDpCode,
+            moduleParams.workModeDpCode,
+            moduleParams.switchLedDpCode,
+            !!moduleParams.isFanLamp
+          )
+          console.log('设置修改后的场景结果', setSceneRes)
+        }
+      } else {
+        await setWorkMode(moduleParams.isOnlyRGBLamp ? COLOUR : WHITE)
+        console.log('Mood被清空，将work_mode设置成white')
+      }
     }
-    state.showAddMoodPopover = false
-  }, [state.scenes])
-
-  useEffect(() => {
-    state.filteredMoods = state.scenes.filter(item => {
-      return (state.staticTagChecked && state.dynamicTagChecked) ||
-        (!state.staticTagChecked && !state.dynamicTagChecked) ||
-        (state.staticTagChecked && item.nodes.length < 2) ||
-        (state.dynamicTagChecked && item.nodes.length > 1)
-    })
-  }, [state.staticTagChecked, state.dynamicTagChecked, state.scenes])
-
-  useUpdateEffect(() => {
-    state.currentScene = state.scenes.find(scene => scene.id === sceneId)
-  }, [sceneId])
-
-  useEffect(() => {
-    getSceneList(sceneId).then()
-  }, [state.flag, sceneId])
-
+    navigation.navigate(ui_biz_routerKey.ui_biz_mood)
+    routeParams.onSave()
+  }, [])
+  const getButtonStatus = () => {
+    return (params.mode === 'edit' && isEqual(state.mood, routeParams.currentMood)) ||
+      !(!!state.mood.name) ||
+      nameRepeat ||
+      state.mood.name.length > 32 ||
+      state.mood.nodes.length < 2
+  }
+  const nameRepeat = useMemo(() => {
+    return !!find(params.moods, m => (m.id !== state.mood.id && m.name === state.mood.name))
+  }, [state.mood.name])
   return (
-    <>
-      <Page
-        backText={deviceInfo.name}
-        headlineText={Strings.getLang('mood_overview_headline_text')}
-        headlineIcon={state.scenes.length < MAX_MOOD_COUNT ? res.add : undefined}
-        onHeadlineIconClick={() => {
-          state.showAddMoodPopover = !state.showAddMoodPopover
-        }}
-        loading={state.loading}>
-        <View style={styles.tagLine}>
-          <Tag
-            checked={state.staticTagChecked}
-            text={Strings.getLang('mood_overview_filter_name_text1')}
-            onCheckedChange={checked => {
-              state.staticTagChecked = checked
-            }}/>
-          <Spacer width={cx(8)} height={0}/>
-          <Tag
-            checked={state.dynamicTagChecked}
-            text={Strings.getLang('mood_overview_filter_name_text2')}
-            onCheckedChange={checked => {
-              state.dynamicTagChecked = checked
-            }}/>
-        </View>
-        <Spacer height={cx(10)}/>
-        {
-          state.scenes.length >= MAX_MOOD_COUNT &&
-            <View style={styles.infoLine}>
-                <Spacer height={cx(10)}/>
-                <InfoText
-                    icon={res.ic_warning_amber}
-                    text={Strings.getLang('mood_overview_warning_max_number_text')}
-                    contentColor={'#ff9500'}/>
-                <Spacer height={cx(6)}/>
+    <Page
+      backText={Strings.getLang('mesh_device_detail_mode')}
+      showBackDialog={true}
+      backDialogTitle={
+        Strings.getLang(params.mode === 'add' ?
+          'string_light_pp_dialog_sm_add_headline_c' :
+          'manage_user_unsaved_changes_dialog_headline')
+      }
+      backDialogContent={
+        Strings.getLang(params.mode === 'add' ?
+          'strip_light_static_mood_add_step_2_dialog_text' :
+          'strip_light_static_mood_editor_step_2_dialog_text')
+      }
+      headlineText={state.headline}
+      rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
+      rightButtonDisabled={getButtonStatus()}
+      rightButtonIconClick={async () => {
+        await onPost(false)
+      }}>
+      <ScrollView
+        style={{flex: 1}}
+        nestedScrollEnabled={true}>
+        <View style={styles.root}>
+          <TextField
+            style={styles.name}
+            value={state.mood.name}
+            placeholder={Strings.getLang('edit_static_mood_inputfield_topic_text')}
+            onChangeText={text => {
+              state.mood.name = text
+            }}
+            showError={state.mood.name.length > 32 || nameRepeat}
+            tipColor={nameRepeat ? '#f00' : undefined}
+            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            errorText={Strings.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}>
+              <Text style={styles.light}>
+                {Strings.getLang('light_sources_tile_tw_lighting_headline')}
+              </Text>
             </View>
-        }
-        <FlatList
-          data={state.filteredMoods}
-          renderItem={({item}) => {
-            return (
-              <MoodItem
-                enable={workMode === SCENE && state.currentScene?.id === item.id}
-                mood={item}
-                onPress={() => {
-                  if (item.nodes.length > 1) {
-                    toDynamicMoodEditorPage(
-                      navigation,
-                      {
-                        mode: 'edit',
-                        currentMood: item,
-                        moods: state.scenes,
-                        moduleParams: params,
-                        onSave: () => {
-                          state.flag = Symbol()
-                        },
-                      })
-                    return
-                  }
-                  toStaticMoodEditorPage(
-                    navigation,
-                    {
-                      mode: 'edit',
-                      currentMood: item,
-                      moods: state.scenes,
-                      moduleParams: params,
-                      onSave: () => {
-                        state.flag = Symbol()
-                      },
+            <Spacer height={cx(18)}/>
+            <TextFieldStyleButton
+              style={styles.transitionMode}
+              text={getTransitionModeString(state.mood.nodes[0].transitionMode)}
+              placeholder={Strings.getLang('add_new_dynamic_mood_color_changing_mode_headline')}
+              onPress={() => {
+                const paramsSelect: SelectPageParams<SceneNodeTransitionMode> = {
+                  title: Strings.getLang('add_new_dynamic_mood_color_changing_mode_headline'),
+                  data: [
+                    createSelectPageData(state.mood.nodes[0].transitionMode, SceneNodeTransitionMode.Gradient),
+                    createSelectPageData(state.mood.nodes[0].transitionMode, SceneNodeTransitionMode.Jump),
+                  ],
+                  onSelect: selectPageData => {
+                    state.mood.nodes.forEach(node => {
+                      node.transitionMode = selectPageData.value
                     })
+                  },
+                }
+                toSelectPage(navigation, paramsSelect)
+              }}/>
+            <Spacer height={cx(10)}/>
+            <LdvSlider
+              title={Strings.getLang('add_new_dynamic_mood_lights_field_speed_topic_text')}
+              value={state.mood.nodes[0].transitionTime}
+              onValueChange={value => {
+                state.mood.nodes.forEach(node => {
+                  node.transitionTime = value
+                  node.switchingInterval = value
+                })
+              }}
+              onSlidingComplete={value => {
+                state.mood.nodes.forEach(node => {
+                  node.transitionTime = value
+                  node.switchingInterval = value
+                })
+              }}/>
+            <Spacer height={cx(16)}/>
+            <View style={styles.nodesAdjust}>
+              <View style={styles.adjustButtons}>
+                <TouchableOpacity
+                  onPress={() => {
+                    state.paintBucketSelected = true
+                  }}>
+                  <Image
+                    style={[styles.adjustButton, {tintColor: state.paintBucketSelected ? '#f60' : '#666'}]}
+                    source={res.ic_paint_bucket}/>
+                </TouchableOpacity>
+                <TouchableOpacity
+                  onPress={() => {
+                    state.paintBucketSelected = false
+                  }}>
+                  <Image
+                    style={[styles.adjustButton, {tintColor: state.paintBucketSelected ? '#666' : '#f60'}]}
+                    source={res.ic_colorize}/>
+                </TouchableOpacity>
+              </View>
+              <FlatList
+                data={state.mood.nodes}
+                style={styles.nodeList}
+                renderItem={({item, index}) => {
+                  return (
+                    <View style={styles.nodeItem}>
+                      <TouchableOpacity
+                        style={[
+                          styles.nodeBlock,
+                          {
+                            backgroundColor: getNodeColor(item),
+                          },
+                        ]}
+                        onPress={() => {
+                          state.currentNode = item
+                        }}/>
+                      <TouchableOpacity
+                        style={styles.nodeDeleteBtn}
+                        disabled={state.mood.nodes.length < 3}
+                        onPress={() => {
+                          state.mood.nodes.splice(index, 1)
+                          state.currentNode = state.mood.nodes[state.mood.nodes.length - 1]
+                        }}>
+                        <Image
+                          style={[
+                            styles.nodeDeleteIcon,
+                            {
+                              tintColor: state.mood.nodes.length < 3 ? '#ccc' : '#666',
+                            },
+                          ]}
+                          source={res.ic_mood_del}/>
+                      </TouchableOpacity>
+                    </View>
+                  )
                 }}
-                onSwitch={async _ => {
-                  if (workMode === SCENE && state.currentScene?.id === item.id) return
-                  state.loading = true
-                  await setScene(
-                    deviceInfo.devId,
-                    item,
-                    params.sceneDpCode,
-                    params.workModeDpCode,
-                    params.switchLedDpCode,
-                    !!params.isFanLamp
+                keyExtractor={(_, index) => `${index}`}
+                ItemSeparatorComponent={() => <Spacer height={cx(12)}/>}
+                ListFooterComponent={() => {
+                  if (state.mood.nodes.length >= 8) {
+                    return (<></>)
+                  }
+                  return (
+                    <View>
+                      <Spacer height={cx(12)}/>
+                      <TouchableOpacity
+                        style={styles.nodeAddBtn}
+                        onPress={() => {
+                          const node = {
+                            ...state.currentNode,
+                          }
+                          state.mood.nodes.push(node)
+                          state.currentNode = node
+                        }}>
+                        <Image
+                          style={{
+                            width: cx(18),
+                            height: cx(18),
+                            tintColor: '#000',
+                          }}
+                          source={{uri: res.add}}/>
+                      </TouchableOpacity>
+                    </View>
                   )
-                  state.currentScene = item
-                  state.loading = false
                 }}/>
-            )
-          }}
-          ListHeaderComponent={() => (<Spacer height={cx(10)}/>)}
-          ItemSeparatorComponent={() => (<Spacer/>)}
-          ListFooterComponent={() => (
-            <View style={styles.infoLine}>
-              <Spacer/>
-              <InfoText
-                icon={res.ic_info}
-                text={Strings.getLang('mood_overview_information_text')}/>
-              <Spacer height={cx(40)}/>
             </View>
-          )}
-          keyExtractor={item => `${item.id}`}/>
-      </Page>
-      <CustomListDialog
-        show={state.showAddMoodPopover}
-        style={styles.addMoodPopover}
-        itemStyle={styles.popoverItem}
-        onDismiss={() => {
-          state.showAddMoodPopover = false
-        }}
-        data={[
-          {
-            text: Strings.getLang('mood_overview_add_mood_text'),
-            value: true,
-          },
-          {
-            text: Strings.getLang('mood_overview_add_mood_text2'),
-            value: false,
-          },
-        ]}
-        onItemPress={onAddMoodDialogItemClick}/>
-    </>
+            <Spacer/>
+            <View style={styles.lightLine}>
+              <Text style={styles.light}>
+                {Strings.getLang('add_new_dynamic_mood_lights_field_headline2_text')}
+              </Text>
+              <View style={[styles.preview, {backgroundColor: getColorBlockColor()}]}/>
+            </View>
+            <Spacer/>
+            <LampAdjustView
+              isRGBLamp={moduleParams.isRGBLamp!!}
+              isRGBWLamp={moduleParams.isRGBLamp!!}
+              isOnlyRGBLamp={moduleParams.isOnlyRGBLamp!!}
+              isDIMLamp={moduleParams.isDIMLamp!!}
+              isTWLamp={moduleParams.isTWLamp!!}
+              isSupportBrightness={moduleParams.isSupportBrightness}
+              isSupportTemperature={moduleParams.isSupportTemperature}
+              isColorMode={state.currentNode.isColorNode}
+              setIsColorMode={isColorMode => {
+                if (state.paintBucketSelected) {
+                  state.mood.nodes.forEach(node => {
+                    node.isColorNode = isColorMode
+                  })
+                } else {
+                  state.currentNode.isColorNode = isColorMode
+                }
+              }}
+              h={state.currentNode.h}
+              s={state.currentNode.s}
+              v={state.currentNode.v}
+              onHSVChange={(h, s, v) => {
+                if (state.paintBucketSelected) {
+                  state.mood.nodes.forEach(node => {
+                    node.isColorNode = true
+                    node.h = h
+                    node.s = s
+                    node.v = v
+                  })
+                } else {
+                  state.currentNode.h = h
+                  state.currentNode.s = s
+                  state.currentNode.v = v
+                }
+              }}
+              onHSVChangeComplete={(h, s, v) => {
+                if (state.paintBucketSelected) {
+                  state.mood.nodes.forEach(node => {
+                    node.isColorNode = true
+                    node.h = h
+                    node.s = s
+                    node.v = v
+                  })
+                } else {
+                  state.currentNode.h = h
+                  state.currentNode.s = s
+                  state.currentNode.v = v
+                }
+              }}
+              colorTemp={state.currentNode.colorTemp}
+              brightness={state.currentNode.brightness}
+              onCCTChange={cct => {
+                if (state.paintBucketSelected) {
+                  state.mood.nodes.forEach(node => {
+                    node.isColorNode = false
+                    node.colorTemp = cct
+                  })
+                } else {
+                  state.currentNode.colorTemp = cct
+                }
+              }}
+              onCCTChangeComplete={cct => {
+                if (state.paintBucketSelected) {
+                  state.mood.nodes.forEach(node => {
+                    node.isColorNode = false
+                    node.colorTemp = cct
+                  })
+                } else {
+                  state.currentNode.colorTemp = cct
+                }
+              }}
+              onBrightnessChange={brightness => {
+                if (state.paintBucketSelected) {
+                  state.mood.nodes.forEach(node => {
+                    node.isColorNode = false
+                    node.brightness = brightness
+                  })
+                } else {
+                  state.currentNode.brightness = brightness
+                }
+              }}
+              onBrightnessChangeComplete={brightness => {
+                if (state.paintBucketSelected) {
+                  state.mood.nodes.forEach(node => {
+                    node.isColorNode = false
+                    node.brightness = brightness
+                  })
+                } else {
+                  state.currentNode.brightness = brightness
+                }
+              }}/>
+          </Card>
+          <Spacer/>
+          {moduleParams.isFanLamp &&
+              <FanAdjustView
+                  fanEnable={!!state.mood.fanEnable}
+                  fanSpeed={state.mood.fanSpeed || 1}
+                  maxFanSpeed={useFanMaxSpeed()}
+                  onFanSwitch={fanEnable => {
+                    state.mood.fanEnable = fanEnable
+                  }}
+                  onFanSpeedChange={fanSpeed => {
+                    state.mood.fanSpeed = fanSpeed
+                  }}
+                  onFanSpeedChangeComplete={fanSpeed => {
+                    state.mood.fanSpeed = fanSpeed
+                  }}
+                  style={styles.fanAdjustCard}/>}
+          {params.mode === 'edit' &&
+              <View style={{marginTop: cx(20), marginHorizontal: cx(24)}}>
+                  <TextButton
+                      style={styles.deleteBtn}
+                      textStyle={styles.deleteBtnText}
+                      text={Strings.getLang('edit_static_mood_button_delete_text')}
+                      onPress={() => {
+                        showDeleteMoodDialog(async (_, {close}) => {
+                          close()
+                          await onPost(true)
+                        })
+                      }}/>
+              </View>}
+          <Spacer/>
+        </View>
+      </ScrollView>
+    </Page>
   )
 }
-
 const styles = StyleSheet.create({
-  tagLine: {
-    flexDirection: 'row',
+  root: {
+    flex: 1,
+    flexDirection: 'column',
+  },
+  name: {
     marginHorizontal: cx(24),
   },
-  infoLine: {
+  adjustCard: {
+    marginVertical: cx(12),
     marginHorizontal: cx(24),
   },
-  addMoodPopover: {
-    width: cx(171),
-    height: cx(90.5),
-    marginStart: cx(156),
-    marginTop: cx(105),
-    backgroundColor: '#fff',
+  fanAdjustCard: {
+    marginHorizontal: cx(24),
+  },
+  lightLine: {
+    flexDirection: 'row',
+    marginHorizontal: cx(16),
+  },
+  light: {
+    color: '#000',
+    fontSize: cx(18),
+    fontFamily: 'helvetica_neue_lt_std_bd',
+  },
+  transitionMode: {
+    marginHorizontal: cx(16),
+  },
+  preview: {
+    width: cx(20),
+    height: cx(20),
+    marginStart: cx(12),
+    borderRadius: cx(4),
+  },
+  nodesAdjust: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  adjustButtons: {
+    width: cx(44),
+    marginStart: cx(16),
   },
-  popoverItem: {
-    width: cx(171),
-    height: cx(45),
-    alignItems: 'flex-start',
+  adjustButton: {
+    width: cx(44),
+    height: cx(44),
+  },
+  nodeList: {
+    flex: 1,
+    marginHorizontal: cx(16),
+  },
+  nodeItem: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  nodeBlock: {
+    flex: 1,
+    height: cx(40),
+    borderRadius: cx(8),
+  },
+  nodeDeleteBtn: {
+    width: cx(24),
+    height: cx(30),
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  nodeDeleteIcon: {
+    width: cx(16),
+    height: cx(16),
+  },
+  nodeAddBtn: {
+    height: cx(40),
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginEnd: cx(26),
+    borderRadius: cx(8),
+    borderWidth: cx(1),
+    borderStyle: 'dashed',
+    borderColor: '#666',
+    backgroundColor: '#f6f6f6',
+  },
+  deleteBtn: {
+    width: '100%',
+    height: cx(50),
+    backgroundColor: '#666',
+    borderRadius: cx(8),
+  },
+  deleteBtnText: {
+    color: '#fff',
+    fontSize: cx(16),
+    fontFamily: 'helvetica_neue_lt_std_bd',
   },
 })
-
-export default MoodPage
+export default DynamicMoodEditorPage
+export function getTransitionModeString(transitionMode: SceneNodeTransitionMode): string {
+  if (transitionMode === SceneNodeTransitionMode.Jump) {
+    return Strings.getLang('other_lights_modes_jump_text')
+  }
+  return Strings.getLang('other_lights_modes_gradient_text')
+}
+export function createSelectPageData(transitionMode: SceneNodeTransitionMode, mode: SceneNodeTransitionMode): SelectPageData<SceneNodeTransitionMode> {
+  return {
+    text: getTransitionModeString(mode),
+    selected: transitionMode === mode,
+    value: mode,
+  }
+}

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -102,15 +102,27 @@ const StaticMoodEditorPage = () => {
     )
     if (saveRes.success) {
       if (list.length > 0) {
-        const setSceneRes = await setScene(
-          deviceId,
-          currentMood.id === moodId && isDelete ? list[0] : currentMood,
-          moduleParams.sceneDpCode,
-          moduleParams.workModeDpCode,
-          moduleParams.switchLedDpCode,
-          !!moduleParams.isFanLamp
-        )
-        console.log('设置修改后的场景结果', setSceneRes)
+        if (isDelete && currentMood.id === moodId) {
+          const setSceneRes = await setScene(
+            deviceId,
+            list[0],
+            moduleParams.sceneDpCode,
+            moduleParams.workModeDpCode,
+            moduleParams.switchLedDpCode,
+            !!moduleParams.isFanLamp
+          )
+          console.log('设置修改后的场景结果', setSceneRes)
+        } else if (!isDelete) {
+          const setSceneRes = await setScene(
+            deviceId,
+            currentMood,
+            moduleParams.sceneDpCode,
+            moduleParams.workModeDpCode,
+            moduleParams.switchLedDpCode,
+            !!moduleParams.isFanLamp
+          )
+          console.log('设置修改后的场景结果', setSceneRes)
+        }
       } else {
         await setWorkMode(moduleParams.isOnlyRGBLamp ? COLOUR : WHITE)
         console.log('Mood被清空，将work_mode设置成white')

package/src/modules/sleepWakeup/SleepWakeUpActions.ts

@@ -8,163 +8,163 @@ const wakeUpPlanFeatureId = 'WakeUpPlan'
 // 接口失败重试
 let retryNumber = 0
 const putFeatureFn = async (devId, featureId, data) => {
-    let status;
-    await putFeature(devId, featureId, data).then(res => {
-        if (!res?.result && retryNumber < 3) {
-            retryNumber += 1
-            putFeatureFn(devId, featureId, data).then()
-        }
-        if (res?.result) {
-            retryNumber = 0
-            status = res?.result
-        }
-    })
-    return status
+  let status;
+  await putFeature(devId, featureId, data).then(res => {
+    if (!res?.result && retryNumber < 3) {
+      retryNumber += 1
+      putFeatureFn(devId, featureId, data).then()
+    }
+    if (res?.result) {
+      retryNumber = 0
+      status = res?.result
+    }
+  })
+  return status
 }
 
 export const useSleepPlan = (dpCodes: Record<string, string>) => {
-    const deviceId = useDeviceId()
-    const [uiData, setUiData] = useState([] as any)
-    const [sleepPlan, setSleepPlan]:any = useDp(dpCodes.sleep_mode);
-    // 获取云端数据
-    useEffect(() => {
-        getFeature(deviceId, sleepPlanFeatureId).then(res => {
-            if (res?.result) {
-                const data = res?.data
-                let list = data?.map(item => { return { ...item, startTime: (item?.startTime || item?.v) && JSON.parse(item?.startTime || item?.v)?.dp || '' } })
-                // 首次进入同步云端数据 （云端无数据）
-                if (!list) {
-                    list = decodeSleepString(sleepPlan)
-                    setSleepCloudData(list, deviceId).then()
-                    setUiData(list)
-                    return
-                }
-                const dpData = decodeSleepString(sleepPlan)
-                const sleepCloudData = highInTheCloudsSleepString(list)
-                // 更新
-                if (sleepCloudData?.length === dpData?.length) {
-                    const list = dpData?.map((item, index) => {
-                        return { ...item, name: sleepCloudData[index]?.name }
-                    })
-                    setSleepCloudData(list, deviceId).then()
-                    setUiData(list)
-                    return
-                }
-                setUiData(highInTheCloudsSleepString(list))
-            }
-        })
-    }, [sleepPlan])
-
-    const setSleepList = async (sleepPlan: any[]) =>{
-        const sleepData = sleepPlan.map(item => ({
-            name: item.name,
-            startTime: JSON.stringify({ dp: encodeSingleSleepPlan(item) })
-        }))
-        let res
-        const setCloudStatus = await putFeatureFn(deviceId, sleepPlanFeatureId, sleepData)
-        if(setCloudStatus){
-            const hex = encodeSleep(sleepPlan)
-            res = await setSleepPlan(hex)
+  const deviceId = useDeviceId()
+  const [uiData, setUiData] = useState([] as any)
+  const [sleepPlan, setSleepPlan]: any = useDp(dpCodes.sleep_mode);
+  // 获取云端数据
+  useEffect(() => {
+    getFeature(deviceId, sleepPlanFeatureId).then(res => {
+      if (res?.result) {
+        const data = res?.data
+        let list = data?.map(item => { return { ...item, startTime: (item?.startTime || item?.v) && JSON.parse(item?.startTime || item?.v)?.dp || '' } })
+        // 首次进入同步云端数据 （云端无数据）
+        if (!list) {
+          list = decodeSleepString(sleepPlan)
+          setSleepCloudData(list, deviceId).then()
+          setUiData(list)
+          return
         }
-        if (res && res?.result) {
-            /// success
-            return {
-                result: { success: true },
-                // dps: { [dpCodes.wakeup_mode]: hex },
-            }
-        } else {
-            /// failure
-            return {
-                result: { success: false },
-            }
+        const dpData = decodeSleepString(sleepPlan)
+        const sleepCloudData = highInTheCloudsSleepString(list)
+        // 更新
+        if (sleepCloudData?.length === dpData?.length) {
+          const list = dpData?.map((item, index) => {
+            return { ...item, name: sleepCloudData[index]?.name }
+          })
+          setSleepCloudData(list, deviceId).then()
+          setUiData(list)
+          return
         }
+        setUiData(highInTheCloudsSleepString(list))
+      }
+    })
+  }, [sleepPlan])
+
+  const setSleepList = async (sleepPlan: any[]) => {
+    const sleepData = sleepPlan.map(item => ({
+      name: item.name,
+      startTime: JSON.stringify({ dp: encodeSingleSleepPlan(item) })
+    }))
+    let res
+    const setCloudStatus = await putFeatureFn(deviceId, sleepPlanFeatureId, sleepData)
+    if (setCloudStatus) {
+      const hex = encodeSleep(sleepPlan)
+      res = await setSleepPlan(hex)
+    }
+    if (res && res?.result) {
+      /// success
+      return {
+        result: { success: true },
+        // dps: { [dpCodes.wakeup_mode]: hex },
+      }
+    } else {
+      /// failure
+      return {
+        result: { success: false },
+      }
     }
+  }
 
-    return [uiData, setSleepList];
+  return [uiData, setSleepList];
 }
 
 export const useWakeUpPlan = (dpCodes: Record<string, string>) => {
-    const deviceId = useDeviceId()
-    const [uiData, setUiData] = useState([] as any)
-    const [wakeUpPlan, setWakeUpPlan]:any = useDp(dpCodes.wakeup_mode)
-    // 获取云端数据
-    useEffect(() => {
-        getFeature(deviceId, wakeUpPlanFeatureId).then(res => {
-            if (res?.result) {
-                const data = res?.data
-                let list = data?.map(item => { return { ...item, startTime: (item?.startTime || item?.v) && JSON.parse(item?.startTime || item?.v)?.dp || '' } })
-                // 首次进入同步云端数据 （云端无数据）
-                if (!list) {
-                    list = decodeWakeUpString(wakeUpPlan)
-                    setWakeCloudData(list, deviceId).then()
-                    setUiData(list)
-                    return
-                }
-                const dpData = decodeWakeUpString(wakeUpPlan)
-                const wakeCloudData = highInTheCloudsWakeString(list)
-                // 更新
-                if (wakeCloudData?.length === dpData?.length) {
-                    const list = dpData?.map((item, index) => {
-                        return { ...item, name: wakeCloudData[index]?.name }
-                    })
-                    setWakeCloudData(list, deviceId).then()
-                    setUiData(list)
-                    return
-                }
-                setUiData(highInTheCloudsWakeString(list))
-            }
-        })
-    }, [wakeUpPlan])
-
-    const setWakeUpList = async (wakeUpPlan) =>{
-        const wakeUpData = wakeUpPlan.map(item => ({
-            name: item.name,
-            startTime: JSON.stringify({ dp: encodeSingleSleepPlan(item) })
-        }))
-        let res:any
-        const setCloudStatus = await putFeatureFn(deviceId, wakeUpPlanFeatureId, wakeUpData)
-        if(setCloudStatus){
-            const hex = encodeWakeUp(wakeUpPlan)
-            res = await setWakeUpPlan(hex)
+  const deviceId = useDeviceId()
+  const [uiData, setUiData] = useState([] as any)
+  const [wakeUpPlan, setWakeUpPlan]: any = useDp(dpCodes.wakeup_mode)
+  // 获取云端数据
+  useEffect(() => {
+    getFeature(deviceId, wakeUpPlanFeatureId).then(res => {
+      if (res?.result) {
+        const data = res?.data
+        let list = data?.map(item => { return { ...item, startTime: (item?.startTime || item?.v) && JSON.parse(item?.startTime || item?.v)?.dp || '' } })
+        // 首次进入同步云端数据 （云端无数据）
+        if (!list) {
+          list = decodeWakeUpString(wakeUpPlan)
+          setWakeCloudData(list, deviceId).then()
+          setUiData(list)
+          return
         }
-        if (res && res?.result) {
-            /// success
-            return {
-                result: { success: true },
-                // dps: { [dpCodes.wakeup_mode]: hex },
-            }
-        } else {
-            /// failure
-            return {
-                result: { success: false },
-            }
+        const dpData = decodeWakeUpString(wakeUpPlan)
+        const wakeCloudData = highInTheCloudsWakeString(list)
+        // 更新
+        if (wakeCloudData?.length === dpData?.length) {
+          const list = dpData?.map((item, index) => {
+            return { ...item, name: wakeCloudData[index]?.name }
+          })
+          setWakeCloudData(list, deviceId).then()
+          setUiData(list)
+          return
         }
+        setUiData(highInTheCloudsWakeString(list))
+      }
+    })
+  }, [wakeUpPlan])
+
+  const setWakeUpList = async (wakeUpPlan) => {
+    const wakeUpData = wakeUpPlan.map(item => ({
+      name: item.name,
+      startTime: JSON.stringify({ dp: encodeSingleSleepPlan(item) })
+    }))
+    let res: any
+    const setCloudStatus = await putFeatureFn(deviceId, wakeUpPlanFeatureId, wakeUpData)
+    if (setCloudStatus) {
+      const hex = encodeWakeUp(wakeUpPlan)
+      res = await setWakeUpPlan(hex)
+    }
+    if (res && res?.result) {
+      /// success
+      return {
+        result: { success: true },
+        // dps: { [dpCodes.wakeup_mode]: hex },
+      }
+    } else {
+      /// failure
+      return {
+        result: { success: false },
+      }
     }
-    return [uiData, setWakeUpList];
+  }
+  return [uiData, setWakeUpList];
 }
 
 // 设置云端数据 wakeUp
 const setWakeCloudData = async (list, devId) => {
-    const listData: any = []
-    list?.forEach(item => {
-        listData?.push({
-            name: item?.name,
-            startTime: JSON.stringify({ dp: encodeSingleWakeUpPlan(item) })
-        })
+  const listData: any = []
+  list?.forEach(item => {
+    listData?.push({
+      name: item?.name,
+      startTime: JSON.stringify({ dp: encodeSingleWakeUpPlan(item) })
     })
-    const res = await putFeatureFn(devId, wakeUpPlanFeatureId, listData)
-    return res
+  })
+  const res = await putFeatureFn(devId, wakeUpPlanFeatureId, listData)
+  return res
 }
 
 // 设置云端数据 sleep
 const setSleepCloudData = async (list, devId) => {
-    const listData: any = []
-    list.forEach(item => {
-        listData?.push({
-            name: item?.name,
-            startTime: JSON.stringify({ dp: encodeSingleSleepPlan(item) })
-        })
+  const listData: any = []
+  list.forEach(item => {
+    listData?.push({
+      name: item?.name,
+      startTime: JSON.stringify({ dp: encodeSingleSleepPlan(item) })
     })
-    const res = await putFeatureFn(devId, sleepPlanFeatureId, listData)
-    return res
+  })
+  const res = await putFeatureFn(devId, sleepPlanFeatureId, listData)
+  return res
 }

package/src/modules/sleepWakeup/SleepWakeUpDetailPage.tsx

@@ -492,7 +492,10 @@ const SleepWakeUpDetailPage = () => {
                                 </View>
                             }
                         </View>
-                        <Text style={{ fontSize: cx(12), color: '#000000' }}>{I18n.getLang(state.durationStatus ? 'feature_summary_action_txt_12' : 'feature_summary_action_txt_1')}</Text>
+                        <Text style={{ fontSize: cx(12), color: '#000000' }}>{I18n.getLang(
+                            props.isSleep ? 'feature_summary_action_txt_2' :
+                             (state.durationStatus ? 'feature_summary_action_txt_12' : 'feature_summary_action_txt_1')
+                             )}</Text>
                         <View style={styles.filletCorner}>
                             <Text style={styles.rightTitle}>{formateDurationTime().endTime}</Text>
                         </View>

package/src/modules/sleepWakeup/utils.ts

@@ -97,7 +97,6 @@ export function encodeSingleSleepPlan(item) {
 
     const brightnessHex = getBrightnessHex(item.brightness)
     const temperatureHex = getTemperatureHex(item.temperature)
-
     let hex = enableHex + loopHex + fadeHex + timeHex + colorHex + satHex + valueHex + brightnessHex + temperatureHex
 
     return hex