@ledvance/group-ui-biz-bundle 1.0.48 → 1.0.49

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -1,62 +1,129 @@
-import { useFeatureHook } from "@ledvance/base/src/models/modules/NativePropsSlice";
-import { parseJSON } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import { useFeatureHook, useGroupDp, useGroupEzvizConfig, useUAGroupInfo } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { ColorUtils, nToSH, parseJSON } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import { cloneDeep } from "lodash";
-import { FlagItemInfo, FlagUiInfo, defFlagList, def2FlagList, def3FlagList } from "./FlagInfo";
+import { FlagItemInfo, defFlagList, def2FlagList, def3FlagList, FlagUiInfo } from "./FlagInfo";
 import { NativeApi } from "@ledvance/base/src/api/native";
-import { hsv2Hex } from "@ledvance/base/src/utils";
 import { WorkMode } from "@ledvance/base/src/utils/interface";
 import { Utils } from '@tuya/tuya-panel-lamp-sdk'
+import { useEffect, useState } from "react";
+import { getGlobalParamsDp } from "@ledvance/base/src/utils/common";
+import { Result } from "@ledvance/base/src/models/modules/Result";
 const { nToHS, toFixed } = Utils
 
 interface  LightType {
   isStringLight?: boolean
   isStripLight?: boolean
   isMixLight?: boolean
+  isCeilingLight?: boolean
+}
+
+interface FlagMode {
+  flagMode: boolean
+  flagId?: number 
 }
 
 interface FlagDataType {
-  sceneStatus?: {
-    sceneDataDpCode: string
-  }
-  drawToolStatus?: {
-    drawToolCode: string
-    drawToolObj2dp: (colors: string[]) => string;
-  }
   flag?: FlagItemInfo
-  workModeDpCode: string
-  workMode: WorkMode
-  switchLedDpCode: string
 }
 
 export interface FlagConfigType {
-  switchLed: boolean
-  workMode: WorkMode
+  switch_led: boolean
+  colour_switch: boolean
+  white_switch: boolean
+  work_mode: WorkMode
+  rgbic_work_mode: WorkMode
   flagSceneConfig?: FlagDataType
+  flagMode?: FlagMode
+}
+
+export const useFlagMode = () : [FlagMode, (flagMode: FlagMode) => Promise<Result<any>>] =>{
+  const uaGroupInfo = useUAGroupInfo()
+  const [config, setConfig] = useGroupEzvizConfig<FlagConfigType, FlagMode>('flagMode', undefined)
+  const [cloudConfig, setCloudConfig] = useState()
+  useEffect(() =>{
+    if (!config) {
+      getFlagMode(uaGroupInfo.tyGroupId.toString()).then(res =>{
+        if (res.success && res.data) {
+          setCloudConfig(parseJSON(res.data))
+        }
+      })
+    }
+  }, [uaGroupInfo.tyGroupId])
+  return [config ?? cloudConfig, setConfig]
 }
+
+export function useWorkMode(): [WorkMode, (value: WorkMode) => Promise<Result<any>>] {
+  const [workMode] = useGroupDp<WorkMode>(getGlobalParamsDp('work_mode'))
+  const [config, setConfig] = useFeatureHook<FlagConfigType, WorkMode>('work_mode', WorkMode.White);
+  return [workMode ?? config, setConfig]
+}
+
+export function useRgbicWorkMode(): [WorkMode, (value: WorkMode) => Promise<Result<any>>] {
+  const [workMode] = useGroupDp<WorkMode>(getGlobalParamsDp('rgbic_work_mode'))
+  const [config, setConfig] = useFeatureHook<FlagConfigType, WorkMode>('rgbic_work_mode', WorkMode.White);
+  return [workMode ?? config, setConfig]
+}
+
+
 const featureId = 'Flag_data'
 
 type UseFlagType = (params: LightType) => [FlagDataType | undefined, (flagData: FlagDataType) => Promise<any>]
 
 export const useFlag: UseFlagType = (params) => {
   return useFeatureHook<FlagConfigType, FlagDataType | undefined>('flagSceneConfig', undefined, undefined, (flagData) =>{
-    if(flagData){
+    if(flagData?.flag){
       const dps = {}
-      const { flag, drawToolStatus, sceneStatus, switchLedDpCode, workModeDpCode} = flagData
-      if(params.isStripLight && drawToolStatus){
-        dps[drawToolStatus.drawToolCode] = flag ? drawToolStatus.drawToolObj2dp(flag.colors.map(hsv => hsv2Hex(hsv.h, hsv.s, hsv.v))) : ''
-        dps[workModeDpCode] = WorkMode.Colour
+      const { flag } = flagData
+      if (!(params.isStringLight || params.isCeilingLight)){
+        dps[getGlobalParamsDp('scene_data')] = obj2Dp(flag, params)
       }else{
-        if(sceneStatus){
-          dps[sceneStatus.sceneDataDpCode] =  flag ? obj2Dp(flag, {isStringLight: params.isStringLight}) : ''
-          dps[workModeDpCode] = WorkMode.Scene
+        const paintHex = drawToolFormat({
+          adjustCode: 3,
+          colors: flag.colors.map(f => ColorUtils.hsv2hex(f.h,f.s,f.v)).slice(0, 5),
+          daubType: 0,
+          effect: 0
+        })
+        if (getGlobalParamsDp('paint_colour_data')){
+          dps[getGlobalParamsDp('paint_colour_data')] = paintHex
+        }
+        if (getGlobalParamsDp('paint_color')) {
+          dps[getGlobalParamsDp('paint_color')] = paintHex
+        }
+        if (params.isStripLight){
+          dps[getGlobalParamsDp('work_mode')] = WorkMode.Colour
         }
       }
-      dps[switchLedDpCode] = true
-
+      if (params.isCeilingLight){
+        dps[getGlobalParamsDp('bright_value')] = flag.whiteColors[0].brightness * 10
+        dps[getGlobalParamsDp('temp_value')] = flag.whiteColors[0].colorTemp * 10
+        dps[getGlobalParamsDp('white_switch')] = true 
+        dps[getGlobalParamsDp('colour_switch')] = true 
+        dps[getGlobalParamsDp('work_mode')] = WorkMode.White
+        dps[getGlobalParamsDp('rgbic_work_mode')] = WorkMode.Colour
+      }
+      dps[getGlobalParamsDp('switch_led')] = true 
       return dps
     }
-  }, flagData => ({workMode: (params.isStripLight && flagData?.drawToolStatus) ? WorkMode.Colour : WorkMode.Scene, switch_led: true}))
-}
+  }, 
+  flagData => {
+    if (flagData?.flag){
+      const config = {}
+      config['work_mode'] = params.isStripLight ? WorkMode.Colour : WorkMode.Scene
+      config['switch_led'] = true 
+      if (params.isCeilingLight){
+        config['white_switch'] = true 
+        config['colour_switch'] = true 
+        config['work_mode'] = WorkMode.White
+        config['rgbic_work_mode'] = WorkMode.Colour
+      }
+      config['flagMode'] = {
+        flagMode: true,
+        flagId: flagData.flag.id 
+      }
+      return config 
+    }
+  }
+)}
 
 export interface FlagOption {
   isMixLight?: boolean
@@ -136,8 +203,19 @@ export function obj2Dp(flagItem: FlagItemInfo, option?: FlagOption): string {
 interface defFlagOption {
   isDef2?: boolean
   isDef3?: boolean
+  isRefresh?: boolean
 }
 export async function getRemoteFlag(devId: string, defFlag?: defFlagOption) {
+  if (defFlag?.isRefresh){
+    const flags = defFlag?.isDef2 ? def2FlagList : defFlag?.isDef3 ? def3FlagList : defFlagList
+    const res = await NativeApi.putJson(devId, featureId, JSON.stringify(flags))
+    if (res.success) {
+      return {
+        success: true,
+        data: cloneDeep(flags)
+      }
+    }
+  }
   const res = await NativeApi.getJson(devId, featureId)
   const isNormalData = Array.isArray(parseJSON(res?.data))
   if (res.success && isNormalData) {
@@ -169,7 +247,50 @@ export function getFlagMode(groupId: string){
   return NativeApi.getJson(groupId, 'flagMode')
 }
 
-export function saveFlagMode(groupId: string, v:string){
-  return NativeApi.putJson(groupId, 'flagMode', v)
+export interface PaintData {
+  version?: number // 版本
+  adjustCode: number // 调节模式  00 白光, 01 彩光, 02 色卡, 03 组合
+  daubType?: number // 涂抹动作  00 全选, 01 单选, 02 擦除  白光模式下只有 00
+  effect?: number // 调节效果 00 静态, 01 过度, 02 闪烁, 03 呼吸, 04 闪耀
+  num?: number
+  h?: number
+  s?: number
+  v?: number
+  part?: number
+  selected?: string[]
+  bright?: number
+  temp?: number
+  colors?: string[]
+  colorDiskActiveKey?: number
+}
+
+export function drawToolFormat(data: PaintData) {
+  const { version = 0, daubType = 0, effect = 0, num = 6, adjustCode = 1 } = data
+  const commonStr = `${nToSH(version)}${nToSH(adjustCode)}${nToSH(effect)}${nToSH(num)}`
+  let colorStr = '' // 彩光,色卡
+  let whiteStr = '' // 白光模式
+  let combinationStr = '' // 组合模式
+  if (adjustCode === 0) {
+    const whiteData = data
+    whiteStr = `${nToSH(daubType)}${nToSH(whiteData.bright!! * 10, 4)}${nToSH(whiteData.temp!! * 10, 4)}`
+  } else if (adjustCode === 3) {
+    // 组控没有这个模式
+    combinationStr = '00' + data?.colors?.reduce((pre, cur) =>{
+      const color = ColorUtils.hex2hsv(cur)
+      const colorStr = `${nToSH(Math.round(color[0]),4)}${nToSH(Math.round(color[1] * 10),4)}${nToSH(Math.round(color[2] * 10),4)}`
+      pre += colorStr
+      return pre
+    }, '')
+  } else {
+    const colorData = data
+    const selectedStr = colorData?.selected && colorData?.selected.reduce((pre, cur) => {
+      pre += nToSH(Number(cur + 1))
+      return pre
+    }, '')
+    const v = adjustCode === 0 ? '' : colorData.selected ? (parseInt('80', 16) + colorData.selected.length).toString(16) + selectedStr : ''
+    colorStr = `${nToSH(daubType)}${nToSH(colorData?.h || 0, 4)}${nToSH(colorData?.s!! * 10 || 0, 4)}${nToSH(colorData?.v!! * 10 || 0, 4)}${v}`
+  }
+  const extraStr = adjustCode === 0 ? whiteStr : adjustCode === 3 ? combinationStr : colorStr
+  return commonStr + extraStr
 }
 

package/src/modules/flags/FlagEditPage.tsx

@@ -1,11 +1,11 @@
-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'
 import res from '@ledvance/base/src/res'
 import { ScrollView, View, FlatList, StyleSheet, Image, TouchableOpacity, Text } from 'react-native'
 import Spacer from '@ledvance/base/src/components/Spacer'
-import { useReactive } from 'ahooks'
+import { useReactive, useUpdateEffect } from 'ahooks'
 import { Utils } from 'tuya-panel-kit'
 import TextField from '@ledvance/base/src/components/TextField'
 import Card from '@ledvance/base/src/components/Card'
@@ -46,15 +46,6 @@ const FlagEditPage = () => {
     colorPaintBucketSelected: false,
     loading: false
   })
-  useEffect(() => {
-  }, [])
-
-  const getButtonStatus = () => {
-    return (params.mode === 'edit' && isEqual(state.mood, params.currentMood)) ||
-      !(!!state.mood.name) ||
-      nameRepeat ||
-      state.mood.name.length > 32
-  }
 
   const getColorBlockColor = useCallback((isMainLight?: boolean) => {
     if (isMainLight) {
@@ -64,14 +55,30 @@ const FlagEditPage = () => {
     return hsv2Hex(h, s, v)
   }, [state.currentNode, state.currentWhiteNode])
 
+  useUpdateEffect(() =>{
+    state.currentNode = state.mood.colors[state.colorPaintBucketIdx]
+  }, [JSON.stringify(state.mood.colors), state.colorPaintBucketIdx])
+
+  useUpdateEffect(() =>{
+    state.currentWhiteNode = state.mood.whiteColors[state.whitePaintBucketIdx]
+  }, [JSON.stringify(state.mood.whiteColors), state.whitePaintBucketIdx])
+
+  const checkMoodDataChanged = useMemo(() =>{
+    return isEqual(state.mood, params.currentMood)
+  }, [params.currentMood, state.mood])
+
   const nameRepeat = useMemo(() => {
     return !!find(params.moods, m => (m.id !== state.mood.id && m.name === state.mood.name && state.mood.name !== ''))
   }, [state.mood.name])
 
+  const canSaveMoodData = useMemo(() =>{
+    return state.mood.name.length > 0 && state.mood.name.length < 33 && !nameRepeat && (params.mode === 'add' || !checkMoodDataChanged)
+  }, [nameRepeat, state.mood.name, checkMoodDataChanged, params.mode])
+
   return (
     <Page
       backText={I18n.getLang('Feature_devicepanel_flags')}
-      showBackDialog={true}
+      showBackDialog={!checkMoodDataChanged}
       loading={state.loading}
       backDialogTitle={
         I18n.getLang(params.mode === 'add' ?
@@ -82,10 +89,9 @@ const FlagEditPage = () => {
         I18n.getLang('flag_cancelinfo')
       }
       headlineText={I18n.getLang(params.mode === 'add' ? 'flag_addanewflag' : 'flag_edittheflag')}
-      rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
-      rightButtonDisabled={getButtonStatus()}
+      rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck }
       rightButtonIconClick={async () => {
-        if (state.loading) return
+        if (state.loading || !canSaveMoodData) return
         state.loading = true
         const res = await params.modDeleteFlag(params.mode, state.mood)
         if (res.success) {
@@ -109,7 +115,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.isMixLight || params.moduleParams.isCeilingLight) && <><Card style={styles.adjustCard}>
             <Spacer height={cx(16)} />
             <View style={styles.lightLine}>
               <Text style={styles.light}>
@@ -138,7 +144,9 @@ const FlagEditPage = () => {
                   return item
                 })
               }}
-              onBrightnessChange={() => { }}
+              onBrightnessChange={(bright) => {
+                state.currentWhiteNode.brightness = bright
+              }}
               onBrightnessChangeComplete={(bright) => {
                 state.currentWhiteNode.brightness = bright
                 state.mood.whiteColors = state.mood.whiteColors.map((item, idx) => {
@@ -160,7 +168,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' : 'light_sources_tile_tw_lighting_headline')}
+                {I18n.getLang((params.moduleParams.isMixLight || params.moduleParams.isCeilingLight) ? 'light_sources_tile_sec_lighting_headline' : 'light_sources_tile_tw_lighting_headline')}
               </Text>
             </View>
             <Spacer height={cx(10)} />