@ledvance/ui-biz-bundle 1.1.4 → 1.1.6

package/package.json

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

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -5,7 +5,7 @@ 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 {COLOUR, SCENE, 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'
@@ -38,7 +38,7 @@ const DynamicMoodEditorPage = () => {
   const moduleParams = params.moduleParams
   const deviceId = useDeviceId()
   const [moodId, setScene] = useScene(moduleParams.sceneDpCode)
-  const [, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
+  const [workMode, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
   const isUVCFan = isUVCFanDevice()
   const role = useRole()
   const state = useReactive<DynamicMoodEditorPageState>({
@@ -101,7 +101,7 @@ const DynamicMoodEditorPage = () => {
     )
     if (saveRes.success) {
       if (list.length > 0) {
-        if (isDelete && currentMood.id === moodId) {
+        if (isDelete && currentMood.id === moodId && workMode === SCENE) {
           const setSceneRes = await setScene(
             deviceId,
             list[0],

package/src/modules/mood/FantasyMoodEditPage.tsx

@@ -4,7 +4,7 @@ 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 { useWorkMode, COLOUR } from 'hooks/DeviceDpStateHooks'
+import { useWorkMode, COLOUR, SCENE } 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'
@@ -16,7 +16,7 @@ import Spacer from '@ledvance/base/src/components/Spacer'
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import { Utils } from 'tuya-panel-kit'
 import LdvSlider from '@ledvance/base/src/components/ldvSlider'
-import { useDeviceId, useRole } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useDeviceId } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import TextButton from '@ledvance/base/src/components/TextButton'
 import { stringLightSceneMode, stripLightSceneMode, StripSceneUIState, StripNodeInfo, StripLightSceneMode } from '../scene/SceneInfo'
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
@@ -49,9 +49,8 @@ const FantasyMoodEditPage = () => {
   const params = cloneDeep(routeParams)
   const moduleParams = params.moduleParams
   const deviceId = useDeviceId()
-  const [, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
+  const [workMode, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
   const [, setFantasyScene] = useFantasyScene(params.moduleParams.sceneDpCode, params.moduleParams.workModeDpCode, params.moduleParams.switchLedDpCode, moduleParams.isStringLight)
-  const role = useRole()
   const state = useReactive<FantasyMoodEditPageState>({
     headline: '',
     mood: params.currentMood,
@@ -107,7 +106,7 @@ const FantasyMoodEditPage = () => {
     const saveRes = await saveFantasyScene(deviceId, params.moduleParams.featureId, list, moduleParams.isStringLight)
     if (saveRes.success) {
       if (list.length > 0) {
-        if (isDelete) {
+        if (isDelete  && workMode === SCENE) {
           await setFantasyScene(list[0])
         } else {
           await setFantasyScene(currentMood)

package/src/modules/mood/MoodPage.tsx

@@ -1,21 +1,21 @@
-import React, {useCallback, useEffect} from 'react'
+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 {isUVCFanDevice, useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
-import {useReactive, useUpdateEffect} from 'ahooks'
+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 { isUVCFanDevice, useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useReactive, useUpdateEffect } from 'ahooks'
 import Strings from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
-import {FlatList, StyleSheet, View} from 'react-native'
+import { FlatList, StyleSheet, View, Platform } from 'react-native'
 import Tag from '@ledvance/base/src/components/Tag'
 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 { toAddMoodPage, toDynamicMoodEditorPage, toStaticMoodEditorPage } from '../../navigation/tools'
+import { useNavigation, useRoute } from '@react-navigation/core'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -129,12 +129,12 @@ const MoodPage = () => {
   }, [state.flag, sceneId])
 
   // 修改之前版本错误mood数据
-  const checkMoodData = useCallback((mood: SceneUIState) =>{
-    mood.nodes.forEach(node =>{
-      if(node.isColorNode){
+  const checkMoodData = useCallback((mood: SceneUIState) => {
+    mood.nodes.forEach(node => {
+      if (node.isColorNode) {
         node.brightness = 0
         node.colorTemp = 0
-      }else{
+      } else {
         node.h = 0
         node.s = 0
         node.v = 0
@@ -159,30 +159,30 @@ const MoodPage = () => {
             text={Strings.getLang('mood_overview_filter_name_text1')}
             onCheckedChange={checked => {
               state.staticTagChecked = checked
-            }}/>
-          <Spacer width={cx(8)} height={0}/>
+            }} />
+          <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)}/>
+        <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)}/>
-            </View>
+          <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)} />
+          </View>
         }
         <FlatList
           data={state.filteredMoods}
-          renderItem={({item}) => {
+          renderItem={({ item }) => {
             return (
               <MoodItem
                 enable={workMode === SCENE && state.currentScene?.id === item.id}
@@ -227,13 +227,13 @@ const MoodPage = () => {
                   )
                   state.currentScene = checkMoodData(item)
                   state.loading = false
-                }}/>
+                }} />
             )
           }}
-          ListHeaderComponent={() => (<Spacer height={cx(10)}/>)}
-          ItemSeparatorComponent={() => (<Spacer/>)}
-          ListFooterComponent={() => (<Spacer/>)}
-          keyExtractor={item => `${item.id}`}/>
+          ListHeaderComponent={() => (<Spacer height={cx(10)} />)}
+          ItemSeparatorComponent={() => (<Spacer />)}
+          ListFooterComponent={() => (<Spacer />)}
+          keyExtractor={item => `${item.id}`} />
       </Page>
       <CustomListDialog
         show={state.showAddMoodPopover}
@@ -252,7 +252,7 @@ const MoodPage = () => {
             value: false,
           },
         ]}
-        onItemPress={onAddMoodDialogItemClick}/>
+        onItemPress={onAddMoodDialogItemClick} />
     </>
   )
 }
@@ -266,15 +266,14 @@ const styles = StyleSheet.create({
     marginHorizontal: cx(24),
   },
   addMoodPopover: {
-    width: cx(171),
-    height: cx(90.5),
-    marginStart: cx(156),
-    marginTop: cx(105),
+    position: 'absolute',
+    right: cx(60),
+    top: Platform.OS === 'android' ? cx(90) : cx(130),
+    maxWidth: cx(200),
     backgroundColor: '#fff',
   },
   popoverItem: {
-    width: cx(171),
-    height: cx(45),
+    padding: cx(5),
     alignItems: 'flex-start',
   },
 })

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -9,13 +9,13 @@ import {ScrollView, StyleSheet, Text, View} from 'react-native'
 import Card from '@ledvance/base/src/components/Card'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import {hsv2Hex, mapFloatToRange} from '@ledvance/base/src/utils'
-import {COLOUR, useWorkMode, WHITE} from '../../hooks/DeviceDpStateHooks'
+import {COLOUR, SCENE, useWorkMode, WHITE} from '../../hooks/DeviceDpStateHooks'
 import {cctToColor} from '@ledvance/base/src/utils/cctUtils'
 import res from '@ledvance/base/src/res'
 import {cloneDeep, find, isEqual} from 'lodash'
 import TextButton from '@ledvance/base/src/components/TextButton'
 import {saveScene, useScene} from '../scene/SceneAction'
-import {useDeviceId, useFanMaxSpeed, useRole} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {useDeviceId, useFanMaxSpeed} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import {SceneNodeInfo, SceneUIState} from '../scene/SceneInfo'
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import FanAdjustView from '@ledvance/base/src/components/FanAdjustView'
@@ -45,9 +45,8 @@ const StaticMoodEditorPage = () => {
   const params = cloneDeep(routeParams)
   const moduleParams = params.moduleParams
   const deviceId = useDeviceId()
-  const role = useRole()
   const [moodId, setScene] = useScene(moduleParams.sceneDpCode)
-  const [, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
+  const [workMode, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
 
   const state = useReactive<StaticMoodEditorPageState>({
     headline: '',
@@ -103,7 +102,7 @@ const StaticMoodEditorPage = () => {
     )
     if (saveRes.success) {
       if (list.length > 0) {
-        if (isDelete && currentMood.id === moodId) {
+        if (isDelete && currentMood.id === moodId  && workMode === SCENE) {
           const setSceneRes = await setScene(
             deviceId,
             list[0],

package/src/modules/timeSchedule/MoodSetting.tsx

@@ -68,6 +68,8 @@ const MoodSetting = (props: MoodSettingProps) => {
         })
       }
       
+    }else{
+      setSendDps(cloneDeep(moods[0]), 'actionScene')
     }
   }, [])