@ledvance/ui-biz-bundle 1.1.32 → 1.1.33

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "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){
+        const whiteHex = obj2Dp(flagItem, extra)
+        extraDps[extra.switchLedCode] = true,
+        extraDps[extra.rgbcSwitchLedCode!] = true
+        extraDps[extra.rgbcWorkModeCode!] = WORK_MODE.COLOUR
+        extraDps[extra.workModeCode] = WORK_MODE.SCENE
+        extraDps[extra.sceneDataCode!!] = whiteHex
+      }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

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo } from 'react'
+import React, { useCallback, useMemo } from 'react'
 import I18n from '@ledvance/base/src/i18n'
 import { useNavigation, useRoute } from '@react-navigation/native'
 import Page from '@ledvance/base/src/components/Page'
@@ -46,8 +46,6 @@ const FlagEditPage = () => {
     colorPaintBucketSelected: false,
     loading: false
   })
-  useEffect(() => {
-  }, [])
 
   const getButtonStatus = () => {
     return (params.mode === 'edit' && isEqual(state.mood, params.currentMood)) ||
@@ -57,10 +55,10 @@ const FlagEditPage = () => {
   }
 
   const getColorBlockColor = useCallback((isMainLight?: boolean) => {
-    if(isMainLight){
+    if (isMainLight) {
       return cctToColor(state.currentWhiteNode.colorTemp, Math.max(...[state.currentWhiteNode.brightness, 50]))
     }
-    const { h, s, v} = state.currentNode
+    const { h, s, v } = state.currentNode
     return hsv2Hex(h, s, v)
   }, [state.currentNode, state.currentWhiteNode])
 
@@ -70,7 +68,7 @@ const FlagEditPage = () => {
 
   return (
     <Page
-      backText={I18n.getLang('mesh_device_detail_mode')}
+      backText={I18n.getLang('Feature_devicepanel_flags')}
       showBackDialog={true}
       loading={state.loading}
       backDialogTitle={
@@ -109,7 +107,7 @@ const FlagEditPage = () => {
             tipColor={nameRepeat ? '#f00' : undefined}
             tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
             errorText={I18n.getLang(nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')} />
-          {params.moduleParams.isSupportMixScene && <><Card style={styles.adjustCard}>
+          {(params.moduleParams.isSupportMixScene || params.moduleParams.isCeilingLight) && <><Card style={styles.adjustCard}>
             <Spacer height={cx(16)} />
             <View style={styles.lightLine}>
               <Text style={styles.light}>
@@ -160,11 +158,11 @@ 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' : 'light_sources_tile_tw_lighting_headline')}
+                {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')}
               </Text>
             </View>
             <Spacer height={cx(10)} />
-            {!params.moduleParams.isStripLight && <>
+            {(!params.moduleParams.isStripLight && !params.moduleParams.isCeilingLight) && <>
               <LdvSlider
                 title={I18n.getLang('add_new_dynamic_mood_lights_field_speed_topic_text')}
                 value={state.mood.speed}

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,8 @@ export interface FlagPageProps {
   sceneDataCode?: string
   workModeCode: string
   switchLedCode: string
+  rgbcWorkModeCode?: string 
+  rgbcSwitchLedCode?: string 
 }
 
 const FlagPage = () => {
@@ -48,9 +51,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({