@ledvance/group-ui-biz-bundle 1.0.53 → 1.0.55

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -8,15 +8,9 @@ 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";
+import { FlagPageProps } from "@ledvance/group-ui-biz-bundle/src/modules/flags/FlagPage";
 const { nToHS, toFixed } = Utils
 
-interface  LightType {
-  isStringLight?: boolean
-  isStripLight?: boolean
-  isMixLight?: boolean
-  isCeilingLight?: boolean
-}
-
 interface FlagMode {
   flagMode: boolean
   flagId?: number 
@@ -28,6 +22,7 @@ interface FlagDataType {
 
 export interface FlagConfigType {
   switch_led: boolean
+  switch: boolean
   colour_switch: boolean
   white_switch: boolean
   work_mode: WorkMode
@@ -67,15 +62,21 @@ export function useRgbicWorkMode(): [WorkMode, (value: WorkMode) => Promise<Resu
 
 const featureId = 'Flag_data'
 
-type UseFlagType = (params: LightType) => [FlagDataType | undefined, (flagData: FlagDataType) => Promise<any>]
+type UseFlagType = (params: FlagPageProps) => [FlagDataType | undefined, (flagData: FlagDataType) => Promise<any>]
 
 export const useFlag: UseFlagType = (params) => {
   return useFeatureHook<FlagConfigType, FlagDataType | undefined>('flagSceneConfig', undefined, undefined, (flagData) =>{
     if(flagData?.flag){
       const dps = {}
       const { flag } = flagData
-      if (!(params.isStringLight || params.isCeilingLight)){
-        dps[getGlobalParamsDp('scene_data')] = obj2Dp(flag, params)
+      if (!(params.isStripLight || params.isCeilingLight)){
+        const moodDp = obj2Dp(flag, params)
+        if (params.isStringLight){
+          dps[getGlobalParamsDp('rgbic_linerlight_scene')] = moodDp
+        }else{
+          dps[getGlobalParamsDp('scene_data')] = moodDp
+        }
+        dps[getGlobalParamsDp('work_mode')] = WorkMode.Scene
       }else{
         const paintHex = drawToolFormat({
           adjustCode: 3,
@@ -101,7 +102,7 @@ export const useFlag: UseFlagType = (params) => {
         dps[getGlobalParamsDp('work_mode')] = WorkMode.White
         dps[getGlobalParamsDp('rgbic_work_mode')] = WorkMode.Colour
       }
-      dps[getGlobalParamsDp('switch_led')] = true 
+      dps[params.switchLedCode] = true 
       return dps
     }
   }, 
@@ -109,7 +110,7 @@ export const useFlag: UseFlagType = (params) => {
     if (flagData?.flag){
       const config = {}
       config['work_mode'] = params.isStripLight ? WorkMode.Colour : WorkMode.Scene
-      config['switch_led'] = true 
+      config[params.isMatterLight ? 'switch' : 'switch_led'] = true 
       if (params.isCeilingLight){
         config['white_switch'] = true 
         config['colour_switch'] = true 

package/src/modules/flags/FlagPage.tsx

@@ -26,6 +26,7 @@ export interface FlagPageProps {
   isStripLight?: boolean
   isStringLight?: boolean
   isCeilingLight?: boolean
+  isMatterLight?: boolean
   isSupportTemperature?: boolean
   isSupportBrightness?: boolean
   switchLedCode: string  

package/src/modules/timeSchedule/TimeScheduleActions.ts

@@ -21,7 +21,7 @@ export const defMixDeviceData = {
 
 export const defStripDeviceData = {
   ...defDeviceData,
-  activeKey: 0,
+  activeKey: 1,
   colorDiskActiveKey: 0,
   colors: ColorList[0],
 };
@@ -33,11 +33,6 @@ export const defCeilingLihtDeviceData = {
 }
 
 export const addTimeSchedule = async (props: IAddSingleTime) => {
-  console.log({
-    ...props,
-    bizType: '1',
-    category: 'category'
-  }, '< --- schedule --- >')
   try {
     const res = await commonApi.timerApi.addSingleTimer({
       ...props,

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -125,7 +125,6 @@ const TimeScheduleDetailPage = () => {
         getRemoteMoodList(uaGroupInfo.tyGroupId.toString(), props).then(res => {
           if (res.success && Array.isArray(res.data)) {
             state.moods = cloneDeep(res.data);
-            console.log(state.moods, '< --- moods')
             setMoods(cloneDeep(res.data));
             if (!state.mood) state.mood = cloneDeep(res.data[0]);
           }
@@ -495,6 +494,7 @@ const TimeScheduleDetailPage = () => {
                     const res = await props.modDeleteTimeSchedule('del', state.timeSchedule, state.timeSchedule.id.toString());
                     state.loading = false;
                     if (res.success) {
+                      props.refreshFn()
                       navigation.goBack();
                     }
                   },

package/src/modules/timeSchedule/components/ManuaSettings.tsx

@@ -234,7 +234,8 @@ function ManualSettings(props: ManualSettingProps) {
               onActiveKeyChange={(activekey) => {
                 state.deviceData = {
                   ...state.deviceData,
-                  activeKey: Number(activekey)
+                  activeKey: Number(activekey),
+                  isColorMode: !(Number(activekey) === 0)
                 }
                 state.manualFlag = Symbol()
               }}