@ledvance/ui-biz-bundle 1.0.55 → 1.0.56

package/package.json

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

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -18,7 +18,7 @@ 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 {isUVCFanDevice, 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'
@@ -39,6 +39,7 @@ const DynamicMoodEditorPage = () => {
   const deviceId = useDeviceId()
   const [moodId, setScene] = useScene(moduleParams.sceneDpCode)
   const [, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
+  const isUVCFan = isUVCFanDevice()
   const state = useReactive<DynamicMoodEditorPageState>({
     headline: '',
     mood: params.currentMood,
@@ -94,6 +95,7 @@ const DynamicMoodEditorPage = () => {
       state.currentNode.transitionTime,
       list,
       moduleParams.isFanLamp!!,
+      isUVCFan
     )
     if (saveRes.success) {
       if (list.length > 0) {
@@ -104,7 +106,8 @@ const DynamicMoodEditorPage = () => {
             moduleParams.sceneDpCode,
             moduleParams.workModeDpCode,
             moduleParams.switchLedDpCode,
-            !!moduleParams.isFanLamp
+            !!moduleParams.isFanLamp,
+            isUVCFan
           )
           console.log('设置修改后的场景结果', setSceneRes)
         } else if (!isDelete) {
@@ -114,7 +117,8 @@ const DynamicMoodEditorPage = () => {
             moduleParams.sceneDpCode,
             moduleParams.workModeDpCode,
             moduleParams.switchLedDpCode,
-            !!moduleParams.isFanLamp
+            !!moduleParams.isFanLamp,
+            isUVCFan
           )
           console.log('设置修改后的场景结果', setSceneRes)
         }

package/src/modules/mood/MoodPage.tsx

@@ -4,7 +4,7 @@ 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 {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'
@@ -60,6 +60,7 @@ const MoodPage = () => {
   const [workMode] = useWorkMode(params.workModeDpCode)
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
+  const isUVCFan = isUVCFanDevice()
 
   const state = useReactive<MoodPageUIState>({
     currentScene: undefined,
@@ -83,6 +84,7 @@ const MoodPage = () => {
         params.isFanLamp,
         params.isTWLamp,
         params.isDIMLamp,
+        isUVCFan
       )
       if (res.success) {
         state.scenes = res.data || []

package/src/modules/scene/SceneAction.ts

@@ -42,6 +42,7 @@ export async function getRemoteSceneList(
   isFanLamp: boolean = false,
   isTWLamp: boolean = false,
   isDIMLamp: boolean = false,
+  isUVCFan?: boolean
 ): Promise<Result<SceneUIState[]>> {
   const res: NativeResult<RemoteSceneInfo[]> = await getFeature(deviceId, SceneFeatureId)
   if (!res.result) {
@@ -63,7 +64,7 @@ export async function getRemoteSceneList(
   }
   return {
     success: true,
-    data: res.data.map((item, index) => remoteSceneInfo2SceneUIState(item, index, isFanLamp)),
+    data: res.data.map((item, index) => remoteSceneInfo2SceneUIState(item, index, isFanLamp, isUVCFan)),
   }
 }
 
@@ -71,8 +72,9 @@ function remoteSceneInfo2SceneUIState(
   remoteSceneInfo: RemoteSceneInfo,
   index: number,
   isFanLamp: boolean,
+  isUVCFan?: boolean
 ): SceneUIState {
-  const sceneInfo = dp2Obj(remoteSceneInfo.i, isFanLamp)
+  const sceneInfo = dp2Obj(remoteSceneInfo.i, isFanLamp, isUVCFan)
   return {
     id: sceneInfo.id,
     fanEnable: sceneInfo.fanEnable,
@@ -83,7 +85,7 @@ function remoteSceneInfo2SceneUIState(
   }
 }
 
-export function dp2Obj(dp: string, isFan: boolean = false): SceneInfo {
+export function dp2Obj(dp: string, isFan: boolean = false, isUVCFan?: boolean): SceneInfo {
   let dpCopy = dp
   let fanEnable = false
   let fanSpeed = 0
@@ -97,9 +99,10 @@ export function dp2Obj(dp: string, isFan: boolean = false): SceneInfo {
   }
   const nodes: SceneNodeInfo[] = spliceByStep(dpCopy, 26).map(nodeHex => {
     let hex = nodeHex
-    const switchingInterval = hex2Int(hex.slice(0, 2))
+    const switchingInterval = isUVCFan ? 101 - hex2Int(hex.slice(0, 2)) : hex2Int(hex.slice(0, 2))
     hex = hex.slice(2)
-    const transitionTime = hex2Int(hex.slice(0, 2))
+    const transitionTime = isUVCFan ? 101 - hex2Int(hex.slice(0, 2)) : hex2Int(hex.slice(0, 2))
+    console.log(transitionTime, '< --- transitionTime')
     hex = hex.slice(2)
     const transitionMode = hex2Int(hex.slice(0, 2))
     hex = hex.slice(2)
@@ -162,7 +165,8 @@ export function useScene(sceneDpCode: string): [
    sceneDpCode: string,
    workModeDpKey: string,
    switchDpCode: string,
-   isFanLamp: boolean
+   isFanLamp: boolean,
+   isUVCFan?: boolean
   ) => Promise<Result<any>>
 ] {
   const [dp] = useDp<string, any>(sceneDpCode)
@@ -179,10 +183,11 @@ const setScene = (dispatch: Dispatch<any>) => (
   sceneDpCode: string,
   workModeDpKey: string,
   switchDpCode: string,
-  isFanLamp: boolean
+  isFanLamp: boolean,
+  isUVCFan?: boolean
 ) =>
   asyncSetDps(dispatch, async () => {
-    const dpValue = obj2Dp(scene, isFanLamp)
+    const dpValue = obj2Dp(scene, isFanLamp, isUVCFan)
     const controlResult: any = await setSceneDp(
       deviceId,
       dpValue,
@@ -197,7 +202,7 @@ const setScene = (dispatch: Dispatch<any>) => (
   })
 
 
-export function obj2Dp(scene: SceneInfo, isFan: boolean = false): string {
+export function obj2Dp(scene: SceneInfo, isFan: boolean = false, isUVCFan?: boolean): string {
   let fanEnableHex = ''
   let fanSpeedHex = ''
   const idHex = scene.id.toString(16).padStart(2, '0')
@@ -206,8 +211,8 @@ export function obj2Dp(scene: SceneInfo, isFan: boolean = false): string {
     fanSpeedHex = (scene.fanSpeed || 1).toString(16).padStart(2, '0')
   }
   const hex = idHex + fanEnableHex + fanSpeedHex + scene.nodes.map(node => {
-    const switchingIntervalHex = node.switchingInterval.toString(16).padStart(2, '0')
-    const transitionTimeHex = node.transitionTime.toString(16).padStart(2, '0')
+    const switchingIntervalHex = (isUVCFan ? 101 - node.switchingInterval : node.switchingInterval).toString(16).padStart(2, '0')
+    const transitionTimeHex = (isUVCFan ? 101 - node.transitionTime : node.transitionTime).toString(16).padStart(2, '0')
     const transitionModeHex = node.transitionMode.toString(16).padStart(2, '0')
     const hHex = node.h.toString(16).padStart(4, '0')
     const sHex = (node.s * 10).toString(16).padStart(4, '0')
@@ -227,6 +232,7 @@ export async function saveScene(
   transitionTime: number,
   scenes: SceneUIState[],
   isFanLamp: boolean,
+  isUVCFan?: boolean
 ) {
   if (transitionMode === SceneNodeTransitionMode.Static) {
     scene.nodes = [scene.nodes[0]]
@@ -248,7 +254,7 @@ export async function saveScene(
     const sceneTemp = s.id === scene.id ? scene : s
     return {
       n: sceneTemp.name,
-      i: obj2Dp(sceneTemp, isFanLamp),
+      i: obj2Dp(sceneTemp, isFanLamp, isUVCFan),
       s: '',
       t: 0,
       e: false,