@ledvance/group-ui-biz-bundle 1.0.58 → 1.0.61

package/package.json

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

package/src/modules/flags/FlagEditPage.tsx

@@ -40,7 +40,7 @@ const FlagEditPage = () => {
     mood: params.currentMood,
     currentWhiteNode: params.currentMood.whiteColors[params.currentMood.whiteColors.length - 1]!,
     currentNode: params.currentMood.colors[params.currentMood.colors.length - 1],
-    whitePaintBucketIdx: params.currentMood.colors.length - 1,
+    whitePaintBucketIdx: params.currentMood.whiteColors.length - 1,
     colorPaintBucketIdx: params.currentMood.colors.length - 1,
     whitePaintBucketSelected: true,
     colorPaintBucketSelected: false,

package/src/modules/mood_new/DynamicMoodEditorPage.tsx

@@ -50,6 +50,7 @@ interface DynamicMoodEditorPageState {
   mainBucketSelected: boolean;
   sceneMode: StripLightMoodMode;
   loading: boolean;
+  
 }
 const DynamicMoodEditorPage = () => {
   const navigation = useNavigation();
@@ -154,7 +155,6 @@ const DynamicMoodEditorPage = () => {
         if (state.loading || !canSaveMoodData) return;
         state.loading = true;
         const res = await params.modDeleteMood(params.mode, cloneDeep(state.mood));
-        console.log(res, '< --- res ---- >')
         if (res.success) {
           navigation.navigate(ui_biz_routerKey.group_ui_biz_mood);
         }

package/src/modules/mood_new/MoodActions.ts

@@ -62,8 +62,8 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
   }
   const [config, setConfig] = useFeatureHook<SceneDataConfigType, SceneDataType>('sceneConfig', defConfig, undefined,
     (moodInfo) => {
+      const dps = {}
       if (moodInfo?.scene) {
-        const dps = {}
         const { mainLamp, secondaryLamp } = moodInfo.scene
         if (mainLamp?.nodes?.length) {
           const mainDp = getMoodDp(params.isCeilingLight ? ({...moodInfo.scene, id: mainLamp.id!}) : moodInfo.scene, params)
@@ -97,12 +97,23 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
             dps[params.secondarySwitch!] = true 
           }
         }
-        return dps
+      }else{
+        if(params.isCeilingLight){
+          dps[params.mainWorkMode] = WorkMode.White
+          dps[params.secondaryWorkMode!] = WorkMode.Colour
+        }else{
+          if (params.isFanLight || params.isUVCFan){
+            dps[params.mainWorkMode] = WorkMode.Control
+          }else{
+            dps[params.mainWorkMode] = params.isSupportColor ? WorkMode.Colour : WorkMode.White
+          }
+        }
       }
+      return dps
     }, (moodInfo) => {
+      const config = {} as SceneDataConfigType
       if (moodInfo?.scene) {
         const { mainLamp, secondaryLamp } = moodInfo.scene
-        const config = {} as SceneDataConfigType
         if (mainLamp?.nodes?.length) {
           config.work_mode = WorkMode.Scene
           if (params.isCeilingLight) {
@@ -129,8 +140,19 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
             config.colour_switch = true
           }
         }
-        return config
+      }else{
+        if(params.isCeilingLight){
+          config.work_mode = WorkMode.White
+          config.rgbic_work_mode = WorkMode.Colour
+        }else{
+          if (params.isFanLight || params.isUVCFan){
+            config.work_mode = WorkMode.Control
+          }else{
+            config.work_mode = params.isSupportColor ? WorkMode.Colour : WorkMode.White
+          }
+        }
       }
+      return config
     })
   return [config, setConfig]
 }

package/src/modules/mood_new/MoodPage.tsx

@@ -71,7 +71,7 @@ const MoodPage = () => {
           console.log(state.originMoods, '< --- originMoods')
         }
       });
-    }, 200);
+    }, 250);
 
     return () => {
       clearTimeout(state.timerId);
@@ -146,6 +146,9 @@ const MoodPage = () => {
                 node.h = 0;
                 node.s = 0;
                 node.v = 0;
+                if (!params.isSupportTemperature) {
+                  node.colorTemp = 100; // 适配dim灯
+                }
               }
               return node;
             }

package/src/modules/randomTimingForLight/Router.ts

@@ -5,7 +5,7 @@ import {ui_biz_routerKey} from "../../navigation/Routers";
 
 const RandomTimingForLightRouters: NavigationRoute[] = [
   {
-    name: ui_biz_routerKey.group_ui_biz_fixed_timing_light,
+    name: ui_biz_routerKey.group_ui_biz_random_timing_light,
     component: RandomTimingForLightPage,
     options:{
       hideTopbar: true,
@@ -13,7 +13,7 @@ const RandomTimingForLightRouters: NavigationRoute[] = [
     }
   },
   {
-    name: ui_biz_routerKey.group_ui_biz_fixed_timing_light_detail,
+    name: ui_biz_routerKey.group_ui_biz_random_timing_light_detail,
     component: RandomTimingForLightDetailPage,
     options:{
       hideTopbar: true,

package/src/modules/select/Router.ts

@@ -1,4 +1,4 @@
-import {NavigationRoute} from "tuya-panel-kit";
+import {NavigationRoute, TransitionPresets} from "tuya-panel-kit";
 import SelectPage from "./SelectPage";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 
@@ -6,10 +6,11 @@ const SelectPagePageRouters: NavigationRoute[] = [
   {
     name: ui_biz_routerKey.group_ui_biz_select_page,
     component: SelectPage,
-    options:{
+    options: {
       hideTopbar: true,
       showOfflineView: false,
-    }
+      ...TransitionPresets.ModalPresentationIOS,
+    },
   }
 ]
 

package/src/navigation/Routers.ts

@@ -1,29 +1,3 @@
-import {NavigationRoute, TransitionPresets} from 'tuya-panel-kit'
-import TimerPage from '../modules/timer/TimerPage'
-import TimeSchedulePage from '../modules/time_schedule/TimeSchedulePage'
-import TimeScheduleDetailPage from '../modules/time_schedule/TimeScheduleDetailPage'
-import MoodPage from '../modules/mood/MoodPage'
-import AddMoodPage from '../modules/mood/AddMoodPage'
-import DynamicMoodEditorPage from '../modules/mood/DynamicMoodEditorPage'
-import StaticMoodEditorPage from '../modules/mood/StaticMoodEditorPage'
-import SelectPage from '../modules/select/SelectPage'
-import FlagPage from '../modules/flags/FlagPage'
-import FlagEditPage from '../modules/flags/FlagEditPage'
-import RemoteSwitchPage from "../modules/remoteSwitch/RemoteSwitchPage";
-import SwitchGradientPage from "../modules/switchGradient/SwitchGradientPage";
-import RandomTimeForPlugPage from "../modules/randomTimeForPlug/RandomTimeForPlugPage";
-import RandomTimeForPlugDetailPage from "../modules/randomTimeForPlug/RandomTimeForPlugDetailPage";
-import RandomTimeForLightPage from "../modules/randomTimingForLight/RandomTimingForLightPage";
-import RandomTimingForLightDetailPage from "../modules/randomTimingForLight/RandomTimingForLightDetailPage";
-import BiorhythmPage from '../modules/biorhythm/BiorhythmPage'
-import BiorhythmEditPage from '../modules/biorhythm/BiorhythmDetailPage'
-import IconSelectPage from '../modules/biorhythm/IconSelect'
-import MusicPage from '../modules/music/MusicPage'
-import FixedTimeForPlugPage from "../modules/fixedTimeForPlug/FixedTimeForPlugPage";
-import FixedTimeForPlugDetailPage from "../modules/fixedTimeForPlug/FixedTimeForPlugDetailPage";
-import FixedTimingForLightPage from "../modules/fixedTimingForLight/FixedTimingForLightPage";
-import FixedTimingForLightDetailPage from "../modules/fixedTimingForLight/FixedTimingForLightDetailPage";
-
 export const ui_biz_routerKey = {
   'group_ui_biz_timer': 'group_ui_biz_timer',
   'group_ui_biz_time_schedule': 'group_ui_biz_time_schedule',
@@ -51,235 +25,3 @@ export const ui_biz_routerKey = {
   'group_ui_biz_fixed_timing_light': 'group_ui_biz_fixed_timing_light',
   'group_ui_biz_fixed_timing_light_detail': 'group_ui_biz_fixed_timing_light_detail',
 }
-
-export const TimerRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_timer,
-    component: TimerPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  }
-]
-
-export const TimeScheduleRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_time_schedule,
-    component: TimeSchedulePage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_time_schedule_edit,
-    component: TimeScheduleDetailPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-]
-
-export const MoodRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_mood,
-    component: MoodPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_mood_add,
-    component: AddMoodPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_static_mood_edit,
-    component: StaticMoodEditorPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_dynamic_mood_edit,
-    component: DynamicMoodEditorPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-]
-
-export const SelectPageRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_select_page,
-    component: SelectPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-      ...TransitionPresets.ModalPresentationIOS,
-    },
-  },
-]
-
-export const FlagPageRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_flag_page,
-    component: FlagPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    }
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_flag_page_edit,
-    component: FlagEditPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    }
-  },
-]
-
-export const RemoteSwitchRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_remote_switch,
-    component: RemoteSwitchPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  }
-]
-
-export const SwitchGradientRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_switch_gradient,
-    component: SwitchGradientPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  }
-]
-
-export const RandomTimeForPlugRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_random_time_plug,
-    component: RandomTimeForPlugPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_random_time_plug_detail,
-    component: RandomTimeForPlugDetailPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-]
-
-export const RandomTimingForLightRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_random_timing_light,
-    component: RandomTimeForLightPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_random_timing_light_detail,
-    component: RandomTimingForLightDetailPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-]
-
-export const BiologicalRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_biological,
-    component: BiorhythmPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_biological_detail,
-    component: BiorhythmEditPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_biological_icon_select,
-    component: IconSelectPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-]
-
-export const MusicPageRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_music,
-    component: MusicPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-]
-
-export const FixedTimeForPlugRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_fixed_time_plug,
-    component: FixedTimeForPlugPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_fixed_time_plug_detail,
-    component: FixedTimeForPlugDetailPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-]
-
-export const FixedTimingForLightRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.group_ui_biz_fixed_timing_light,
-    component: FixedTimingForLightPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-  {
-    name: ui_biz_routerKey.group_ui_biz_fixed_timing_light_detail,
-    component: FixedTimingForLightDetailPage,
-    options: {
-      hideTopbar: true,
-      showOfflineView: false,
-    },
-  },
-]