@ledvance/ui-biz-bundle 1.1.81 → 1.1.83

package/package.json

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

package/src/modules/timer/TimerPage.tsx

@@ -11,7 +11,7 @@ import Page from "@ledvance/base/src/components/Page";
 import LdvPickerView from '@ledvance/base/src/components/ldvPickerView'
 import { Utils, Progress } from 'tuya-panel-kit'
 import { useDeviceInfo } from "@ledvance/base/src/models/modules/NativePropsSlice";
-import { useProgress } from "./TimerPageAction";
+import {timeFormatToRealTime, useProgress} from "./TimerPageAction";
 import { cloneDeep } from "lodash";
 import dayjs from "dayjs";
 import DeleteButton from "@ledvance/base/src/components/DeleteButton";
@@ -123,14 +123,6 @@ const TimerPage = (props: {theme?: any}) => {
     }
   }
 
-  const getSingleLightEndTimeString = (mCountdown: number) => {
-    const date = new Date()
-    const now = date.getTime()
-    const after = new Date(now + mCountdown * 1000)
-    const timeString = `${after.getHours()}:${after.getMinutes().toString().padStart(2, '0')}`
-    return timeString
-  }
-
   const showActiveView = () => {
     return progress.length > 1
   }
@@ -317,7 +309,7 @@ const TimerPage = (props: {theme?: any}) => {
                         />
                         <Text style={{ marginLeft: cx(20), fontSize: cx(22) }}>{getActiveTimeString(timer.progressHook.countdown)}</Text>
                       </View>
-                      <Text>{I18n.formatValue(timer.enable ? timer.stringOff : timer.stringOn, getSingleLightEndTimeString(timer.progressHook.countdown))}</Text>
+                      <Text>{I18n.formatValue(timer.enable ? timer.stringOff : timer.stringOn, timeFormatToRealTime(timer.progressHook.countdown))}</Text>
                     </Card>
                     <Spacer height={cx(40)} />
                   </View>
@@ -363,7 +355,7 @@ const TimerPage = (props: {theme?: any}) => {
                     {I18n.formatValue(
                       runningTimer()[0].enable ?
                         runningTimer()[0].stringOff :
-                        runningTimer()[0].stringOn, getSingleLightEndTimeString(runningTimer()[0].progressHook.countdown)
+                        runningTimer()[0].stringOn, timeFormatToRealTime(runningTimer()[0].progressHook.countdown)
                     )}
                   </Text>
                 </View>

package/src/modules/timer/TimerPageAction.ts

@@ -130,6 +130,13 @@ export const useProgress = (dps: dpItem[]) => {
   }))
 }
 
+export function timeFormatToRealTime(mCountdown: number) {
+  const date = new Date()
+  const now = date.getTime()
+  const after = new Date(now + mCountdown * 1000)
+  return `${after.getHours()}:${after.getMinutes().toString().padStart(2, '0')}`
+}
+
 export function timeFormat(time: number): string {
   let hour = Math.trunc(time / 3600)
   const beforeMin = (time % 3600) / 60

package/src/newModules/mood/Interface.ts

@@ -92,6 +92,7 @@ export interface DefMoodOption extends LightCategory{
   isSupportColor: boolean;
   isSupportTemperature: boolean;
   isSupportBrightness: boolean;
+  isSupportSceneStatus?: boolean;// putFeature中的SceneStatus,包含Flag和Mood选中的ID
 }
 
 export interface MoodDps {

package/src/newModules/mood/MoodActions.ts

@@ -19,10 +19,10 @@ import {
   stripDp2Obj,
   stripObj2Dp,
 } from './MoodParse';
-import { useDp, useDps } from '@ledvance/base/src/models/modules/NativePropsSlice';
-import { useState } from 'react';
+import {useDeviceId, useDp, useDps} from '@ledvance/base/src/models/modules/NativePropsSlice';
+import {useCallback, useEffect, useState} from 'react';
 import { useUpdateEffect } from 'ahooks';
-import { WorkMode } from '@ledvance/base/src/utils/interface';
+import {SceneStatusType, WorkMode } from '@ledvance/base/src/utils/interface';
 import { Result } from '@ledvance/base/src/models/modules/Result';
 
 const SceneFeatureId = 'SimplifyScene';
@@ -241,3 +241,31 @@ export const saveMoodList = (
       : SceneFeatureId;
   return setRemoteMoodList(devId, isFeature, remoteMoods, moodFeatureId);
 };
+
+export function useSceneStatusId(params: MoodPageParams): [number, (moodId: number) => Promise<any>] {
+  const devId = useDeviceId();
+  const [sceneStatusId, setSceneStatusId] = useState(-1);
+  if (!params.isSupportSceneStatus) {
+    const setEmpty = useCallback(() => {
+      return new Promise<any>(() => {});
+    }, [])
+    return [sceneStatusId, setEmpty]
+  }
+  useEffect(() => {
+    getFeature(devId, "SceneStatus").then((res) => {
+      if (res.data && res.data.type === SceneStatusType.Mood) {
+        setSceneStatusId(res.data.id)
+      }
+    })
+  }, [])
+  const setSceneStatusIdRemote = useCallback((moodId: number) => {
+    return new Promise<any>((resolve, _reject) => {
+      putFeature(devId, "SceneStatus", {type: SceneStatusType.Mood, id: moodId}).then((res) => {
+        setSceneStatusId(moodId);
+        resolve(res);
+      })
+    });
+  }, [])
+
+  return [sceneStatusId, setSceneStatusIdRemote]
+}

package/src/newModules/mood/MoodPage.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useMemo } from 'react';
 import Page from '@ledvance/base/src/components/Page';
 import { Utils } from 'tuya-panel-kit';
-import { saveMoodList, useSwitchLed, useWorkMode } from './MoodActions';
+import {saveMoodList, useSceneStatusId, useSwitchLed, useWorkMode} from './MoodActions';
 import {
   useDeviceId,
   useDeviceInfo,
@@ -41,6 +41,7 @@ const MoodPage = () => {
   const [secondaryWork, setSecondaryWork] = useWorkMode(params.secondaryWorkMode!);
   const [switchLed] = useSwitchLed(params.switchLedDp)
   const [flagMode, setFlagMode] = useFlagMode();
+  const [sceneStatusId, setSceneStatusId] = useSceneStatusId(params);
 
   const state = useReactive<MoodPageState>({
     currentMood: undefined,
@@ -160,7 +161,9 @@ const MoodPage = () => {
       },
     };
     if (mode === 'set') {
-      return setMoodInfo(checkedMood);
+      await setMoodInfo(checkedMood);
+      await setSceneStatusId(checkedMood.id);
+      return;
     }
     let newScene: MoodUIInfo[] = [];
     if (mode === 'add') {
@@ -197,18 +200,20 @@ const MoodPage = () => {
       if (mood) {
         if (mode === 'del') {
           if (
-            (mainWork !== WorkMode.Scene && secondaryWork !== WorkMode.Scene) ||
-            (params.isCeilingLight
-              ? currentMood.mainLamp.id !== moodInfo.mainLamp.id &&
-                currentMood.secondaryLamp.id !== moodInfo.secondaryLamp.id
-              : currentMood.id !== moodInfo.id) || !switchLed
+              (mainWork !== WorkMode.Scene && secondaryWork !== WorkMode.Scene) ||
+              (params.isCeilingLight
+                  ? currentMood.mainLamp.id !== moodInfo.mainLamp.id &&
+                  currentMood.secondaryLamp.id !== moodInfo.secondaryLamp.id
+                  : (params.isSupportSceneStatus ? currentMood.id !== sceneStatusId : currentMood.id !== moodInfo.id)) || !switchLed
           ) {
             return {
               success: true,
             };
           }
         }
-        setMoodInfo(mood).then();
+        setMoodInfo(mood).then(() => {
+          setSceneStatusId(mood.id).then();
+        });
       } else {
         if (mainWork === WorkMode.Scene) {
           if (params.isCeilingLight) {
@@ -266,18 +271,20 @@ const MoodPage = () => {
   );
 
   const getItemEnable = useCallback(
-    (moodItem: MoodUIInfo) => {
-      if (params.isCeilingLight) {
-        return (
-          moodInfo.mainLamp.id === moodItem.mainLamp.id &&  
-          moodInfo.secondaryLamp.id === moodItem.secondaryLamp.id &&
-          (mainWork === WorkMode.Scene || secondaryWork === WorkMode.Scene) && !flagMode.flagMode && switchLed
-        );
-      } else {
-        return moodInfo.id === moodItem.id && mainWork === WorkMode.Scene && !flagMode.flagMode && switchLed
-      }
-    },
-    [moodInfo, mainWork, secondaryWork, flagMode?.flagMode, switchLed]
+      (moodItem: MoodUIInfo) => {
+        if (params.isCeilingLight) {
+          return (
+              moodInfo.mainLamp.id === moodItem.mainLamp.id &&
+              moodInfo.secondaryLamp.id === moodItem.secondaryLamp.id &&
+              (mainWork === WorkMode.Scene || secondaryWork === WorkMode.Scene) && !flagMode.flagMode && switchLed
+          );
+        } else if (params.isSupportSceneStatus) {
+          return sceneStatusId === moodItem.id && mainWork === WorkMode.Scene && !flagMode.flagMode && switchLed
+        } else {
+          return moodInfo.id === moodItem.id && mainWork === WorkMode.Scene && !flagMode.flagMode && switchLed
+        }
+      },
+      [moodInfo, mainWork, secondaryWork, flagMode?.flagMode, switchLed, sceneStatusId]
   );
 
   const nameRepeat = useCallback((mood: MoodUIInfo) => {