@ledvance/ui-biz-bundle 1.0.13 → 1.0.15

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -18,6 +18,12 @@ import { useReactive } from 'ahooks';
 import { dpItem } from "./TimeSchedulePage";
 import { differenceBy } from "lodash";
 import DeviceState from "./DeviceState";
+import { JudgeTimeScheduleProps } from "./TimeScheduleBean";
+import { getHSVByHex, getHexByHSV } from "@ledvance/base/src/utils";
+import { Buffer } from 'buffer';
+import { dp2Obj, obj2Dp } from './mix/MixLightActions'
+import { COLOUR, SCENE, WHITE } from "@ledvance/ui-biz-bundle/src/hooks/DeviceDpStateHooks";
+import { obj2Dp as senceObj2Dp, dp2Obj as sencePp2Obj } from "../scene/SceneAction";
 
 const { convertX: cx } = Utils.RatioUtils
 
@@ -26,11 +32,12 @@ export interface ScheduleItemDp extends dpItem {
     enable: boolean
 }
 
-interface TimeScheduleEditPageParams {
+interface TimeScheduleEditPageParams extends JudgeTimeScheduleProps {
     scheduleItem: any,
     dps: ScheduleItemDp[]
     dpCodes: Record<any, any>
     reloadData: () => void
+    getDpValue?: (v:any) => any
     deleteDialog: (item: any) => Promise<void>
 }
 
@@ -38,18 +45,41 @@ const TimeScheduleEditPage = () => {
     const navigation = useNavigation()
     const devId = useDeviceId()
     const route = useRoute()
-    const { scheduleItem, dps, reloadData, deleteDialog, dpCodes } = route.params as TimeScheduleEditPageParams
+    const props = route.params as TimeScheduleEditPageParams
+    const { scheduleItem, dps, reloadData, deleteDialog, dpCodes } = props
     const state = useReactive({
         hour: '00',
         minute: '00',
         loop: [0, 0, 0, 0, 0, 0, 0],
         isNotification: false,
-        brightValue: 50,
         name: '',
         selectedSkill: [] as ScheduleItemDp[],
-        skillList: []  as ScheduleItemDp[],
+        skillList: [] as ScheduleItemDp[],
         isManual: true,
-        dpsValue: {} as Record<string,any>
+        singleActions: {
+            enable: true,
+            isColor: true,
+            h: 0,
+            s: 100,
+            v: 100,
+            temperature: 100,
+            brightness: 100,
+            fanEnable: true,
+            fanSpeed: 1,
+            fanMode: 'normal',
+        },
+        mixActions: {
+            whiteLightSwitch: true,
+            colorLightSwitch: false,
+            mixRgbcwEnabled: true,
+            hue: 360,
+            sat: 100,
+            lightness: 100,
+            brightness: 100,
+            colorTempPercent: 100,
+        },
+        actionScene: {} as any,
+        dpsValue: {} as Record<string, any>
     })
 
 
@@ -62,7 +92,6 @@ const TimeScheduleEditPage = () => {
             state.name = scheduleItem.aliasName;
             state.isNotification = scheduleItem.isAppPush;
             state.loop = scheduleItem.loops.split('').map(mItem => parseInt(mItem));
-            state.brightValue = parseInt(scheduleItem.dps[dpCodes.bright_value]) / 10 || 50
             state.selectedSkill = dps.reduce((pre, cur) => {
                 if (scheduleItem.dps[cur.dpId] !== undefined) {
                     const result = { ...cur, enable: scheduleItem.dps[cur.dpId] }
@@ -71,14 +100,58 @@ const TimeScheduleEditPage = () => {
                 return pre
             }, [] as ScheduleItemDp[])
             state.skillList = differenceBy(dps, state.selectedSkill, 'dpId')
+
+            // single
+            if (scheduleItem.dps[dpCodes.switch_led] !== undefined) {
+                state.singleActions.enable = scheduleItem.dps[dpCodes.switch_led]
+            }
+            if (scheduleItem.dps[dpCodes.work_mode] !== undefined) {
+                state.singleActions.isColor = scheduleItem.dps[dpCodes.work_mode] === COLOUR
+            }
+            if (scheduleItem.dps[dpCodes.fan_switch] !== undefined) {
+                state.singleActions.fanEnable = scheduleItem.dps[dpCodes.fan_switch]
+            }
+            state.singleActions.brightness = scheduleItem.dps[dpCodes.bright_value] / 10 || 100
+            state.singleActions.temperature = scheduleItem.dps[dpCodes.temp_value] / 10 || 100
+            state.singleActions.fanSpeed = scheduleItem.dps[dpCodes.fan_speed] || 1
+            state.singleActions.fanMode = scheduleItem.dps[dpCodes.fan_mode] || 'normal'
+            const hsv = getHSVByHex(scheduleItem.dps[dpCodes.colour_data] || '0000000003e8');
+            state.singleActions.h = hsv.h;
+            state.singleActions.s = Math.round(hsv.s / 10);
+            state.singleActions.v = Math.round(hsv.v / 10);
+
+            // mix
+            if (scheduleItem.dps[dpCodes.mix_rgbcw] !== undefined) {
+                const base64String = Buffer.from(scheduleItem.dps[dpCodes.mix_rgbcw], 'base64').toString('hex')
+                state.mixActions = dp2Obj(base64String)
+            }
+
+            if (scheduleItem.dps[dpCodes.scene_data] !== undefined) {
+                state.actionScene = sencePp2Obj(scheduleItem.dps[dpCodes.scene_data], !!props.isFanLamp)
+                state.isManual = false
+            }
+            if (scheduleItem.dps[dpCodes.mix_light_scene] !== undefined) {
+                const sceneDp = scheduleItem.dps[dpCodes.mix_light_scene]
+                state.actionScene = Buffer.from(sceneDp, 'base64').toString('hex')
+                state.isManual = false
+            }
+
         } else {
             const date = new Date();
             state.hour = toFixed(date.getHours(), 2);
             state.minute = toFixed(date.getMinutes(), 2);
-            state.skillList = dps.map(item => ({
-                ...item,
-                enable: true
-            }))
+            // 当dps长度只有1个的时候或者是mixLight灯时默认选中,
+            if(!showClearIcon()){
+                state.selectedSkill = dps.map(item => ({
+                    ...item,
+                    enable: true
+                }))
+            }else{
+                state.skillList = dps.map(item => ({
+                    ...item,
+                    enable: true
+                }))
+            }            
         }
     }, [])
 
@@ -105,11 +178,12 @@ const TimeScheduleEditPage = () => {
         const params = {
             time: [state.hour, state.minute].join(':'),
             loops: state.loop.join(''),
-            dps: getSendDps(),
+            dps: getAllDps(),
             aliasName: state.name,
             status: true,
             notification: state.isNotification,
         }
+
         if (scheduleItem) {
             NativeApi.editTimer(
                 devId,
@@ -139,21 +213,148 @@ const TimeScheduleEditPage = () => {
     };
 
     const getSendDps = () => {
-        let dp = {}
-        state.selectedSkill.forEach(item => {
-            dp = {
-                ...dp,
-                ...state.dpsValue[item.dpId],
-                [item.dpId]: item.enable
+
+        if (state.isManual) {
+            if (props.isDIMLamp) {
+                return {
+                    [dpCodes.bright_value]: state.singleActions.brightness * 10,
+                };
+            } else if (props.isFanLamp) {
+                let v = {}
+                const hasFan = !!state.selectedSkill.find(item => item.value.includes('fan'))
+                const hasLight = !!state.selectedSkill.find(item => item.value.includes('light'))
+                if (hasFan) {
+                    v = {
+                        ...v,
+                        [dpCodes.fan_mode]: state.singleActions.fanMode,
+                        [dpCodes.fan_speed]: state.singleActions.fanSpeed
+                    }
+                }
+                if (hasLight) {
+                    v = {
+                        ...v,
+                        [dpCodes.work_mode]: WHITE,
+                        [dpCodes.bright_value]: state.singleActions.brightness * 10,
+                        [dpCodes.temp_value]: state.singleActions.temperature * 10,
+                    }
+                }
+                return v
+            } if (props.isTWLamp) {
+                return {
+                    [dpCodes.work_mode]: WHITE,
+                    [dpCodes.bright_value]: state.singleActions.brightness * 10,
+                    [dpCodes.temp_value]: state.singleActions.temperature * 10,
+                };
+            } if (props.isRGBWLamp) {
+                if (state.singleActions.isColor) {
+                    const colorString = getHexByHSV({
+                        h: state.singleActions.h,
+                        s: state.singleActions.s * 10,
+                        v: state.singleActions.v * 10,
+                    });
+                    return {
+                        [dpCodes.work_mode]: COLOUR,
+                        [dpCodes.colour_data]: colorString,
+                    };
+                }
+                return {
+                    [dpCodes.work_mode]: WHITE,
+                    [dpCodes.temp_value]: state.singleActions.temperature * 10,
+                    [dpCodes.bright_value]: state.singleActions.brightness * 10,
+                };
+
+            } else if (props.isMixRGBWLamp) {
+                const dpsString = obj2Dp(state.mixActions);
+                return {
+                    [dpCodes.switch_led]: true,
+                    [dpCodes.mix_rgbcw]: Buffer.from(dpsString, 'hex').toString('base64'),
+                };
+            } else if (props.isGlassRGBWLamp) {
+                const colorString = getHexByHSV({
+                    h: state.singleActions.h,
+                    s: state.singleActions.s * 10,
+                    v: state.singleActions.v * 10,
+                });
+                return {
+                    [dpCodes.work_mode]: COLOUR,
+                    [dpCodes.colour_data]: colorString,
+                };
+            } else if (props.isGARDOT) {
+                const colorString = getHexByHSV({
+                    h: state.singleActions.h,
+                    s: state.singleActions.s * 10,
+                    v: state.singleActions.v * 10,
+                });
+                return {
+                    [dpCodes.work_mode]: COLOUR,
+                    [dpCodes.colour_data]: colorString,
+                };
+            } else {
+                const colorString = getHexByHSV({
+                    h: state.singleActions.h,
+                    s: state.singleActions.s * 10,
+                    v: state.singleActions.v * 10,
+                });
+                return {
+                    [dpCodes.switch_led]: true,
+                    [dpCodes.colour_data]: colorString,
+                };
             }
-        })
-        return dp
+        } else {
+            if (props.isMixRGBWLamp) {
+                const v = {
+                    [dpCodes.mix_light_scene]: Buffer.from(state.actionScene?.value, 'hex').toString('base64'),
+                    [dpCodes.switch_led]: true,
+                    [dpCodes.work_mode]: SCENE
+                }
+                return props.isFanLamp ? {
+                    ...v,
+                    [dpCodes.fan_switch]: state.actionScene.fanEnable,
+                    [dpCodes.fan_speed]: state.actionScene.fanSpeed
+                } : v;
+            } else {
+                const v = {
+                    [dpCodes.switch_led]: true,
+                    [dpCodes.scene_data]: senceObj2Dp({ id: Number(state?.actionScene?.id), nodes: state?.actionScene?.nodes }, !!props.isFanLamp),
+                    [dpCodes.work_mode]: SCENE,
+                }
+                return props.isFanLamp ? {
+                    ...v,
+                    [dpCodes.fan_switch]: state.actionScene.fanEnable,
+                    [dpCodes.fan_speed]: state.actionScene.fanSpeed
+                } :  v;
+            }
+        }
+
+    }
+
+    const getAllDps = () => {
+        const incommingValue = props.getDpValue ? props.getDpValue({
+            singleActions: state.singleActions,
+            mixActions: state.mixActions,
+            actionScene: state.actionScene,
+            isManual: state.isManual
+        }) : ''
+        const dpsValue = incommingValue || getSendDps()
+        if (state.isManual && !props.isMixRGBWLamp) {
+            let v = {}
+            state.selectedSkill.forEach(skill => {
+                v[skill.dpId] = skill.enable
+            })
+            return {
+                ...v,
+                ...dpsValue
+            }
+        } else {
+            return dpsValue
+        }
     }
 
-    const setSendDps = useCallback((dp: string,dps: Record<string, any>) =>{
-        state.dpsValue[dp] = dps
+    const setSendDps = useCallback((actions, type) => {
+        state[type] = actions
     }, [])
 
+    console.log(state?.actionScene, '< --- actionScenen')
     const renderItem = ({ item }) => {
         return (
             <View style={{
@@ -173,9 +374,9 @@ const TimeScheduleEditPage = () => {
                 >
                     {item.label}
                 </Text>
-                <TouchableOpacity onPress={() => handelSkill('lower', item)}>
+                {showClearIcon() && <TouchableOpacity onPress={() => handelSkill('lower', item)}>
                     <Image style={{ width: cx(16), height: cx(16), marginRight: cx(5) }} source={res.ic_arrows_nav_clear} />
-                </TouchableOpacity>
+                </TouchableOpacity>}
             </View>
         );
     };
@@ -194,16 +395,20 @@ const TimeScheduleEditPage = () => {
         return !!state.selectedSkill.length
     }
 
-    const changeSkillEnable = (dpId:string, enable: boolean) =>{
+    const changeSkillEnable = (dpId: string, enable: boolean) => {
         state.selectedSkill = state.selectedSkill.map((skill) => {
-            if(dpId === skill.dpId){
+            if (dpId === skill.dpId) {
                 skill.enable = enable
             }
             return skill
         })
     }
-    
 
+    const showClearIcon = () =>{
+        return dps.length > 1 && !props.isMixRGBWLamp
+    }
+
+    console.log(scheduleItem, '< --- scheduleItem')
     return (
         <Page
             backText={I18n.getLang('motion_detection_add_time_schedule_system_back_text')}
@@ -281,14 +486,30 @@ const TimeScheduleEditPage = () => {
                     <View>
                         <Text style={styles.itemTitle}>{I18n.getLang('timeschedule_add_schedule_subheadline2_text')}</Text>
                     </View>
-                    <DeviceState 
+                    <DeviceState
+                        singleActions={state.singleActions}
+                        mixActions={state.mixActions}
+                        actionScene={state.actionScene}
                         dpCodes={dpCodes}
-                        dps={state.selectedSkill}
+                        dps={state.skillList}
+                        selectedDps={state.selectedSkill}
                         scheduleItem={scheduleItem}
                         isManual={state.isManual}
                         setIsManual={(v) => state.isManual = v}
                         setSendDps={setSendDps}
                         changeSkillEnable={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}
                     />
                     {!hasSelected() && <View style={{ flexDirection: 'row', alignItems: 'center' }}>
                         <Image style={{ width: cx(16), height: cx(16), tintColor: '#FF9500' }} source={res.ic_warning_amber} />

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

@@ -1,7 +1,13 @@
+import { JudgeTimeScheduleProps } from './TimeScheduleBean';
 export type dpItem = {
     label: string;
     value: string;
     dpId: string;
 };
+export interface TimeSchedulePageRouteParams extends JudgeTimeScheduleProps {
+    dps: dpItem[];
+    dpCodes: Record<string, string>;
+    getDpValue: (v: any) => any;
+}
 declare const TimeSchedulePage: () => any;
 export default TimeSchedulePage;

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from 'react'
-import {RouteProp, useRoute} from '@react-navigation/core'
+import { useRoute} from '@react-navigation/core'
 import Page from '@ledvance/base/src/components/Page'
 import Tag from '@ledvance/base/src/components/Tag'
 import { useDeviceInfo, useTimeSchedule } from '@ledvance/base/src/models/modules/NativePropsSlice'
@@ -15,6 +15,7 @@ import { showDialog } from '@ledvance/base/src/utils/common'
 import { useReactive } from 'ahooks'
 import { cloneDeep } from 'lodash'
 import { ui_biz_routerKey } from 'navigation/Routers'
+import { JudgeTimeScheduleProps } from './TimeScheduleBean'
 
 const { convertX: cx } = Utils.RatioUtils
 
@@ -24,18 +25,19 @@ export type dpItem = {
     dpId: string
 }
 
-type TimeSchedulePageRouteParams = {
-    params: { dps: dpItem[], dpCodes: Record<string,string>}
+export interface TimeSchedulePageRouteParams extends JudgeTimeScheduleProps{
+    dps: dpItem[],
+    dpCodes: Record<string,string>
+    getDpValue: (v:any) => any
 }
 
-type Props = {
-    route: RouteProp<TimeSchedulePageRouteParams, 'params'>
-}
 
 const TimeSchedulePage = () => {
     const deviceInfo = useDeviceInfo()
     const navigation = useNavigation()
-    const { dps, dpCodes } = useRoute<Props['route']>().params
+    const props = useRoute().params as TimeSchedulePageRouteParams
+    console.log(props, '< --- propssss')
+    const { dps, dpCodes } = props
     const state = useReactive({
         timeScheduleList: [] as any[],
         filterScheduleList: [] as any[],
@@ -68,12 +70,11 @@ const TimeSchedulePage = () => {
         navigation.navigate(path, {
             name: path,
             scheduleItem: item,
-            dpCodes,
-            dps,
             reloadData: getTimerScheduleList,
             deleteDialog: (item:any) =>{
                 return deleteDialog(item)
-            }
+            },
+            ...props
         })
     }, [state.timeScheduleList])
 

package/src/modules/timeSchedule/mix/MixLightActions.d.ts

@@ -0,0 +1,3 @@
+import { MixLightBean } from "./MixLightBean";
+export declare function obj2Dp(obj: MixLightBean): string;
+export declare function dp2Obj(dp: string): MixLightBean;

package/src/modules/timeSchedule/mix/MixLightActions.ts

@@ -0,0 +1,50 @@
+import { spliceByStep } from "@ledvance/base/src/utils/common"
+import { MixLightBean } from "./MixLightBean"
+
+export function obj2Dp(obj: MixLightBean): string {
+    const powerSwitchDpValueArray = ['0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0']
+    if (obj.whiteLightSwitch) {
+        powerSwitchDpValueArray[15] = '1'
+    }
+    if (obj.colorLightSwitch) {
+        powerSwitchDpValueArray[14] = '1'
+    }
+    if (obj.mixRgbcwEnabled) {
+        powerSwitchDpValueArray[13] = '1'
+    }
+    const powerSwitchDpValueBinary = powerSwitchDpValueArray.join('')
+    const powerSwitchDpValue = parseInt(powerSwitchDpValueBinary, 2).toString(16).padStart(4, '0')
+    const hueDpValue = obj.hue.toString(16).padStart(4, '0')
+    const satDpValue = (obj.sat * 10).toString(16).padStart(4, '0')
+    const lightnessDpValue = (obj.lightness * 10).toString(16).padStart(4, '0')
+    const brightnessDpValue = (obj.brightness * 10).toString(16).padStart(4, '0')
+    const colorTempDpValue = (obj.colorTempPercent * 10).toString(16).padStart(4, '0')
+    return powerSwitchDpValue + hueDpValue + satDpValue + lightnessDpValue + brightnessDpValue + colorTempDpValue
+}
+
+export function dp2Obj(dp: string): MixLightBean {
+    if (!dp) {
+        return {
+            whiteLightSwitch: true,
+            colorLightSwitch: true,
+            mixRgbcwEnabled: true,
+            hue: 360,
+            sat: 100,
+            lightness: 100,
+            brightness: 100,
+            colorTempPercent: 100,
+        }
+    }
+    const dpValueArray = spliceByStep(dp, 4)
+    const powerSwitch = parseInt(dpValueArray[0], 16).toString(2).padStart(16, '0')
+    return {
+        whiteLightSwitch: powerSwitch[15] === '1',
+        colorLightSwitch: powerSwitch[14] === '1',
+        mixRgbcwEnabled: powerSwitch[13] === '1',
+        hue: parseInt(dpValueArray[1], 16),   // 色相 0-360
+        sat: parseInt(dpValueArray[2], 16) / 10,    // 饱和度 0-100
+        lightness: parseInt(dpValueArray[3], 16) / 10,    // 明度 0-100
+        brightness: parseInt(dpValueArray[4], 16) / 10,    // 亮度 0-100
+        colorTempPercent: parseInt(dpValueArray[5], 16) / 10,    // 色温 0-100
+    }
+}

package/src/modules/timeSchedule/mix/MixLightView.d.ts

@@ -1,7 +1,8 @@
 interface MixLightViewProps {
+    mixActions: any;
     scheduleItem: any;
     dpCodes: Record<string, string>;
-    setSendDps: (dpId: string, dp: Record<string, any>) => void;
+    setSendDps: (actions: any, type: string) => void;
 }
 export default function MixLightView(props: MixLightViewProps): any;
 export {};

package/src/modules/timeSchedule/mix/MixLightView.tsx

@@ -14,44 +14,38 @@ import LdvSaturation from '@ledvance/base/src/components/ldvSaturation'
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
 import { mapFloatToRange } from '@ledvance/base/src/utils'
 import { Buffer } from 'buffer';
-import { dp2Obj, obj2Dp } from '../../scene/SceneAction'
+import { dp2Obj, obj2Dp } from './MixLightActions'
 
 const { convertX: cx } = Utils.RatioUtils
 
 interface MixLightViewProps {
+    mixActions: any
     scheduleItem: any
     dpCodes: Record<string, string>
-    setSendDps: (dpId: string, dp: Record<string,any>) => void
+    setSendDps: (actions:any, type:string) => void
 }
 
 export default function MixLightView(props: MixLightViewProps) {
     const { scheduleItem, dpCodes, setSendDps } = props
     const state = useReactive({
         actionMix: {
-            whiteLightSwitch: true,
-            colorLightSwitch: false,
-            mixRgbcwEnabled: true,
-            hue: 360,
-            sat: 100,
-            lightness: 100,
-            brightness: 100,
-            colorTempPercent: 100,
+            ...props.mixActions
         },
         flag: Symbol(),
     })
 
-    useEffect(() => {
-        if (scheduleItem) {
-            if (scheduleItem.dps[dpCodes.mix_rgbcw] !== undefined) {
-                const base64String = Buffer.from(scheduleItem.dps[dpCodes.mix_rgbcw], 'base64').toString('hex')
-                state.actionMix = dp2Obj(base64String)
-            }
-        }
-    }, [])
+    // useEffect(() => {
+    //     if (scheduleItem) {
+    //         if (scheduleItem.dps[dpCodes.mix_rgbcw] !== undefined) {
+    //             const base64String = Buffer.from(scheduleItem.dps[dpCodes.mix_rgbcw], 'base64').toString('hex')
+    //             state.actionMix = dp2Obj(base64String)
+    //         }
+    //     }
+    // }, [])
 
     useEffect(() =>{
-        const dp = getSendDps()
-        setSendDps('mix',dp)
+        // const dp = getSendDps()
+        setSendDps(state.actionMix, 'mixActions')
     }, [state.flag])
 
     const getSendDps = () =>{
@@ -73,6 +67,7 @@ export default function MixLightView(props: MixLightViewProps) {
                         enable={state.actionMix.whiteLightSwitch}
                         setEnable={async value => {
                             state.actionMix.whiteLightSwitch = value
+                            state.flag = Symbol()
                         }} />
                     {state.actionMix.whiteLightSwitch && (<View>
                         <View style={[styles.shadeBg]}>
@@ -122,6 +117,7 @@ export default function MixLightView(props: MixLightViewProps) {
                         enable={state.actionMix.colorLightSwitch}
                         setEnable={value => {
                             state.actionMix.colorLightSwitch = value
+                            state.flag = Symbol()
                         }} />
 
                     {state.actionMix.colorLightSwitch && (