@ledvance/group-ui-biz-bundle 1.0.64 → 1.0.65

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -26,6 +26,7 @@ export interface FlagConfigType {
   colour_switch: boolean
   white_switch: boolean
   work_mode: WorkMode
+  workMode: WorkMode
   rgbic_work_mode: WorkMode
   flagSceneConfig?: FlagDataType
   flagMode?: FlagMode
@@ -49,7 +50,7 @@ export const useFlagMode = () : [FlagMode, (flagMode: FlagMode) => Promise<Resul
 
 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);
+  const [config, setConfig] = useFeatureHook<FlagConfigType, WorkMode>('workMode', WorkMode.White);
   return [workMode ?? config, setConfig]
 }
 
@@ -110,11 +111,13 @@ export const useFlag: UseFlagType = (params) => {
     if (flagData?.flag){
       const config = {}
       config['work_mode'] = params.isStripLight ? WorkMode.Colour : WorkMode.Scene
+      config['workMode'] = params.isStripLight ? WorkMode.Colour : WorkMode.Scene
       config[params.isMatterLight ? 'switch' : 'switch_led'] = true 
       if (params.isCeilingLight){
         config['white_switch'] = true 
         config['colour_switch'] = true 
         config['work_mode'] = WorkMode.White
+        config['workMode'] = WorkMode.White
         config['rgbic_work_mode'] = WorkMode.Colour
       }
       config['flagMode'] = {

package/src/modules/flags/FlagEditPage.tsx

@@ -172,16 +172,18 @@ const FlagEditPage = () => {
               </Text>
             </View>
             <Spacer height={cx(10)} />
-            <LdvSlider
-              title={I18n.getLang('add_new_dynamic_mood_lights_field_speed_topic_text')}
-              value={state.mood.speed}
-              onValueChange={value => {
-                state.mood.speed = value
-              }}
-              onSlidingComplete={value => {
-                state.mood.speed = value
-              }} />
-            <Spacer height={cx(16)} />
+            {(!params.moduleParams.isStripLight && !params.moduleParams.isCeilingLight) && <>
+              <LdvSlider
+                title={I18n.getLang('add_new_dynamic_mood_lights_field_speed_topic_text')}
+                value={state.mood.speed}
+                onValueChange={value => {
+                  state.mood.speed = value
+                }}
+                onSlidingComplete={value => {
+                  state.mood.speed = value
+                }} />
+              <Spacer height={cx(16)} />
+            </>}
             <View style={styles.nodesAdjust}>
               <View style={styles.adjustButtons}>
                 <TouchableOpacity

package/src/modules/mood_new/MoodActions.ts

@@ -32,6 +32,7 @@ interface SceneDataType {
 export interface SceneDataConfigType {
   sceneConfig?: SceneDataType
   work_mode: WorkMode
+  workMode: WorkMode
   rgbic_work_mode: WorkMode
   switch_led: boolean
   colour_switch: boolean
@@ -73,15 +74,9 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
             dps[params.mainWorkMode] = WorkMode.Scene
             if (params.isUVCFan){
               dps[getGlobalParamsDp('fan_switch')] = mainLamp.fanEnable
-              // if (mainLamp.fanEnable){
-              //   dps[getGlobalParamsDp('fan_speed')] = mainLamp.fanSpeed
-              // }
             }
             if (params.isFanLight && !params.isUVCFan){
               dps[getGlobalParamsDp('switch_fan')] = mainLamp.fanEnable
-              // if (mainLamp.fanEnable){
-              //   dps[getGlobalParamsDp('fan_speed')] = mainLamp.fanSpeed
-              // }
             }
           }
         }
@@ -116,6 +111,7 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
         const { mainLamp, secondaryLamp } = moodInfo.scene
         if (mainLamp?.nodes?.length) {
           config.work_mode = WorkMode.Scene
+          config.workMode = WorkMode.Scene
           if (params.isCeilingLight) {
             config.white_switch = true
           }else if(params.isMatterLight){
@@ -143,11 +139,14 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
       }else{
         if(params.isCeilingLight){
           config.work_mode = WorkMode.White
+          config.workMode = WorkMode.White
           config.rgbic_work_mode = WorkMode.Colour
         }else{
           if (params.isFanLight || params.isUVCFan){
             config.work_mode = WorkMode.Control
+            config.workMode = WorkMode.Control
           }else{
+            config.workMode = params.isSupportColor ? WorkMode.Colour : WorkMode.White
             config.work_mode = params.isSupportColor ? WorkMode.Colour : WorkMode.White
           }
         }

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -209,7 +209,7 @@ const TimeScheduleDetailPage = () => {
   }, [props.applyForList.length, props.applyForDisabled]);
 
   const getMoodItemEnable = useCallback((item: MoodUIInfo ) =>{
-    return props.isCeilingLight ? ((item.mainLamp.id === state.mood?.mainLamp?.id) && (item.secondaryLamp.id === state.mood?.secondaryLamp?.id)) : item.id === state.mood?.id 
+    return props.isCeilingLight ? ((item.mainLamp.id === state.mood?.mainLamp?.id) && (item.secondaryLamp.id === state.mood?.secondaryLamp?.id)) : item.id === state.mood?.id
   }, [state.mood, props.isCeilingLight])
 
   return (
@@ -361,13 +361,13 @@ const TimeScheduleDetailPage = () => {
           </>
         )}
         <Spacer height={cx(10)} />
-        {(!state.selectedSkill.length && !showMoodFanSelectText) && <InfoText 
+        {(!state.selectedSkill.length && !showMoodFanSelectText) && <InfoText
           style={{marginHorizontal: cx(24)}}
           icon={res.ic_warning_amber}
           contentColor="#FF9500"
           text={I18n.getLang('timeschedule_add_schedule_no_device_warning_text')}
         />}
-        {showMoodFanSelectText && <InfoText 
+        {showMoodFanSelectText && <InfoText
           style={{marginHorizontal: cx(24)}}
           icon={res.ic_warning_amber}
           contentColor="#FF9500"
@@ -512,7 +512,7 @@ const TimeScheduleDetailPage = () => {
                   onConfirm: async (_, { close }) => {
                     state.loading = true;
                     close();
-                    const res = await props.modDeleteTimeSchedule('del', state.timeSchedule, state.timeSchedule.id.toString());
+                    const res = await props.modDeleteTimeSchedule('del', {...state.timeSchedule, status: 2}, state.timeSchedule.id.toString());
                     state.loading = false;
                     if (res.success) {
                       props.refreshFn()

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -83,6 +83,7 @@ const TimeSchedulePage = () => {
       })
     } else {
       return modDelTimeSchedule({
+        status: timeSchedule.status,
         bizId: uaGroupInfo.tyGroupId.toString(),
         ids,
       })
@@ -151,6 +152,7 @@ const TimeSchedulePage = () => {
                   ...item,
                   status: enable ? 1 : 0,
                 }, item.id.toString());
+                item.status = enable ? 1 : 0
                 state.loading = false;
               }}
               onPress={() => {