@ledvance/group-ui-biz-bundle 1.0.13 → 1.0.15

package/package.json

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

package/src/modules/flags/FlagEditPage.tsx

@@ -65,7 +65,7 @@ const FlagEditPage = () => {
   }, [state.currentNode, state.currentWhiteNode])
 
   const nameRepeat = useMemo(() => {
-    return !!find(params.moods, m => (m.id !== state.mood.id && m.name === state.mood.name))
+    return !!find(params.moods, m => (m.id !== state.mood.id && m.name === state.mood.name && state.mood.name !== ''))
   }, [state.mood.name])
 
   return (

package/src/modules/flags/FlagInfo.tsx

@@ -300,7 +300,7 @@ export const defFlagList: FlagUiInfo[] = [
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
     speed: 70,
-    name: I18n.getLang('flag_leverkusen'),
+    name: '',
     icon: res.leverkusen_icon,
     whiteColors: [
       { brightness: 100, colorTemp: 0},

package/src/modules/flags/FlagItem.tsx

@@ -28,8 +28,8 @@ export default function FlagItem(props: RecommendMoodItemProps) {
         <Spacer height={cx(16)} />
         <View style={styles.headline}>
           <View style={{ flexDirection: 'row', flex: 1, paddingRight: cx(5), justifyContent: 'flex-start' }}>
-            <Text style={styles.headText}>{props.title}</Text>
-            {props.icon && <Image source={icon} style={{ width: cx(60), aspectRatio: 2.14, marginRight: cx(10) }} />}
+            {props.title ? <Text style={styles.headText}>{props.title}</Text> : undefined}
+            {props.icon ? <Image source={icon} style={{ width: cx(60), aspectRatio: 2.14, marginRight: cx(10) }} /> : undefined}
           </View>
           <SwitchButton
             thumbStyle={{ elevation: 0 }}

package/src/modules/mood/MoodPage.tsx

@@ -33,6 +33,7 @@ interface MoodPageUIState extends ScenePageUIState {
 export interface MoodPageProps {
   switchLedDpCode: string
   sceneDataDpCode: string
+  mixSceneDataDpCode: string
   workModeDpCode: string
   isSupportFan?: boolean
   isSupportUVC?: boolean
@@ -182,6 +183,7 @@ const MoodPage = () => {
       return setScene({
         scene: cloneDeep(mood),
         sceneDataDpCode: params.sceneDataDpCode,
+        mixSceneDataDpCode: params.mixSceneDataDpCode,
         workModeDpCode: params.workModeDpCode,
         workMode: mood ? WorkMode.Scene : (params.isSupportColor ? WorkMode.Colour : WorkMode.White),
         switchLedDpCode: params.switchLedDpCode
@@ -251,14 +253,14 @@ const MoodPage = () => {
         <Spacer height={cx(10)} />
         {
           state.scenes.length >= MAX_MOOD_COUNT &&
-          <View style={styles.infoLine}>
-            <Spacer height={cx(10)} />
-            <InfoText
-              icon={res.ic_warning_amber}
-              text={Strings.getLang('mood_overview_warning_max_number_text')}
-              contentColor={'#ff9500'} />
-            <Spacer height={cx(6)} />
-          </View>
+            <View style={styles.infoLine}>
+                <Spacer height={cx(10)} />
+                <InfoText
+                    icon={res.ic_warning_amber}
+                    text={Strings.getLang('mood_overview_warning_max_number_text')}
+                    contentColor={'#ff9500'} />
+                <Spacer height={cx(6)} />
+            </View>
         }
         <FlatList
           // @ts-ignore
@@ -277,6 +279,7 @@ const MoodPage = () => {
                   await setScene({
                     scene: cloneDeep(item),
                     sceneDataDpCode: params.sceneDataDpCode,
+                    mixSceneDataDpCode: params.mixSceneDataDpCode,
                     workModeDpCode: params.workModeDpCode,
                     workMode: WorkMode.Scene,
                     switchLedDpCode: params.switchLedDpCode
@@ -334,4 +337,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default MoodPage
+export default MoodPage

package/src/modules/mood/SceneAction.ts

@@ -1,24 +1,25 @@
-import { useState } from 'react'
-import { useUpdateEffect } from 'ahooks'
-import { Result } from '@ledvance/base/src/models/modules/Result'
+import {useState} from 'react'
+import {useUpdateEffect} from 'ahooks'
+import {Result} from '@ledvance/base/src/models/modules/Result'
 import {
-  getDefSceneList,
   getDefFantasyScene,
+  getDefSceneList,
   RemoteSceneInfo,
   SceneInfo,
   SceneNodeInfo,
   SceneUIState,
-  StripSceneUIState,
-  StripSceneInfo,
   StripNodeInfo,
+  StripSceneInfo,
+  StripSceneUIState,
 } from './SceneInfo'
-import { NativeApi } from '@ledvance/base/src/api/native'
-import { hex2Int, spliceByStep } from '@ledvance/base/src/utils/common'
-import { useDps, useFeatureHook } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {NativeApi} from '@ledvance/base/src/api/native'
+import {hex2Int, spliceByStep} from '@ledvance/base/src/utils/common'
+import {useDps, useFeatureHook} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import res from '@ledvance/base/src/res'
-import { Utils } from '@tuya/tuya-panel-lamp-sdk'
-import { parseJSON } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
-import { WorkMode } from "@ledvance/base/src/utils/interface"
+import {Utils} from '@tuya/tuya-panel-lamp-sdk'
+import {parseJSON} from '@tuya/tuya-panel-lamp-sdk/lib/utils'
+import {WorkMode} from "@ledvance/base/src/utils/interface"
+
 const { nToHS, toFixed, sToN } = Utils
 
 export function useWorkMode(): [WorkMode, (value: WorkMode) => Promise<Result<any>>] {
@@ -31,6 +32,7 @@ export function useSwitchLed(): [boolean, (value: boolean) => Promise<Result<any
 
 interface SceneDataType {
   sceneDataDpCode: string
+  mixSceneDataDpCode: string
   scene?: SceneUIState
   workModeDpCode: string
   workMode: WorkMode
@@ -55,8 +57,14 @@ export function useScene(params: LightType): [SceneDataType | undefined, (scene?
       const isFantasy = params.isStringLight || params.isStripLight
       console.log(scene.scene, isFantasy, '< --- scene')
       const dps = {}
-      // @ts-ignore
-      dps[scene.sceneDataDpCode] = scene.scene ? (isFantasy ? stripObj2Dp(scene.scene, params.isStringLight) : obj2Dp(scene.scene, params.isSupportFan, params.isSupportUVC)) : ''
+      if (scene.sceneDataDpCode && scene.scene) {
+        // @ts-ignore
+        dps[scene.sceneDataDpCode] = isFantasy ? stripObj2Dp(scene.scene, params.isStringLight) : obj2Dp(scene.scene, params.isSupportFan, params.isSupportUVC)
+      }
+      if (scene.mixSceneDataDpCode && scene.scene) {
+        // @ts-ignore
+        dps[scene.mixSceneDataDpCode] = mixScene2Dp(scene.scene)
+      }
       dps[scene.workModeDpCode] = scene.workMode
       dps[scene.switchLedDpCode] = true
       console.log(dps, '< --- dpss')
@@ -245,6 +253,50 @@ export function obj2Dp(scene: SceneInfo, isFan: boolean = false, isUVCFan?: bool
   return hex
 }
 
+export function mixScene2Dp(scene: SceneInfo) {
+  if (!scene.speed) {
+    scene.speed = 12
+  }
+  if (!scene.mode) {
+    scene.mode = 0
+  }
+  const versionHex = Number(0).toString(16).padStart(2, '0')
+  const sceneNoHex = scene.id.toString(16).padStart(2, '0')
+  const onlyColor = scene.nodes.some(node => node.isColorNode)
+  const onlyWhite = scene.nodes.some(node => !node.isColorNode)
+
+  let whiteHex = ''
+  if (onlyColor) {
+    whiteHex = '0000'
+  } else {
+    whiteHex += '01' + scene.nodes.length.toString(16).padStart(2, '0') + Number(2).toString(16).padStart(2, '0') + scene.nodes.map(node => {
+      let nodeHex = ''
+      nodeHex += scene.speed.toString(16).padStart(2, '0')
+      nodeHex += scene.speed.toString(16).padStart(2, '0')
+      nodeHex += scene.mode.toString(16).padStart(2, '0')
+      nodeHex += (node.brightness * 10).toString(16).padStart(4, '0')
+      nodeHex += (node.colorTemp * 10).toString(16).padStart(4, '0')
+      return nodeHex
+    }).join('')
+  }
+  let colourHex = ''
+  if (onlyWhite) {
+    colourHex = '0000'
+  } else {
+    colourHex += '01' + scene.nodes.length.toString(16).padStart(2, '0') + Number(3).toString(16).padStart(2, '0') + scene.nodes.map(node => {
+      let nodeHex = ''
+      nodeHex += scene.speed.toString(16).padStart(2, '0')
+      nodeHex += scene.speed.toString(16).padStart(2, '0')
+      nodeHex += scene.mode.toString(16).padStart(2, '0')
+      nodeHex += node.h.toString(16).padStart(4, '0')
+      nodeHex += (node.s * 10).toString(16).padStart(4, '0')
+      nodeHex += (node.v * 10).toString(16).padStart(4, '0')
+      return nodeHex
+    }).join('')
+  }
+  return versionHex + sceneNoHex + whiteHex + colourHex
+}
+
 export function saveScene(
   devId: string,
   scenes: SceneUIState[] | StripSceneUIState[],

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -63,9 +63,12 @@ const StaticMoodEditorPage = () => {
     if (state.currentNode.isColorNode) {
       return hsv2Hex(state.currentNode.h, s, 100)
     }
-    if (moduleParams.isSupportTemperature) {
-      return cctToColor(state.currentNode.colorTemp.toFixed())
+    if (moduleParams.isSupportColor) {
+      return hsv2Hex(state.currentNode.h, s, 100)
+    } else if (moduleParams.isSupportTemperature) {
+      return cctToColor(state.currentNode.colorTemp.toFixed());
     }
+    return '#fff'
   }, [state.currentNode.colorTemp])
 
   const getButtonStatus = () => {