@ledvance/ui-biz-bundle 1.1.94 → 1.1.96

package/package.json

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

package/src/modules/flags/FlagPage.tsx

@@ -174,6 +174,7 @@ const FlagPage = (props: { theme?: ThemeType }) => {
           }
         }
         updateFlagMode(true, mood)
+        setSceneStatusId(mood.id).then()
         return setFlag(mood)
       } else {
         updateFlagMode(false)

package/src/modules/music/MusicPage.tsx

@@ -19,6 +19,7 @@ import { SelectPageParams } from '../select/SelectPage'
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { cloneDeep } from 'lodash'
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { WorkMode } from '@ledvance/base/src/utils/interface'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -30,6 +31,7 @@ export interface MusicPageRouterParams extends JudgeTimeScheduleProps {
   mix_light_scene: string
   music_data: string
   dreamMusicDp?: string
+  isFeatureMode?: boolean
 }
 
 const MusicPage = (props: { theme?: ThemeType }) => {
@@ -37,7 +39,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
   const deviceId = useDeviceId()
   const navigation = useNavigation()
   const params = useRoute().params as MusicPageRouterParams
-  const [workMode, setWorkMode] = useWorkMode(params.work_mode)
+  const [workMode, setWorkMode] = useWorkMode(params.work_mode, params.isFeatureMode)
   const [mixLight] = useMixRgbcw(params.mix_rgbcw, params.switch_led)
   const [, setMixScene] = useMixScene(params.mix_light_scene, params.work_mode)
   const [, setMusicData] = useMusicData(params.music_data)
@@ -110,7 +112,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
         power: true
       }, extraDp).then()
     } else {
-      if (workMode !== 'music') await setWorkMode('music')
+      if (workMode !== 'music') await setWorkMode(WorkMode.Music)
       if (!switchLed) setSwitchLed(true)
       await MusicManager.open(
         musicDefalutDatasource[state.phoneGenreMode],
@@ -193,8 +195,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
   }
 
   const changeMusic = async (id: number) => {
-    console.log(id, '< --- id')
-    if (workMode !== 'music') await setWorkMode('music')
+    if (workMode !== 'music') await setWorkMode(WorkMode.Music)
     if (!switchLed) setSwitchLed(true)
     await saveSelect(id)
     await MusicManager.close()
@@ -210,13 +211,12 @@ const MusicPage = (props: { theme?: ThemeType }) => {
   }
 
   const putMusicDataFn = (data: any, extraDp = {}) => {
-    console.log(data, '< --- data')
     setMusicData(data, extraDp).then()
   }
 
   useEffect(() => {
     getSelect().then()
-  }, [])
+  }, [workMode])
 
   const getSelectModeData = useCallback((): [string | undefined, any[]] => {
     const genreModeData = params.dreamMusicDp && state.musicType === 0 ? state.musicModeData : musicDefalutDatasource

package/src/modules/music/MusicPageActions.ts

@@ -1,21 +1,38 @@
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useUpdateEffect } from "ahooks"
-import { useDp, useDps } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useDeviceId, useDp, useDps } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import { ColorParser } from '@ledvance/base/src/utils/ColorParser'
 import { dp2Obj, obj2Dp } from '@ledvance/ui-biz-bundle/src/modules/timeSchedule/mix/MixLightActions'
 import { MixLightBean } from '@ledvance/ui-biz-bundle/src/modules/timeSchedule/mix/MixLightBean'
 import { Formatter } from '@tuya/tuya-panel-lamp-sdk'
 import { DreamMusicDataType, dreamMusicData } from './MusicDataBean'
 import { Result } from '@ledvance/base/src/models/modules/Result'
-import { NativeApi } from '@ledvance/base/src/api/native'
+import { getFeature, NativeApi } from '@ledvance/base/src/api/native'
 import { parseJSON } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
+import { WorkMode } from '@ledvance/base/src/utils/interface'
 const DreamMusicFormatter = new Formatter.DreamLightMicMusicFormatter()
 export const useEnable = (dpKey: string) => {
   return useDp(dpKey)
 }
 
-export const useWorkMode = (dpKey: string) => {
-  return useDp(dpKey)
+export const useWorkMode = (dpKey: string, isFeatureMode?: boolean): [WorkMode, (v: WorkMode) => Promise<Result<any>>] => {
+  const [workMode, setWorkMode] = useDp<WorkMode, any>(dpKey);
+  const [mode, setMode] = useState<WorkMode>(workMode);
+  const devId = useDeviceId()
+  useEffect(() =>{
+    if (isFeatureMode){
+      getFeature(devId, 'work_mode').then(res => {
+        if (res.result && res.data){
+          setMode(res.data)
+        }
+      })
+    }
+  }, [])
+
+  useUpdateEffect(() =>{
+    setMode(workMode)
+  }, [workMode])
+  return [mode, setWorkMode]
 }
 
 export const useMixRgbcw = (mixRgbcwDp: string, mixSwitchDp: string) => {