@ledvance/ui-biz-bundle 1.1.69 → 1.1.71

package/src/modules/timeSchedule/ScheduleScene.tsx

@@ -1,145 +1,145 @@
-import React, { useCallback, useEffect } from 'react'
-import I18n from '@ledvance/base/src/i18n'
-import { getRemoteSceneList } from '../scene/SceneAction'
-import { isUVCFanDevice, useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
-import { useReactive } from 'ahooks'
-import { ScenePageUIState, SceneUIState } from '../scene/SceneInfo'
-import res from '@ledvance/base/src/res'
-import { FlatList, StyleSheet, View } from 'react-native'
-import Spacer from '@ledvance/base/src/components/Spacer'
-import Tag from '@ledvance/base/src/components/Tag'
-import { Utils } from 'tuya-panel-kit'
-import InfoText from '@ledvance/base/src/components/InfoText'
-import MoodItem from '../mood/MoodItem'
-import { isEmpty } from 'lodash'
-
-const cx = Utils.RatioUtils.convertX
-
-interface MoodUIState extends ScenePageUIState {
-  staticTagChecked: boolean
-  dynamicTagChecked: boolean
-  filteredMoods: SceneUIState[]
-}
-
-
-const ScheduleScene = ({ scene, setScene, isOnlyRGBLamp, isDIMLamp, isRGBLamp, isRGBWLamp, isTWLamp, isFanLamp }) => {
-  const deviceInfo = useDeviceInfo()
-  const isUVCFan = isUVCFanDevice()
-  const state = useReactive<MoodUIState>({
-    currentScene: undefined,
-    staticTagChecked: true,
-    dynamicTagChecked: true,
-    scenes: [],
-    flag: Symbol(),
-    filteredMoods: [],
-  })
-
-  const getSceneList = useCallback(async () => {
-    const res = await getRemoteSceneList(deviceInfo.devId,{
-      isOnlyRGBLamp,
-      isDIMLamp,
-      isRGBLamp,
-      isRGBWLamp,
-      isTWLamp,
-      isFanLamp
-    }, isUVCFan)
-    if (res.success) {
-      state.scenes = res.data || []
-      state.currentScene = isEmpty(scene) ? state.scenes[0] : scene
-      setScene(state.currentScene)
-    }
-  }, [])
-
-  useEffect(() => {
-    state.filteredMoods = state.scenes.filter(item => {
-      return (state.staticTagChecked && state.dynamicTagChecked) ||
-        (state.staticTagChecked && item.nodes.length < 2) ||
-        (state.dynamicTagChecked && item.nodes.length > 1)
-    })
-  }, [state.staticTagChecked, state.dynamicTagChecked, state.scenes])
-
-
-  useEffect(() => {
-    getSceneList().then()
-  }, [state.flag])
-
-  return (
-    <>
-      <View style={styles.tagLine}>
-        <Tag
-          checked={state.staticTagChecked}
-          text={I18n.getLang('mood_overview_filter_name_text1')}
-          onCheckedChange={checked => {
-            state.staticTagChecked = checked
-          }}/>
-        <Spacer width={cx(8)} height={0}/>
-        <Tag
-          checked={state.dynamicTagChecked}
-          text={I18n.getLang('mood_overview_filter_name_text2')}
-          onCheckedChange={checked => {
-            state.dynamicTagChecked = checked
-          }}/>
-      </View>
-      <Spacer height={cx(10)}/>
-      <FlatList
-        data={state.filteredMoods}
-        renderItem={({ item }) => {
-          return (
-            <MoodItem
-              style={{ marginHorizontal: cx(8) }}
-              enable={state.currentScene?.id === item.id}
-              mood={item}
-              onSwitch={async _ => {
-                state.currentScene = item
-                setScene(item)
-              }}/>
-          )
-        }}
-        ListHeaderComponent={() => (<Spacer height={cx(10)}/>)}
-        ItemSeparatorComponent={() => (<Spacer/>)}
-        ListFooterComponent={() => (
-          <View style={styles.infoLine}>
-            <Spacer/>
-            <InfoText
-              icon={res.ic_info}
-              text={I18n.getLang('mood_overview_information_text')}/>
-            <Spacer height={cx(40)}/>
-          </View>
-        )}
-        keyExtractor={item => `${item.id}`}/>
-    </>
-  )
-}
-
-const styles = StyleSheet.create({
-  tagLine: {
-    flexDirection: 'row',
-    // marginHorizontal: cx(24),
-    marginTop: cx(16),
-  },
-  infoLine: {
-    // marginHorizontal: cx(24),
-  },
-  addMoodPopover: {
-    width: cx(171),
-    height: cx(90.5),
-    marginStart: cx(156),
-    marginTop: cx(105),
-    backgroundColor: '#fff',
-  },
-  popoverItem: {
-    width: cx(171),
-    height: cx(45),
-    alignItems: 'flex-start',
-  },
-  popoverItemText: {
-    color: '#000',
-    fontSize: cx(16),
-  },
-  line: {
-    height: .5,
-    backgroundColor: 'rgba(60,60,67,.36)',
-  },
-})
-
+import React, { useCallback, useEffect } from 'react'
+import I18n from '@ledvance/base/src/i18n'
+import { getRemoteSceneList } from '../scene/SceneAction'
+import { isUVCFanDevice, useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useReactive } from 'ahooks'
+import { ScenePageUIState, SceneUIState } from '../scene/SceneInfo'
+import res from '@ledvance/base/src/res'
+import { FlatList, StyleSheet, View } from 'react-native'
+import Spacer from '@ledvance/base/src/components/Spacer'
+import Tag from '@ledvance/base/src/components/Tag'
+import { Utils } from 'tuya-panel-kit'
+import InfoText from '@ledvance/base/src/components/InfoText'
+import MoodItem from '../mood/MoodItem'
+import { isEmpty } from 'lodash'
+
+const cx = Utils.RatioUtils.convertX
+
+interface MoodUIState extends ScenePageUIState {
+  staticTagChecked: boolean
+  dynamicTagChecked: boolean
+  filteredMoods: SceneUIState[]
+}
+
+
+const ScheduleScene = ({ scene, setScene, isOnlyRGBLamp, isDIMLamp, isRGBLamp, isRGBWLamp, isTWLamp, isFanLamp }) => {
+  const deviceInfo = useDeviceInfo()
+  const isUVCFan = isUVCFanDevice()
+  const state = useReactive<MoodUIState>({
+    currentScene: undefined,
+    staticTagChecked: true,
+    dynamicTagChecked: true,
+    scenes: [],
+    flag: Symbol(),
+    filteredMoods: [],
+  })
+
+  const getSceneList = useCallback(async () => {
+    const res = await getRemoteSceneList(deviceInfo.devId,{
+      isOnlyRGBLamp,
+      isDIMLamp,
+      isRGBLamp,
+      isRGBWLamp,
+      isTWLamp,
+      isFanLamp
+    }, isUVCFan)
+    if (res.success) {
+      state.scenes = res.data || []
+      state.currentScene = isEmpty(scene) ? state.scenes[0] : scene
+      setScene(state.currentScene)
+    }
+  }, [])
+
+  useEffect(() => {
+    state.filteredMoods = state.scenes.filter(item => {
+      return (state.staticTagChecked && state.dynamicTagChecked) ||
+        (state.staticTagChecked && item.nodes.length < 2) ||
+        (state.dynamicTagChecked && item.nodes.length > 1)
+    })
+  }, [state.staticTagChecked, state.dynamicTagChecked, state.scenes])
+
+
+  useEffect(() => {
+    getSceneList().then()
+  }, [state.flag])
+
+  return (
+    <>
+      <View style={styles.tagLine}>
+        <Tag
+          checked={state.staticTagChecked}
+          text={I18n.getLang('mood_overview_filter_name_text1')}
+          onCheckedChange={checked => {
+            state.staticTagChecked = checked
+          }}/>
+        <Spacer width={cx(8)} height={0}/>
+        <Tag
+          checked={state.dynamicTagChecked}
+          text={I18n.getLang('mood_overview_filter_name_text2')}
+          onCheckedChange={checked => {
+            state.dynamicTagChecked = checked
+          }}/>
+      </View>
+      <Spacer height={cx(10)}/>
+      <FlatList
+        data={state.filteredMoods}
+        renderItem={({ item }) => {
+          return (
+            <MoodItem
+              style={{ marginHorizontal: cx(8) }}
+              enable={state.currentScene?.id === item.id}
+              mood={item}
+              onSwitch={async _ => {
+                state.currentScene = item
+                setScene(item)
+              }}/>
+          )
+        }}
+        ListHeaderComponent={() => (<Spacer height={cx(10)}/>)}
+        ItemSeparatorComponent={() => (<Spacer/>)}
+        ListFooterComponent={() => (
+          <View style={styles.infoLine}>
+            <Spacer/>
+            <InfoText
+              icon={res.ic_info}
+              text={I18n.getLang('mood_overview_information_text')}/>
+            <Spacer height={cx(40)}/>
+          </View>
+        )}
+        keyExtractor={item => `${item.id}`}/>
+    </>
+  )
+}
+
+const styles = StyleSheet.create({
+  tagLine: {
+    flexDirection: 'row',
+    // marginHorizontal: cx(24),
+    marginTop: cx(16),
+  },
+  infoLine: {
+    // marginHorizontal: cx(24),
+  },
+  addMoodPopover: {
+    width: cx(171),
+    height: cx(90.5),
+    marginStart: cx(156),
+    marginTop: cx(105),
+    backgroundColor: '#fff',
+  },
+  popoverItem: {
+    width: cx(171),
+    height: cx(45),
+    alignItems: 'flex-start',
+  },
+  popoverItemText: {
+    color: '#000',
+    fontSize: cx(16),
+  },
+  line: {
+    height: .5,
+    backgroundColor: 'rgba(60,60,67,.36)',
+  },
+})
+
 export default ScheduleScene

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

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

package/src/modules/timeSchedule/SingleLightView.tsx

@@ -1,176 +1,176 @@
-import React, { useCallback, memo } from 'react'
-import { View } from 'react-native'
-import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
-import { Utils } from 'tuya-panel-kit'
-import { useReactive, useUpdateEffect } from 'ahooks'
-import { hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils'
-import I18n from '@ledvance/base/src/i18n'
-import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
-import Card from '@ledvance/base/src/components/Card'
-import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
-import { 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'
-import { cloneDeep } from 'lodash'
-
-const { convertX: cx } = Utils.RatioUtils
-
-interface SingleLightViewProps extends JudgeTimeScheduleProps {
-  singleActions: any
-  scheduleItem: any
-  dpCodes: Record<string, string>
-  dp: ScheduleItemDp
-  setSendDps: (actions: any, type: string) => void
-  setEnable: (dpId: string, enable: boolean) => void
-}
-
-const SingleLightView = (props: SingleLightViewProps) =>{
-  const {
-    dp,
-    setSendDps,
-    setEnable,
-    isSupportColor,
-    isSupportBrightness,
-    isSupportTemperature,
-    isSupportMode,
-  } = props
-  const state = useReactive({
-    actions: cloneDeep(props.singleActions),
-    flag: Symbol(),
-  })
-
-  useUpdateEffect(() => {
-    state.actions = cloneDeep(props.singleActions)
-  }, [JSON.stringify(props.singleActions)])
-
-  useUpdateEffect(() => {
-    setSendDps(state.actions, 'singleActions')
-  }, [state.flag])
-
-
-  const setHSVState = useCallback((h, s, v) => {
-    state.actions.h = h
-    state.actions.s = s
-    state.actions.v = v
-  }, [])
-
-  const setTemperatureState = useCallback(temperature => {
-    state.actions.temperature = temperature
-  }, [])
-
-  const setBrightnessState = useCallback(brightness => {
-    state.actions.brightness = brightness
-  }, [])
-
-
-  const setEnableStateAction = useCallback(async (enable) => {
-    state.actions.enable = enable
-    setEnable(dp.dpId, enable)
-    state.flag = Symbol()
-  }, [])
-
-  const setWorkModeStateAction = useCallback(async isColorMode => {
-    state.actions.isColor = isColorMode
-    state.flag = Symbol()
-
-  }, [])
-
-  const setColourStateAction = useCallback(async (h, s, v) => {
-    setHSVState(h, s, v)
-    state.flag = Symbol()
-  }, [])
-
-  const setTemperatureStateAction = useCallback(async (cct: number) => {
-    setTemperatureState(cct)
-    state.flag = Symbol()
-  }, [])
-
-  const setBrightnessStateAction = useCallback(async brightness => {
-    setBrightnessState(brightness)
-    state.flag = Symbol()
-  }, [])
-
-
-  const getColorBlockColor = useCallback(() => {
-    const s = Math.round(mapFloatToRange(state.actions.s / 100, 30, 100))
-    if(!!isSupportColor && state.actions.isColor){
-      return hsv2Hex(state.actions.h, s, 100)
-    }
-    if(!!isSupportTemperature){
-      return cctToColor(state.actions.temperature.toFixed())
-    }
-    return '#fff'
-  }, [state.actions.temperature])
-
-  return (
-    <Card style={{ marginVertical: cx(12) }}>
-      {props.dp.value.includes('light') ?
-        <View>
-          <LdvSwitch
-            title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
-            color={getColorBlockColor()}
-            colorAlpha={1}
-            enable={state.actions.enable}
-            setEnable={setEnableStateAction}/>
-          {state.actions.enable &&
-              <LampAdjustView
-                  isSupportColor={!!isSupportColor}
-                  isSupportBrightness={!!isSupportBrightness}
-                  isSupportTemperature={!!isSupportTemperature}
-                  isColorMode={state.actions.isColor}
-                  setIsColorMode={setWorkModeStateAction}
-                  h={state.actions.h}
-                  s={state.actions.s}
-                  v={state.actions.v}
-                  reserveSV={true}
-                  onHSVChange={setHSVState}
-                  onHSVChangeComplete={setColourStateAction}
-                  colorTemp={state.actions.temperature}
-                  brightness={state.actions.brightness}
-                  onCCTChange={setTemperatureState}
-                  onCCTChangeComplete={setTemperatureStateAction}
-                  onBrightnessChange={setBrightnessState}
-                  onBrightnessChangeComplete={setBrightnessStateAction}
-                // min={1}
-              />}
-        </View> :
-        props.dp.value.includes('fan') ?
-          <FanAdjustView
-            isSupportMode={isSupportMode}
-            modeValue={state.actions.fanMode}
-            fanEnable={state.actions.fanEnable}
-            fanSpeed={state.actions.fanSpeed}
-            maxFanSpeed={useFanMaxSpeed()}
-            modeOptions={modeOptions}
-            modeChange={mode => {
-              state.actions.fanMode = mode
-              state.flag = Symbol()
-            }}
-            onFanSwitch={fanEnable => {
-              state.actions.fanEnable = fanEnable
-              setEnable(dp.dpId, fanEnable)
-            }}
-            onFanSpeedChange={fanSpeed => {
-              state.actions.fanSpeed = fanSpeed
-            }}
-            onFanSpeedChangeComplete={fanSpeed => {
-              state.actions.fanSpeed = fanSpeed
-              state.flag = Symbol()
-            }}
-
-          /> :
-          <LdvSwitch
-            title={dp.label}
-            enable={dp.enable}
-            setEnable={(v: boolean) => setEnable(dp.dpId, v)}
-            color={''}
-            colorAlpha={1}
-          />
-      }
-    </Card>
-  )
-}
-
+import React, { useCallback, memo } from 'react'
+import { View } from 'react-native'
+import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
+import { Utils } from 'tuya-panel-kit'
+import { useReactive, useUpdateEffect } from 'ahooks'
+import { hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils'
+import I18n from '@ledvance/base/src/i18n'
+import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
+import Card from '@ledvance/base/src/components/Card'
+import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
+import { 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'
+import { cloneDeep } from 'lodash'
+
+const { convertX: cx } = Utils.RatioUtils
+
+interface SingleLightViewProps extends JudgeTimeScheduleProps {
+  singleActions: any
+  scheduleItem: any
+  dpCodes: Record<string, string>
+  dp: ScheduleItemDp
+  setSendDps: (actions: any, type: string) => void
+  setEnable: (dpId: string, enable: boolean) => void
+}
+
+const SingleLightView = (props: SingleLightViewProps) =>{
+  const {
+    dp,
+    setSendDps,
+    setEnable,
+    isSupportColor,
+    isSupportBrightness,
+    isSupportTemperature,
+    isSupportMode,
+  } = props
+  const state = useReactive({
+    actions: cloneDeep(props.singleActions),
+    flag: Symbol(),
+  })
+
+  useUpdateEffect(() => {
+    state.actions = cloneDeep(props.singleActions)
+  }, [JSON.stringify(props.singleActions)])
+
+  useUpdateEffect(() => {
+    setSendDps(state.actions, 'singleActions')
+  }, [state.flag])
+
+
+  const setHSVState = useCallback((h, s, v) => {
+    state.actions.h = h
+    state.actions.s = s
+    state.actions.v = v
+  }, [])
+
+  const setTemperatureState = useCallback(temperature => {
+    state.actions.temperature = temperature
+  }, [])
+
+  const setBrightnessState = useCallback(brightness => {
+    state.actions.brightness = brightness
+  }, [])
+
+
+  const setEnableStateAction = useCallback(async (enable) => {
+    state.actions.enable = enable
+    setEnable(dp.dpId, enable)
+    state.flag = Symbol()
+  }, [])
+
+  const setWorkModeStateAction = useCallback(async isColorMode => {
+    state.actions.isColor = isColorMode
+    state.flag = Symbol()
+
+  }, [])
+
+  const setColourStateAction = useCallback(async (h, s, v) => {
+    setHSVState(h, s, v)
+    state.flag = Symbol()
+  }, [])
+
+  const setTemperatureStateAction = useCallback(async (cct: number) => {
+    setTemperatureState(cct)
+    state.flag = Symbol()
+  }, [])
+
+  const setBrightnessStateAction = useCallback(async brightness => {
+    setBrightnessState(brightness)
+    state.flag = Symbol()
+  }, [])
+
+
+  const getColorBlockColor = useCallback(() => {
+    const s = Math.round(mapFloatToRange(state.actions.s / 100, 30, 100))
+    if(!!isSupportColor && state.actions.isColor){
+      return hsv2Hex(state.actions.h, s, 100)
+    }
+    if(!!isSupportTemperature){
+      return cctToColor(state.actions.temperature.toFixed())
+    }
+    return '#fff'
+  }, [state.actions.temperature])
+
+  return (
+    <Card style={{ marginVertical: cx(12) }}>
+      {props.dp.value.includes('light') ?
+        <View>
+          <LdvSwitch
+            title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
+            color={getColorBlockColor()}
+            colorAlpha={1}
+            enable={state.actions.enable}
+            setEnable={setEnableStateAction}/>
+          {state.actions.enable &&
+              <LampAdjustView
+                  isSupportColor={!!isSupportColor}
+                  isSupportBrightness={!!isSupportBrightness}
+                  isSupportTemperature={!!isSupportTemperature}
+                  isColorMode={state.actions.isColor}
+                  setIsColorMode={setWorkModeStateAction}
+                  h={state.actions.h}
+                  s={state.actions.s}
+                  v={state.actions.v}
+                  reserveSV={true}
+                  onHSVChange={setHSVState}
+                  onHSVChangeComplete={setColourStateAction}
+                  colorTemp={state.actions.temperature}
+                  brightness={state.actions.brightness}
+                  onCCTChange={setTemperatureState}
+                  onCCTChangeComplete={setTemperatureStateAction}
+                  onBrightnessChange={setBrightnessState}
+                  onBrightnessChangeComplete={setBrightnessStateAction}
+                // min={1}
+              />}
+        </View> :
+        props.dp.value.includes('fan') ?
+          <FanAdjustView
+            isSupportMode={isSupportMode}
+            modeValue={state.actions.fanMode}
+            fanEnable={state.actions.fanEnable}
+            fanSpeed={state.actions.fanSpeed}
+            maxFanSpeed={useFanMaxSpeed()}
+            modeOptions={modeOptions}
+            modeChange={mode => {
+              state.actions.fanMode = mode
+              state.flag = Symbol()
+            }}
+            onFanSwitch={fanEnable => {
+              state.actions.fanEnable = fanEnable
+              setEnable(dp.dpId, fanEnable)
+            }}
+            onFanSpeedChange={fanSpeed => {
+              state.actions.fanSpeed = fanSpeed
+            }}
+            onFanSpeedChangeComplete={fanSpeed => {
+              state.actions.fanSpeed = fanSpeed
+              state.flag = Symbol()
+            }}
+
+          /> :
+          <LdvSwitch
+            title={dp.label}
+            enable={dp.enable}
+            setEnable={(v: boolean) => setEnable(dp.dpId, v)}
+            color={''}
+            colorAlpha={1}
+          />
+      }
+    </Card>
+  )
+}
+
 export default memo(SingleLightView)