@ledvance/ui-biz-bundle 1.0.13 → 1.0.15

package/package.json

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

package/src/modules/scene/SceneAction.d.ts

@@ -4,10 +4,10 @@ type GetRemoteSceneListType = (deviceId: string, dpCodes: Record<string, string>
 type SetRemoteSceneListType = (deviceId: string, remoteSceneList: RemoteSceneInfo[]) => Promise<Result<any>>;
 export declare const setRemoteSceneList: SetRemoteSceneListType;
 export declare const getRemoteSceneList: GetRemoteSceneListType;
-export declare function dp2Obj(dp: string): SceneInfo;
+export declare function dp2Obj(dp: string, isFan?: boolean): SceneInfo;
 type UseSceneType = (dpCodes: Record<string, string>) => [number, SetSceneType];
 type SetSceneType = (deviceId: string, scene: SceneInfo, dpCodes: Record<string, string>) => Promise<Result<any>>;
 export declare const useScene: UseSceneType;
-export declare function obj2Dp(scene: SceneInfo): string;
+export declare function obj2Dp(scene: SceneInfo, isFan?: boolean): string;
 export declare function saveScene(deviceId: string, scene: SceneUIState, transitionMode: SceneNodeTransitionMode, transitionTime: number, scenes: SceneUIState[]): Promise<Result<any>>;
 export {};

package/src/modules/scene/SceneAction.ts

@@ -15,6 +15,7 @@ import { Dispatch, useState } from 'react';
 import { useUpdateEffect } from 'ahooks';
 import { useDispatch } from 'react-redux';
 import res from '@ledvance/base/src/res';
+import { isFanLamp } from '@ledvance/base/src/utils/Support';
 
 type GetRemoteSceneListType = (deviceId: string, dpCodes: Record<string, string>) => Promise<Result<SceneUIState[]>>;
 type SetRemoteSceneListType = (
@@ -49,15 +50,16 @@ export const getRemoteSceneList: GetRemoteSceneListType = async (deviceId: strin
   }
   return {
     success: true,
-    data: res.data.map((item, index) => remoteSceneInfo2SceneUIState(item, index)),
+    data: res.data.map((item, index) => remoteSceneInfo2SceneUIState(item, index, dpCodes)),
   };
 };
 
 function remoteSceneInfo2SceneUIState(
   remoteSceneInfo: RemoteSceneInfo,
   index: number,
+  dpCodes: Record<string, any>
 ): SceneUIState {
-  const sceneInfo = dp2Obj(remoteSceneInfo.i);
+  const sceneInfo = dp2Obj(remoteSceneInfo.i, isFanLamp(dpCodes));
   return {
     id: sceneInfo.id,
     fanEnable: sceneInfo.fanEnable,
@@ -68,15 +70,18 @@ function remoteSceneInfo2SceneUIState(
   };
 }
 
-export function dp2Obj(dp: string): SceneInfo {
+export function dp2Obj(dp: string, isFan:boolean = false): SceneInfo {
   let dpCopy = dp;
-  console.log(dp, '< --- dpp')
+  let fanEnable = false
+  let fanSpeed = 0
   const id = hex2Int(dpCopy.slice(0, 2));
   dpCopy = dpCopy.slice(2);
-  const fanEnable = hex2Int(dpCopy.slice(0, 2)) === 1
-  dpCopy = dpCopy.slice(2)
-  const fanSpeed = hex2Int(dpCopy.slice(0, 2))
-  dpCopy = dpCopy.slice(2)
+  if(isFan){
+    fanEnable = hex2Int(dpCopy.slice(0, 2)) === 1
+    dpCopy = dpCopy.slice(2)
+    fanSpeed = hex2Int(dpCopy.slice(0, 2))
+    dpCopy = dpCopy.slice(2)
+  }
   const nodes: SceneNodeInfo[] = spliceByStep(dpCopy, 26).map(nodeHex => {
     let hex = nodeHex;
     const switchingInterval = hex2Int(hex.slice(0, 2));
@@ -107,7 +112,7 @@ export function dp2Obj(dp: string): SceneInfo {
       isColorNode: s !== 0, // 色相/饱和度 不为0就是颜色节点
     };
   });
-  return { id,fanEnable, fanSpeed, nodes };
+  return isFan ? { id,fanEnable, fanSpeed, nodes } : { id, nodes }
 }
 
 function getSceneImage(index: number): string {
@@ -162,10 +167,14 @@ const setScene = (dispatch: Dispatch<any>) => (deviceId, scene, dpCodes) =>
   });
 
 
-  export function obj2Dp(scene: SceneInfo): string {
+  export function obj2Dp(scene: SceneInfo, isFan: boolean = false): string {
+    let fanEnableHex = ''
+    let fanSpeedHex = ''
     const idHex = scene.id.toString(16).padStart(2, '0')
-    const fanEnableHex = (scene.fanEnable ? 1 : 0).toString(16).padStart(2, '0')
-    const fanSpeedHex = scene.fanSpeed.toString(16).padStart(2, '0')
+    if(isFan){
+      fanEnableHex = (scene.fanEnable ? 1 : 0).toString(16).padStart(2, '0')
+      fanSpeedHex = (scene.fanSpeed || 1).toString(16).padStart(2, '0')
+    }
     return 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')

package/src/modules/scene/SceneInfo.d.ts

@@ -1,7 +1,7 @@
 export interface SceneInfo {
     id: number;
-    fanEnable: boolean;
-    fanSpeed: number;
+    fanEnable?: boolean;
+    fanSpeed?: number;
     nodes: SceneNodeInfo[];
 }
 export interface SceneNodeInfo {

package/src/modules/scene/SceneInfo.ts

@@ -12,9 +12,9 @@ export interface SceneInfo {
     // 2hex
     id: number
     // 2hex
-    fanEnable: boolean
+    fanEnable?: boolean
     // 2hex
-    fanSpeed: number
+    fanSpeed?: number
     // 26hex/node
     nodes: SceneNodeInfo[]
 }

package/src/modules/timeSchedule/DeviceState.d.ts

@@ -1,11 +1,16 @@
 import { ScheduleItemDp } from "./TimeScheduleEditpage";
-interface DeviceStateProps {
+import { JudgeTimeScheduleProps } from "./TimeScheduleBean";
+interface DeviceStateProps extends JudgeTimeScheduleProps {
+    singleActions: any;
+    mixActions: any;
+    actionScene: any;
     scheduleItem: any;
     dps: ScheduleItemDp[];
+    selectedDps: ScheduleItemDp[];
     dpCodes: Record<string, string>;
     isManual: boolean;
     setIsManual?: (isManual: boolean) => void;
-    setSendDps: (dpId: string, dp: Record<string, any>) => void;
+    setSendDps: (actions: any, type: string) => void;
     changeSkillEnable: (dpId: string, enable: boolean) => void;
 }
 declare const DeviceState: (props: DeviceStateProps) => any;

package/src/modules/timeSchedule/DeviceState.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { Utils as lampUtils } from "@tuya/tuya-panel-lamp-sdk"
-import { View } from "react-native";
+import { View, Text, Image } from "react-native";
 import { Utils } from 'tuya-panel-kit'
 import SegmentControl from "@ledvance/base/src/components/segmentControl";
 import I18n from "@ledvance/base/src/i18n";
@@ -8,46 +8,80 @@ import ManualSetting from "./ManualSetting";
 import { ScheduleItemDp } from "./TimeScheduleEditpage";
 import MoodSetting from "./MoodSetting";
 import { isPlug } from "@ledvance/base/src/utils/Support";
+import { JudgeTimeScheduleProps } from "./TimeScheduleBean";
+import res from "@ledvance/base/src/res";
 const { convertX: cx } = Utils.RatioUtils
 const { isSupportScene } = lampUtils.SupportUtils
-interface DeviceStateProps{
+interface DeviceStateProps extends JudgeTimeScheduleProps {
+    singleActions: any 
+    mixActions:any
+    actionScene:any
     scheduleItem: any
     dps: ScheduleItemDp[]
-    dpCodes: Record<string,string>
+    selectedDps: ScheduleItemDp[]
+    dpCodes: Record<string, string>
     isManual: boolean
     setIsManual?: (isManual: boolean) => void
-    setSendDps: (dpId: string, dp: Record<string,any>) => void
-    changeSkillEnable: (dpId:string, enable: boolean) => void
+    setSendDps: (actions:any, type:string) => void
+    changeSkillEnable: (dpId: string, enable: boolean) => void
 }
 
-const DeviceState = (props: DeviceStateProps) =>{
-    const showSegmentControl = () =>{
-        return !!(isSupportScene() && !isPlug(props.dpCodes) && props.dps.length && props.dps.find(dp => dp.value.includes('light')))
+const DeviceState = (props: DeviceStateProps) => {
+    const showSegmentControl = () => {
+        return !!(isSupportScene() && !isPlug(props.dpCodes) && props.selectedDps.length)
     }
-    return(
+
+    const showErrorText = () => {
+        return !!props.dps.length
+    }
+    return (
         <View>
             {showSegmentControl() && <SegmentControl
                 title1={I18n.getLang('timeschedule_add_schedule_switch_tab_manual_text')}
                 title2={I18n.getLang('timeschedule_add_schedule_switch_tab_mood_text')}
                 isFirst={props.isManual}
                 setIsFirst={(v: boolean) => props.setIsManual && props.setIsManual(v)}
-                style={{marginHorizontal: cx(0)}}
+                style={{ marginHorizontal: cx(0) }}
             />}
             {props.isManual ?
-                <ManualSetting 
+                <ManualSetting
+                    singleActions ={props.singleActions}
+                    mixActions = {props.mixActions}
                     dpCodes={props.dpCodes}
-                    dps={props.dps}
+                    dps={props.selectedDps}
                     scheduleItem={props.scheduleItem}
                     setSendDps={props.setSendDps}
                     changeSkillEnable={props.changeSkillEnable}
+                    isDIMLamp={props.isDIMLamp}
+                    isGARDOT={props.isGARDOT}
+                    isGlassRGBWLamp={props.isGlassRGBWLamp}
+                    isOnlyRGBLamp={props.isOnlyRGBLamp}
+                    isRGBLamp={props.isRGBLamp}
+                    isRGBWLamp={props.isRGBWLamp}
+                    isMixRGBWLamp={props.isMixRGBWLamp}
+                    isTWLamp={props.isTWLamp}
+                    isFanLamp={props.isFanLamp}
+                    isSupportMode={props.isSupportMode}
+                    isSupportBrightness={props.isSupportBrightness}
+                    isSupportTemperature={props.isSupportTemperature}
                 /> :
-                <MoodSetting 
-                    dpCodes={props.dpCodes}
-                    dps={props.dps}
-                    scheduleItem={props.scheduleItem}
-                    setSendDps={props.setSendDps}
-                    changeSkillEnable={props.changeSkillEnable}
-                />
+                <View>
+                    {
+                        showErrorText() ?
+                            <View style={{ flexDirection: 'row', alignItems: 'center' }}>
+                                <Image style={{ width: cx(16), height: cx(16), tintColor: '#FF9500' }} source={res.ic_warning_amber} />
+                                <Text style={{ color: '#FF9500', marginLeft: cx(5) }}>{I18n.getLang('timeschedule_add_schedule_no_device_warning_text')}</Text>
+                            </View> :
+                            <MoodSetting
+                                actionScene={props.actionScene}
+                                dpCodes={props.dpCodes}
+                                dps={props.dps}
+                                scheduleItem={props.scheduleItem}
+                                setSendDps={props.setSendDps}
+                                changeSkillEnable={props.changeSkillEnable}
+                            />
+                    }
+                </View>
             }
         </View>
     )

package/src/modules/timeSchedule/LdvScheduleItem.tsx

@@ -40,7 +40,8 @@ const LdvScheduleItem = (props: LdvScheduleItemProps) => {
                 onPress(item);
             }}
             onLongPress={() => {
-                onLongPress(item);
+                onPress(item);
+                // onLongPress(item);
             }}>
             <View style={styles.infoContainer}>
                 <Text style={styles.time}>{item.time}</Text>

package/src/modules/timeSchedule/ManualSetting.d.ts

@@ -1,9 +1,13 @@
 import { ScheduleItemDp } from "./TimeScheduleEditpage";
-interface ManualSettingProps {
+import { JudgeTimeScheduleProps } from "./TimeScheduleBean";
+interface ManualSettingProps extends JudgeTimeScheduleProps {
+    singleActions: any;
+    mixActions: any;
     scheduleItem: any;
     dps: ScheduleItemDp[];
     dpCodes: Record<string, string>;
-    setSendDps: (dpId: string, dp: Record<string, any>) => void;
+    isMixRGBWLamp?: boolean;
+    setSendDps: (actions: any, type: string) => void;
     changeSkillEnable: (dpId: string, enable: boolean) => void;
 }
 declare const ManualSetting: (props: ManualSettingProps) => any;

package/src/modules/timeSchedule/ManualSetting.tsx

@@ -1,25 +1,36 @@
 import React from "react";
 import { View } from "react-native";
-import { isMixRGBWLamp } from '@ledvance/base/src/utils/Support'
 import SingleLightView from "./SingleLightView";
 import { ScheduleItemDp } from "./TimeScheduleEditpage";
 import MixLightView from "./mix/MixLightView";
+import { JudgeTimeScheduleProps } from "./TimeScheduleBean";
+import { useReactive } from "ahooks";
 
 
-interface ManualSettingProps {
+interface ManualSettingProps extends JudgeTimeScheduleProps{
+    singleActions: any 
+    mixActions:any
     scheduleItem: any
     dps: ScheduleItemDp[]
     dpCodes: Record<string, string>
-    setSendDps: (dpId: string, dp: Record<string, any>) => void
+    isMixRGBWLamp?: boolean
+    setSendDps: (actions: any, type:string) => void
     changeSkillEnable: (dpId:string, enable: boolean) => void
 }
 
 const ManualSetting = (props: ManualSettingProps) => {
+    const state = useReactive({
+        singleActions: props.singleActions,
+        mixActions: props.mixActions,
+        flag: Symbol()
+    })
+
 
     const renderContent = () => {
-        if (isMixRGBWLamp(props.dpCodes)) {
+        if (props.isMixRGBWLamp) {
             return (
                 <MixLightView
+                    mixActions={state.mixActions}
                     dpCodes={props.dpCodes}
                     setSendDps={props.setSendDps}
                     scheduleItem={props.scheduleItem}
@@ -30,11 +41,23 @@ const ManualSetting = (props: ManualSettingProps) => {
             props.dps.map((item) => (
                 <View key={item.dpId}>
                     <SingleLightView
+                        singleActions={state.singleActions}
                         dp={item}
                         dpCodes={props.dpCodes}
                         scheduleItem={props.scheduleItem}
                         setSendDps={props.setSendDps}
                         setEnable={props.changeSkillEnable}
+                        isDIMLamp={props.isDIMLamp}
+                        isGARDOT={props.isGARDOT}
+                        isGlassRGBWLamp={props.isGlassRGBWLamp}
+                        isOnlyRGBLamp={props.isOnlyRGBLamp}
+                        isRGBLamp={props.isRGBLamp}
+                        isRGBWLamp={props.isRGBWLamp}
+                        isTWLamp={props.isTWLamp}
+                        isFanLamp={props.isFanLamp}
+                        isSupportMode={props.isSupportMode}
+                        isSupportBrightness={props.isSupportBrightness}
+                        isSupportTemperature={props.isSupportTemperature}
                     />
                 </View>
             ))

package/src/modules/timeSchedule/MoodSetting.d.ts

@@ -1,9 +1,10 @@
 import { ScheduleItemDp } from "./TimeScheduleEditpage";
 interface MoodSettingProps {
+    actionScene: any;
     scheduleItem: any;
     dps: ScheduleItemDp[];
     dpCodes: Record<string, string>;
-    setSendDps: (dpId: string, dp: Record<string, any>) => void;
+    setSendDps: (actions: any, type: string) => void;
     changeSkillEnable: (dpId: string, enable: boolean) => void;
 }
 declare const MoodSetting: (props: MoodSettingProps) => any;

package/src/modules/timeSchedule/MoodSetting.tsx

@@ -1,59 +1,55 @@
 import React, { useEffect } from "react";
 import { ScheduleItemDp } from "./TimeScheduleEditpage";
-import { isMixRGBWLamp } from '@ledvance/base/src/utils/Support';
-import { obj2Dp as senceObj2Dp, dp2Obj as sencePp2Obj } from "../scene/SceneAction";
 import ScheduleScene from "./ScheduleScene";
 // import MixMoodScene from "../mood/MixScene";
 import { useReactive } from 'ahooks'
-import { Buffer } from 'buffer';
-import { SCENE } from "../../hooks/DeviceDpStateHooks";
 
 interface MoodSettingProps{
+    actionScene:any
     scheduleItem: any
     dps: ScheduleItemDp[]
     dpCodes: Record<string, string>
-    setSendDps: (dpId: string, dp: Record<string,any>) => void
+    setSendDps: (actions:any, type:string) => void
     changeSkillEnable: (dpId:string, enable: boolean) => void
 }
 
 const MoodSetting = (props: MoodSettingProps) =>{
-    const { scheduleItem, dpCodes, setSendDps} = props
+    const { dpCodes, setSendDps} = props
     const state = useReactive({
-        actionScene: { id: '', nodes: [], fanEnable: true, fanSpeed: 1 } as any,
+        actionScene: props.actionScene,
     })
 
-    useEffect(() =>{
-        if(scheduleItem){
-            if(scheduleItem.dps[dpCodes.scene_data] !== undefined){
-                state.actionScene = sencePp2Obj(scheduleItem.dps[dpCodes.scene_data])
-            }
-            if (scheduleItem.dps[dpCodes.mix_light_scene] !== undefined) {
-                const sceneDp = scheduleItem.dps[dpCodes.mix_light_scene]
-                state.actionScene = Buffer.from(sceneDp, 'base64').toString('hex')
-              }
-        }
-    }, [])
+    // useEffect(() =>{
+    //     if(scheduleItem){
+    //         if(scheduleItem.dps[dpCodes.scene_data] !== undefined){
+    //             state.actionScene = sencePp2Obj(scheduleItem.dps[dpCodes.scene_data])
+    //         }
+    //         if (scheduleItem.dps[dpCodes.mix_light_scene] !== undefined) {
+    //             const sceneDp = scheduleItem.dps[dpCodes.mix_light_scene]
+    //             state.actionScene = Buffer.from(sceneDp, 'base64').toString('hex')
+    //           }
+    //     }
+    // }, [])
 
     useEffect(() =>{
-        const dp = getSendDps()
-        setSendDps('scene',dp)
+        setSendDps(state.actionScene, 'actionScene')
     }, [state.actionScene])
 
-    const getSendDps = () =>{
-        if (isMixRGBWLamp(dpCodes)) {
-            return {
-              [dpCodes.mix_light_scene]: Buffer.from(state.actionScene?.value, 'hex').toString('base64'),
-              [dpCodes.switch_led]: true,
-              [dpCodes.work_mode]: SCENE
-            }
-          } else {
-            return {
-              [dpCodes.switch_led]: true,
-              [dpCodes.scene_data]: senceObj2Dp({ id: Number(state?.actionScene?.id), nodes: state?.actionScene?.nodes, fanEnable: state.actionScene.fanEnable, fanSpeed: state.actionScene.fanSpeed }),
-              [dpCodes.work_mode]: SCENE,
-            };
-          }
-    }
+    // const getSendDps = () =>{
+    //     if (isMixRGBWLamp(dpCodes)) {
+    //         return {
+    //           [dpCodes.mix_light_scene]: Buffer.from(state.actionScene?.value, 'hex').toString('base64'),
+    //           [dpCodes.switch_led]: true,
+    //           [dpCodes.work_mode]: SCENE
+    //         }
+    //       } else {
+    //         return {
+    //           [dpCodes.switch_led]: true,
+    //           [dpCodes.scene_data]: senceObj2Dp({ id: Number(state?.actionScene?.id), nodes: state?.actionScene?.nodes, fanEnable: state.actionScene.fanEnable, fanSpeed: state.actionScene.fanSpeed }),
+    //           [dpCodes.work_mode]: SCENE,
+    //         };
+    //       }
+    // }
 
     return (
         // isMixRGBWLamp(dpCodes) ?

package/src/modules/timeSchedule/ScheduleScene.tsx

@@ -12,6 +12,7 @@ import { Utils } from 'tuya-panel-kit'
 import InfoText from '@ledvance/base/src/components/InfoText'
 import MoodItem from '../mood/MoodItem'
 import { SCENE, useWorkMode } from '../../hooks/DeviceDpStateHooks'
+import { isEmpty } from 'lodash'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -40,7 +41,7 @@ const ScheduleScene = ({ scene, setScene, dpCodes }) => {
         const res = await getRemoteSceneList(deviceInfo.devId, dpCodes)
         if (res.success) {
             state.scenes = res.data || []
-            state.currentScene = scene || state.scenes[0]
+            state.currentScene = isEmpty(scene) ? state.scenes[0] : scene
             setScene(state.currentScene)
         }
     }, [])

package/src/modules/timeSchedule/SingleLightView.d.ts

@@ -1,9 +1,11 @@
 import { ScheduleItemDp } from './TimeScheduleEditpage';
-interface SingleLightViewProps {
+import { JudgeTimeScheduleProps } from './TimeScheduleBean';
+interface SingleLightViewProps extends JudgeTimeScheduleProps {
+    singleActions: any;
     scheduleItem: any;
     dpCodes: Record<string, string>;
     dp: ScheduleItemDp;
-    setSendDps: (dpId: string, dp: Record<string, any>) => void;
+    setSendDps: (actions: any, type: string) => void;
     setEnable: (dpId: string, enable: boolean) => void;
 }
 export default function SingleLightView(props: SingleLightViewProps): any;