@ledvance/ui-biz-bundle 1.1.35 → 1.1.37

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -57,7 +57,19 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
           setDps({ [flagCode]: hex})
         }, idx * 50)
       })
-      return setDps({ [extra.switchLedCode]: true, [extra.workModeCode]: WORK_MODE.COLOUR})
+      const extraDps = {}
+      if(extra.isCeilingLight){
+        extraDps[extra.switchLedCode] = true,
+        extraDps[extra.rgbcSwitchLedCode!] = true
+        extraDps[extra.rgbcWorkModeCode!] = WORK_MODE.COLOUR
+        extraDps[extra.workModeCode] = WORK_MODE.WHITE
+        extraDps[extra.brightValueCode!] = flagItem.whiteColors[0]?.brightness * 10
+        extraDps[extra.temperatureCode!] = flagItem.whiteColors[0]?.colorTemp * 10
+      }else{
+        extraDps[extra.switchLedCode] = true 
+        extraDps[extra.workModeCode] = WORK_MODE.COLOUR
+      }
+      return setDps(extraDps)
     } else {
       const hex = obj2Dp(flagItem, extra)
       return setDps({ [flagCode]: hex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
@@ -69,6 +81,7 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
 export interface FlagOption {
   isMixLight?: boolean
   isStringLight?: boolean
+  isCeilingLight?: boolean
   workModeCode: string
 }
 
@@ -129,8 +142,8 @@ export function obj2Dp(flagItem: FlagItemInfo, option?: FlagOption): string {
   } else {
     const switchingIntervalHex = nToHS(flagItem.speed)
     const transitionTimeHex = nToHS(flagItem.speed)
-    const transitionModeHex = nToHS(flagItem.mode)
-    const hex = idHex + flagItem.colors.map(color => {
+    const transitionModeHex = nToHS(option?.isCeilingLight ? SceneNodeTransitionMode.Static : flagItem.mode)
+    const colorHex = flagItem.colors.map(color => {
       const hHex = nToHS(Math.round(color.h), 4)
       const sHex = nToHS(Math.round(color.s * 10), 4)
       const vHex = nToHS(Math.round(color.v * 10), 4)
@@ -138,6 +151,9 @@ export function obj2Dp(flagItem: FlagItemInfo, option?: FlagOption): string {
       const colorTempHex = '0000'
       return switchingIntervalHex + transitionTimeHex + transitionModeHex + hHex + sHex + vHex + brightnessHex + colorTempHex
     }).join('')
+    const whiteColor = flagItem.whiteColors[0]
+    const whiteHex = switchingIntervalHex + transitionTimeHex + transitionModeHex + '0000' + '0000' + '0000' + nToHS(whiteColor?.brightness * 10, 4) + nToHS(whiteColor?.colorTemp * 10, 4)
+    const hex = idHex + (option?.isCeilingLight ? whiteHex : colorHex)
     return hex
   }
 }

package/src/modules/flags/FlagEditPage.tsx

@@ -158,7 +158,7 @@ const FlagEditPage = () => {
             <Spacer height={cx(16)} />
             <View style={styles.lightLine}>
               <Text style={styles.light}>
-                {I18n.getLang(params.moduleParams.isSupportMixScene ? 'light_sources_tile_sec_lighting_headline' : params.moduleParams.isCeilingLight ? 'ceiling_light_title_lighting_headline' : 'light_sources_tile_tw_lighting_headline')}
+                {I18n.getLang((params.moduleParams.isSupportMixScene || params.moduleParams.isCeilingLight) ? 'light_sources_tile_sec_lighting_headline' : 'light_sources_tile_tw_lighting_headline')}
               </Text>
             </View>
             <Spacer height={cx(10)} />

package/src/modules/flags/FlagInfo.tsx

@@ -292,7 +292,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 0, s: 0, v: 100}, {h: 218, s: 100, v: 100}, {h: 360, s: 100, v: 100}]
+    colors: [{h: 218, s: 100, v: 100},{h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 232,
@@ -587,7 +587,7 @@ export const def2FlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 0, s: 0, v: 100}, {h: 231, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 360, s: 100, v: 100}]
+    colors: [{h: 231, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 232,
@@ -881,7 +881,7 @@ export const def3FlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 0, s: 0, v: 100}, {h: 218, s: 100, v: 100}, {h: 360, s: 100, v: 100}]
+    colors: [{h: 218, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 232,

package/src/modules/flags/FlagPage.tsx

@@ -27,6 +27,7 @@ export interface FlagPageProps {
   isSupportTemperature?: boolean
   isStringLight?: boolean
   isStripLight?: boolean
+  isCeilingLight?: boolean
   isSupportMixScene?: boolean
   drawToolLight?: { 
     drawToolCode: string
@@ -37,6 +38,10 @@ export interface FlagPageProps {
   sceneDataCode?: string
   workModeCode: string
   switchLedCode: string
+  rgbcWorkModeCode?: string 
+  rgbcSwitchLedCode?: string 
+  brightValueCode?: string 
+  temperatureCode?: string 
 }
 
 const FlagPage = () => {
@@ -48,9 +53,10 @@ const FlagPage = () => {
   const [moods, setMoods] = useMoods()
   const [flags, setFlags] = useFlags()
   const [flagMode, setFlagMode] = useFlagMode()
-  const [flagState, setFlag] = useFlag((params.isStripLight ? params?.drawToolLight?.drawToolCode : params.sceneDataCode)!!, {
+  const [flagState, setFlag] = useFlag(((params.isStripLight || params.isCeilingLight) ? params?.drawToolLight?.drawToolCode : params.sceneDataCode)!!, {
     isMixLight: params.isSupportMixScene,
     isStringLight: params.isStringLight,
+    isCeilingLight: params.isCeilingLight,
     ...params
   })
   const state = useReactive({
@@ -74,7 +80,7 @@ const FlagPage = () => {
     return -1
   }, [JSON.stringify(flagState), JSON.stringify(state.flags), flagMode])
 
-
+  console.log(flags, '< --- flags')
   useEffect(() => {
     if(!devInfo.devId) return 
     if(!flags?.length){
@@ -216,7 +222,7 @@ const FlagPage = () => {
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
-          enable={flagMode?.flagMode && dps[params.workModeCode] === (params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === item.id}
+          enable={flagMode?.flagMode && dps[params.workModeCode] === (params.isCeilingLight ? WORK_MODE.WHITE : params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === item.id}
           title={item.name}
           icon={item.icon}
           colors={params.isStripLight ? item.colors.map(item => hsv2Hex(item.h, item.s, item.v)).reverse() : item.colors.map(item => hsv2Hex(item.h, item.s, item.v))}

package/src/modules/mood/MixMood/AddMixMoodPage.tsx

@@ -0,0 +1,333 @@
+import React from 'react'
+import { FlatList, StyleSheet, Text, View } from 'react-native'
+import { MixSceneInfo } from './MixSceneBeans'
+import Page from '@ledvance/base/src/components/Page'
+import { Utils } from 'tuya-panel-kit'
+import { useNavigation, useRoute } from '@react-navigation/native'
+import { useCreation, useReactive } from 'ahooks'
+import I18n from '@ledvance/base/src/i18n'
+import Spacer from '@ledvance/base/src/components/Spacer'
+import RecommendMixMoodItem from './RecommendMixMoodItem'
+import { SceneNodeTransitionMode } from '@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo'
+import { ui_biz_routerKey } from '../../../navigation/Routers'
+import { difference, last, map, range } from 'lodash'
+import { Result } from '@ledvance/base/src/models/modules/Result'
+import { MixMoodPageProps } from './MixMoodPage'
+
+const cx = Utils.RatioUtils.convertX
+
+export interface AddMixMoodPageParams {
+  isStatic: boolean,
+  mixMoods: MixSceneInfo[],
+  modDeleteFlag: (mode: 'add' | 'edit' | 'del', isStatic: boolean, currentMood: MixSceneInfo) => Promise<Result<any>>
+  moduleParams: MixMoodPageProps
+}
+
+interface RecommendMixMood {
+  title: string
+  mixMood?: MixSceneInfo
+}
+
+interface AddMoodPageState {
+  recommendMixMoods: RecommendMixMood[]
+}
+
+const AddMixMoodPage = () => {
+  const navigation = useNavigation()
+  const routeParams = useRoute().params as AddMixMoodPageParams
+  const { mainId, secondlyId } = useCreation(() => {
+    const mixMoods: any[] = []
+    routeParams.mixMoods.forEach(mix => {
+      mixMoods.push(mix.mainLamp)
+      mixMoods.push(mix.secondlyLamp)
+    })
+    const useIds = map(mixMoods, 'id')
+    const idRange = range(0, 256)
+    const mainId: number = last(difference(idRange, useIds)) || -1
+    useIds.push(mainId)
+    const secondlyId: number = last(difference(idRange, useIds)) || -1
+    return { mainId, secondlyId }
+  }, [routeParams.mixMoods])
+  const state = useReactive<AddMoodPageState>({
+    recommendMixMoods: getRecommendMixMoods(routeParams.isStatic, mainId, secondlyId),
+  })
+
+  return (
+    <Page
+      backText={I18n.getLang('add_new_static_mood_system_back')}
+      headlineText={I18n.getLang(routeParams.isStatic ? 'add_new_static_mood_headline_text' : 'add_new_dynamic_mood_headline_text')}>
+      <View style={styles.root}>
+        <Text style={styles.desc}>
+          {I18n.getLang(routeParams.isStatic ? 'add_new_static_mood_description_text' : 'add_new_dynamic_mood_description_text')}
+        </Text>
+        <FlatList
+          style={{ flex: 1 }}
+          data={state.recommendMixMoods}
+          renderItem={({ item }) => {
+            return (
+              <RecommendMixMoodItem
+                title={item.title}
+                mixMood={item.mixMood}
+                isStatic={routeParams.isStatic}
+                onPress={() => {
+                  const params = {
+                    mode: 'add',
+                    isStatic: routeParams.isStatic,
+                    currentMood: !!item.mixMood ? item.mixMood : newMixMood(mainId, secondlyId, routeParams.isStatic),
+                    moods: routeParams.mixMoods,
+                    modDeleteFlag: routeParams.modDeleteFlag,
+                    moduleParams: routeParams.moduleParams
+                  }
+                  navigation.navigate(ui_biz_routerKey.ui_biz_mix_mood_edit, params)
+                }} />
+            )
+          }}
+          ItemSeparatorComponent={() => <Spacer />}
+          ListHeaderComponent={() => <Spacer />}
+          ListFooterComponent={() => <Spacer />}
+          keyExtractor={item => item.title} />
+      </View>
+    </Page>
+  )
+}
+
+const defSecondly = {
+  version: 0,
+  expand: 0,
+  reserved1: 0,
+  reserved2: 0,
+  segmented: 0,
+  loop: 0,
+  excessive: 0,
+  direction: 0,
+}
+
+function newMixMood(mainId: number, secondlyId: number, isStatic: boolean): MixSceneInfo {
+  return {
+    name: '',
+    mainLamp: {
+      id: mainId,
+      speed: 100,
+      mode: isStatic ? SceneNodeTransitionMode.Static : 1,
+      nodes: [
+        { h: 0, s: 0, v: 0, brightness: 100, colorTemp: 0 },
+        { h: 0, s: 0, v: 0, brightness: 100, colorTemp: 0 }
+      ]
+    },
+    secondlyLamp: {
+      ...defSecondly,
+      id: secondlyId,
+      speed: 100,
+      mode: 10,
+      nodes: [
+        { h: 0, s: 100, v: 100, brightness: 0, colorTemp: 0, isColorNode: true },
+        { h: 0, s: 100, v: 100, brightness: 0, colorTemp: 0, isColorNode: true }
+      ]
+    }
+  }
+}
+
+function getRecommendMixMoods(isStatic: boolean, mainId: number, secondlyId: number): RecommendMixMood[] {
+  console.log(mainId, secondlyId, '< -- mainId secondlyId')
+  if (isStatic) {
+    return [
+      {
+        title: I18n.getLang('add_new_static_mood_field_headline_text1'),
+      },
+      {
+        title: I18n.getLang('add_new_static_mood_field_headline_text2'),
+        mixMood: {
+          name: I18n.getLang('add_new_static_mood_field_headline_text2'),
+          mainLamp: {
+            id: mainId,
+            mode: SceneNodeTransitionMode.Static,
+            speed: 0,
+            nodes: [
+              { h: 0, s: 0, v: 0, brightness: 100, colorTemp: 20 }
+            ]
+          },
+          secondlyLamp: {
+            ...defSecondly,
+            id: -1,
+            speed: 100,
+            mode: 10,
+            nodes: []
+          }
+        },
+      },
+      {
+        title: I18n.getLang('add_new_dynamic_mood_field_headline_text3'),
+        mixMood: {
+          name: I18n.getLang('add_new_dynamic_mood_field_headline_text3'),
+          mainLamp: {
+            id: mainId,
+            mode: SceneNodeTransitionMode.Static,
+            speed: 0,
+            nodes: [
+              { h: 0, s: 0, v: 0, brightness: 100, colorTemp: 40 },
+            ]
+          },
+          secondlyLamp: {
+            ...defSecondly,
+            id: -1,
+            speed: 100,
+            mode: 10,
+            nodes: []
+          }
+        },
+      },
+      {
+        title: I18n.getLang('add_new_static_mood_field_headline_text4'),
+        mixMood: {
+          name: I18n.getLang('add_new_static_mood_field_headline_text4'),
+          mainLamp: {
+            id: mainId,
+            mode: SceneNodeTransitionMode.Static,
+            speed: 0,
+            nodes: [
+              { h: 0, s: 0, v: 0, brightness: 100, colorTemp: 50 },
+            ]
+          },
+          secondlyLamp: {
+            ...defSecondly,
+            id: -1,
+            speed: 100,
+            mode: 10,
+            nodes: []
+          }
+        },
+      },
+    ]
+  }
+  return [
+    {
+      title: I18n.getLang('add_new_static_mood_field_headline_text1'),
+    },
+    {
+      title: I18n.getLang('add_new_static_mood_field_headline_text2'),
+      mixMood: {
+        name: I18n.getLang('add_new_static_mood_field_headline_text2'),
+        mainLamp: {
+          id: mainId,
+          speed: 14,
+          mode: SceneNodeTransitionMode.Jump,
+          nodes: [
+            { h: 0, s: 0, v: 0, brightness: 30, colorTemp: 30 },
+            { h: 0, s: 0, v: 0, brightness: 60, colorTemp: 60 },
+            { h: 0, s: 0, v: 0, brightness: 90, colorTemp: 90 }
+          ]
+        },
+        secondlyLamp: {
+          ...defSecondly,
+          id: secondlyId,
+          speed: 14,
+          mode: 10,
+          nodes: [
+            { h: 60, s: 20, v: 100, brightness: 0, colorTemp: 0, isColorNode: true },
+            { h: 180, s: 40, v: 100, brightness: 0, colorTemp: 0, isColorNode: true },
+            { h: 300, s: 60, v: 100, brightness: 0, colorTemp: 0, isColorNode: true },
+          ]
+        },
+      },
+    },
+    // {
+    //   title: I18n.getLang('add_new_dynamic_mood_field_headline_text3'),
+    //   mixMood: {
+    //     name: I18n.getLang('add_new_dynamic_mood_field_headline_text3'),
+    //     image: '',
+    //     value: '',
+    //     version: 0,
+    //     id: id,
+    //     lamps: [
+    //       {
+    //         enable: true,
+    //         type: 2,
+    //         nodes: [
+    //           {
+    //             intervalTime: 14,
+    //             changeTime: 14,
+    //             changeType: SceneNodeTransitionMode.Jump,
+    //             hue: 0,
+    //             sat: 0,
+    //             lightness: 0,
+    //             brightness: 100,
+    //             colorTemp: 30,
+    //           },
+    //           {
+    //             intervalTime: 14,
+    //             changeTime: 14,
+    //             changeType: SceneNodeTransitionMode.Jump,
+    //             hue: 0,
+    //             sat: 0,
+    //             lightness: 0,
+    //             brightness: 100,
+    //             colorTemp: 60,
+    //           },
+    //           {
+    //             intervalTime: 14,
+    //             changeTime: 14,
+    //             changeType: SceneNodeTransitionMode.Jump,
+    //             hue: 0,
+    //             sat: 0,
+    //             lightness: 0,
+    //             brightness: 100,
+    //             colorTemp: 90,
+    //           },
+    //         ],
+    //       },
+    //       {
+    //         enable: true,
+    //         type: 3,
+    //         nodes: [
+    //           {
+    //             intervalTime: 14,
+    //             changeTime: 14,
+    //             changeType: SceneNodeTransitionMode.Gradient,
+    //             hue: 330,
+    //             sat: 50,
+    //             lightness: 100,
+    //             brightness: 0,
+    //             colorTemp: 0,
+    //           },
+    //           {
+    //             intervalTime: 14,
+    //             changeTime: 14,
+    //             changeType: SceneNodeTransitionMode.Gradient,
+    //             hue: 270,
+    //             sat: 50,
+    //             lightness: 100,
+    //             brightness: 0,
+    //             colorTemp: 0,
+    //           },
+    //           {
+    //             intervalTime: 14,
+    //             changeTime: 14,
+    //             changeType: SceneNodeTransitionMode.Gradient,
+    //             hue: 210,
+    //             sat: 50,
+    //             lightness: 100,
+    //             brightness: 0,
+    //             colorTemp: 0,
+    //           },
+    //         ],
+    //       },
+    //     ],
+    //   },
+    // },
+  ]
+}
+
+const styles = StyleSheet.create({
+  root: {
+    flex: 1,
+    flexDirection: 'column',
+  },
+  desc: {
+    color: '#000',
+    fontSize: cx(16),
+    marginHorizontal: cx(24),
+    marginTop: cx(12),
+  },
+})
+
+export default AddMixMoodPage

package/src/modules/mood/MixMood/MixMoodActions.ts

@@ -0,0 +1,128 @@
+import { NativeApi } from "@ledvance/base/src/api/native"
+import { parseJSON } from "@tuya/tuya-panel-lamp-sdk/lib/utils"
+import { MixSceneInfo, getMixSceneList } from './MixSceneBeans'
+import { RemoteSceneInfo } from '../../scene/SceneInfo'
+import { stripObj2Dp, stripDp2Obj } from '../../scene/SceneAction'
+import { hex2Int, spliceByStep } from "@ledvance/base/src/utils/common"
+import { MixMainLampInfo, MixSceneNodeInfo } from './MixSceneBeans'
+
+export const getRemoteMixScene = async (devId: string, featureId = 'SimplifyScene') => {
+  const res = await NativeApi.getJson(devId, featureId)
+  const isNormalData = Array.isArray(parseJSON(res?.data))
+  if (res.success && isNormalData) {
+    return {
+      success: true,
+      data: JSON.parse(res.data)?.map(item => remoteMixSceneInfo2SceneUIState(item)),
+    }
+  } else {
+    if (res.msg?.includes('资源未找到') || !isNormalData) {
+      const defaultScene = getMixSceneList()
+      const res = await NativeApi.putJson(devId, featureId, JSON.stringify(defaultScene))
+      if (res.success) {
+        return {
+          success: true,
+          data: defaultScene.map(item => remoteMixSceneInfo2SceneUIState(item))
+        }
+      }
+      return { success: false }
+    }
+    return { success: false }
+  }
+}
+
+export const saveMixMood = (devId: string, scenes: MixSceneInfo[], featureId = 'SimplifyScene') => {
+  const newScenes: RemoteSceneInfo[] = scenes.map(s => {
+    const { mainLamp, secondlyLamp, name } = s
+    return {
+      n: name,
+      i: mainLamp.nodes?.length ? obj2Dp(mainLamp) : '',
+      s: secondlyLamp.nodes?.length ? stripObj2Dp(secondlyLamp) : '',
+      t: 0,
+      e: false,
+    }
+  })
+  console.log(newScenes, '< --- newScenes')
+  return NativeApi.putJson(devId, featureId, JSON.stringify(newScenes))
+}
+
+export function obj2Dp(scene: MixMainLampInfo): string {
+  const idHex = scene.id.toString(16).padStart(2, '0')
+  const hex = idHex + scene.nodes?.map(node => {
+    const switchingIntervalHex = scene.speed.toString(16).padStart(2, '0')
+    const transitionTimeHex = scene.speed.toString(16).padStart(2, '0')
+    const transitionModeHex = scene.mode.toString(16).padStart(2, '0')
+    const hHex = node.h.toString(16).padStart(4, '0')
+    const sHex = (node.s * 10).toString(16).padStart(4, '0')
+    const vHex = (node.v * 10).toString(16).padStart(4, '0')
+    const brightnessHex = (node.brightness * 10).toString(16).padStart(4, '0')
+    const colorTempHex = (node.colorTemp * 10).toString(16).padStart(4, '0')
+    return switchingIntervalHex + transitionTimeHex + transitionModeHex + hHex + sHex + vHex + brightnessHex + colorTempHex
+  }).join('')
+  return hex
+}
+
+const defScene = {
+  id: -1,
+  mode: 0,
+  nodes: [],
+  speed: 100
+}
+
+export function dp2Obj(dp: string): MixMainLampInfo {
+  if (!dp) return defScene
+  let dpCopy = dp
+  const id = hex2Int(dpCopy.slice(0, 2))
+  let speed = 100
+  let mode = 0
+  dpCopy = dpCopy.slice(2)
+  const nodes: MixSceneNodeInfo[] = spliceByStep(dpCopy, 26).map(nodeHex => {
+    let hex = nodeHex
+    speed = hex2Int(hex.slice(0, 2))
+    hex = hex.slice(2)
+    speed = hex2Int(hex.slice(0, 2))
+    hex = hex.slice(2)
+    mode = hex2Int(hex.slice(0, 2))
+    hex = hex.slice(2)
+    const h = hex2Int(hex.slice(0, 4))
+    hex = hex.slice(4)
+    const s = Math.round(hex2Int(hex.slice(0, 4)) / 10)
+    hex = hex.slice(4)
+    const v = Math.round(hex2Int(hex.slice(0, 4)) / 10)
+    hex = hex.slice(4)
+    const brightness = Math.round(hex2Int(hex.slice(0, 4)) / 10)
+    hex = hex.slice(4)
+    const colorTemp = Math.round(hex2Int(hex.slice(0, 4)) / 10)
+    return {
+      h,
+      s,
+      v,
+      brightness,
+      colorTemp,
+    }
+  })
+  return {
+    id,
+    nodes,
+    speed,
+    mode
+  }
+}
+
+const remoteMixSceneInfo2SceneUIState = (remoteScene: RemoteSceneInfo): MixSceneInfo => {
+  return {
+    name: remoteScene.n,
+    mainLamp: remoteScene.i ? dp2Obj(remoteScene.i) : defScene,
+    secondlyLamp: remoteScene.s ? stripDp2Obj(remoteScene.s) : {
+      ...defScene, 
+      version: 0,
+      expand: 0,
+      reserved1: 0,
+      reserved2: 0,
+      segmented: 0,
+      loop: 0,
+      excessive: 0,
+      direction: 0,
+    }
+  }
+}
+