@ledvance/ui-biz-bundle 1.0.13 → 1.0.14

package/package.json

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

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,73 @@ 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 {
     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: (dpId: string, dp: Record<string, any>) => 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 && props.selectedDps.find(dp => dp.value.includes('light')))
     }
-    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
                     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}
+                    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
+                                dpCodes={props.dpCodes}
+                                dps={props.dps}
+                                scheduleItem={props.scheduleItem}
+                                setSendDps={props.setSendDps}
+                                changeSkillEnable={props.changeSkillEnable}
+                            />
+                    }
+                </View>
             }
         </View>
     )

package/src/modules/timeSchedule/ManualSetting.tsx

@@ -4,9 +4,10 @@ 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";
 
 
-interface ManualSettingProps {
+interface ManualSettingProps extends JudgeTimeScheduleProps{
     scheduleItem: any
     dps: ScheduleItemDp[]
     dpCodes: Record<string, string>
@@ -35,6 +36,17 @@ const ManualSetting = (props: ManualSettingProps) => {
                         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/SingleLightView.tsx

@@ -1,7 +1,6 @@
 import React, { useCallback, useEffect } from 'react'
 import { View } from 'react-native'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
-import { isDIMLamp, isGARDOT, isGlassRGBWLamp, isOnlyRGBLamp, isRGBLamp, isRGBWLamp, isTWLamp, isSupportBrightness, isSupportTemperature, isSupportMode, isFanLamp } from '@ledvance/base/src/utils/Support'
 import { Utils } from 'tuya-panel-kit'
 import { useReactive } from 'ahooks'
 import { getHSVByHex, getHexByHSV, hsv2Hex } from '@ledvance/base/src/utils'
@@ -14,10 +13,11 @@ import { COLOUR, WHITE, modeOptions } from '../../hooks/DeviceDpStateHooks'
 import { ScheduleItemDp } from './TimeScheduleEditpage'
 import FanAdjustView from '@ledvance/base/src/components/FanAdjustView'
 import { useFanMaxSpeed } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { JudgeTimeScheduleProps } from './TimeScheduleBean'
 
 const { convertX: cx } = Utils.RatioUtils
 
-interface SingleLightViewProps {
+interface SingleLightViewProps extends JudgeTimeScheduleProps {
     scheduleItem: any
     dpCodes: Record<string, string>
     dp: ScheduleItemDp
@@ -26,7 +26,7 @@ interface SingleLightViewProps {
 }
 
 export default function SingleLightView(props: SingleLightViewProps) {
-    const { scheduleItem, dpCodes, dp, setSendDps, setEnable } = props
+    const { scheduleItem, dpCodes, dp, setSendDps, setEnable, isDIMLamp, isGARDOT, isGlassRGBWLamp, isOnlyRGBLamp, isRGBLamp, isRGBWLamp, isTWLamp, isSupportBrightness, isSupportTemperature, isFanLamp, isSupportMode } = props
     const state = useReactive({
         enable: true,
         isColor: true,
@@ -70,11 +70,11 @@ export default function SingleLightView(props: SingleLightViewProps) {
     }, [state.flag])
 
     const getSendDps = () => {
-        if (isDIMLamp(dpCodes)) {
+        if (isDIMLamp) {
             return {
                 [dpCodes.bright_value]: state.brightness * 10,
             };
-        } else if (isFanLamp(dpCodes)) {
+        } else if (isFanLamp) {
             const v = dp.value.includes('fan') ? {
                 [dpCodes.fan_mode]: state.fanMode,
                 [dpCodes.fan_speed]: state.fanSpeed
@@ -84,13 +84,13 @@ export default function SingleLightView(props: SingleLightViewProps) {
                 [dpCodes.temp_value]: state.temperature * 10,
             }
             return v
-        } else if (isTWLamp(dpCodes)) {
+        } else if (isTWLamp) {
             return {
                 [dpCodes.work_mode]: WHITE,
                 [dpCodes.bright_value]: state.brightness * 10,
                 [dpCodes.temp_value]: state.temperature * 10,
             };
-        } else if (isRGBWLamp(dpCodes)) {
+        } else if (isRGBWLamp) {
             if (state.isColor) {
                 const colorString = getHexByHSV({
                     h: state.h,
@@ -108,7 +108,7 @@ export default function SingleLightView(props: SingleLightViewProps) {
                 [dpCodes.bright_value]: state.brightness * 10,
             };
 
-        } else if (isGlassRGBWLamp(dpCodes)) {
+        } else if (isGlassRGBWLamp) {
             const colorString = getHexByHSV({
                 h: state.h,
                 s: state.s * 10,
@@ -118,7 +118,7 @@ export default function SingleLightView(props: SingleLightViewProps) {
                 [dpCodes.work_mode]: COLOUR,
                 [dpCodes.colour_data]: colorString,
             };
-        } else if (isGARDOT(dpCodes)) {
+        } else if (isGARDOT) {
             const colorString = getHexByHSV({
                 h: state.h,
                 s: state.s * 10,
@@ -211,19 +211,19 @@ export default function SingleLightView(props: SingleLightViewProps) {
 
     const getColorBlockColor = useCallback(() => {
         const s = Math.round(mapFloatToRange(state.s / 100, 30, 100))
-        if (isOnlyRGBLamp(dpCodes)) {
+        if (isOnlyRGBLamp) {
             return hsv2Hex(state.h, s, 100)
         }
-        if (isTWLamp(dpCodes)) {
+        if (isTWLamp) {
             return cctToColor(state.temperature.toFixed())
         }
-        if (isDIMLamp(dpCodes)) {
+        if (isDIMLamp) {
             return '#fff'
         }
         if (state.isColor) {
             return hsv2Hex(state.h, s, 100)
         }
-        if (isSupportTemperature(dpCodes)) {
+        if (isSupportTemperature) {
             return cctToColor(state.temperature.toFixed())
         }
     }, [state.temperature])
@@ -240,13 +240,13 @@ export default function SingleLightView(props: SingleLightViewProps) {
                         setEnable={setEnableStateAction} />
                     {state.enable &&
                         <LampAdjustView
-                            isDIMLamp={isDIMLamp(dpCodes)}
-                            isRGBLamp={isRGBLamp(dpCodes)}
-                            isOnlyRGBLamp={isOnlyRGBLamp(dpCodes)}
-                            isTWLamp={isTWLamp(dpCodes)}
-                            isRGBWLamp={isRGBWLamp(dpCodes)}
-                            isSupportBrightness={isSupportBrightness(dpCodes)}
-                            isSupportTemperature={isSupportTemperature(dpCodes)}
+                            isDIMLamp={isDIMLamp}
+                            isRGBLamp={isRGBLamp}
+                            isOnlyRGBLamp={isOnlyRGBLamp}
+                            isTWLamp={isTWLamp}
+                            isRGBWLamp={isRGBWLamp}
+                            isSupportBrightness={!!isSupportBrightness}
+                            isSupportTemperature={!!isSupportTemperature}
                             isColorMode={state.isColor}
                             setIsColorMode={setWorkModeStateAction}
                             h={state.h}
@@ -265,7 +265,7 @@ export default function SingleLightView(props: SingleLightViewProps) {
                 </View> :
                 props.dp.value.includes('fan') ?
                     <FanAdjustView
-                        isSupportMode={isSupportMode(props.dpCodes)}
+                        isSupportMode={isSupportMode}
                         modeValue={state.fanMode}
                         fanEnable={state.fanEnable}
                         fanSpeed={state.fanSpeed}

package/src/modules/timeSchedule/TimeScheduleBean.ts

@@ -0,0 +1,13 @@
+export interface JudgeTimeScheduleProps {
+    isDIMLamp?: boolean
+    isGARDOT?: boolean
+    isGlassRGBWLamp?: boolean
+    isOnlyRGBLamp?: boolean
+    isRGBLamp?: boolean
+    isRGBWLamp?: boolean
+    isTWLamp?: boolean
+    isSupportBrightness?: boolean
+    isSupportTemperature?: boolean
+    isFanLamp?: boolean
+    isSupportMode?: boolean
+}

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -18,6 +18,7 @@ import { useReactive } from 'ahooks';
 import { dpItem } from "./TimeSchedulePage";
 import { differenceBy } from "lodash";
 import DeviceState from "./DeviceState";
+import { JudgeTimeScheduleProps } from "./TimeScheduleBean";
 
 const { convertX: cx } = Utils.RatioUtils
 
@@ -26,7 +27,7 @@ export interface ScheduleItemDp extends dpItem {
     enable: boolean
 }
 
-interface TimeScheduleEditPageParams {
+interface TimeScheduleEditPageParams extends JudgeTimeScheduleProps {
     scheduleItem: any,
     dps: ScheduleItemDp[]
     dpCodes: Record<any, any>
@@ -38,7 +39,8 @@ 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',
@@ -283,12 +285,24 @@ const TimeScheduleEditPage = () => {
                     </View>
                     <DeviceState 
                         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}
+                        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.tsx

@@ -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,18 @@ 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>
 }
 
-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 +69,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.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.tsx

@@ -14,7 +14,7 @@ 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