@ledvance/group-ui-biz-bundle 1.0.33 → 1.0.36

package/package.json

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

package/src/modules/flags/FlagPage.tsx

@@ -112,12 +112,6 @@ const FlagPage = () => {
     const res = await getRemoteFlag(uaGroupInfo.tyGroupId.toString(), {isDef2, isDef3})
     if (res.success) {
       let cloneFlag: FlagUiInfo[] = cloneDeep(res.data) || []
-      if(!params.drawToolLight){
-        cloneFlag = cloneFlag.map(flag => {
-          flag.colors = flag.colors.reverse()
-          return flag
-        })
-      }
       state.flags = cloneFlag
       setFlags(cloneDeep(cloneFlag))
     }
@@ -159,7 +153,7 @@ const FlagPage = () => {
     if (res.success) {
       state.flags = cloneDeep(newScene)
       setFlags(cloneDeep(newScene))
-      if(mode === 'del' && flagState?.flag && (checkedMood.id !== flagId)){
+      if(mode === 'del' && (!flagState?.flag || checkedMood.id !== flagId)){
         return{
           success: true
         }
@@ -223,7 +217,7 @@ const FlagPage = () => {
           enable={flagState?.workMode === (params.isStripLight ? WorkMode.Colour : WorkMode.Scene) && flagId === item.id && flagMode?.flagMode}
           title={item.name}
           icon={item.icon}
-          colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v))}
+          colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v)).reverse()}
           onSwitch={async (enable) => {
             if (enable) {
               await setFlag({

package/src/modules/mood/AddMoodPage.tsx

@@ -136,8 +136,8 @@ function newMood(
     brightness: 100,
     colorTemp: 100,
     h: 0,
-    s: 50,
-    v: 80,
+    s: 100,
+    v: 100,
     isColorNode: isColorMode,
     switchingInterval: 13,
     transitionMode: isStatic ? SceneNodeTransitionMode.Static : jump,

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -503,6 +503,8 @@ const styles = StyleSheet.create({
     flex: 1,
     height: cx(40),
     borderRadius: cx(8),
+    borderWidth: 1,
+    borderColor: '#ccc'
   },
   nodeDeleteBtn: {
     width: cx(24),

package/src/modules/mood/MoodItem.tsx

@@ -53,6 +53,7 @@ const MoodItem = (props: MoodItemProps) => {
                 <Spacer />
                 <View style={styles.gradientItem}>
                     <MoodColorsLine
+                        nodeStyle={{ borderColor: '#ccc', borderWidth: 1 }}
                         type={props.type}
                         colors={state.colors} />
                 </View>

package/src/modules/mood/MoodPage.tsx

@@ -175,18 +175,18 @@ const MoodPage = () => {
       state.scenes = cloneDeep(newScene)
       setMoods(cloneDeep(newScene))
       updateFlagMode()
-      if(mode === 'del' && currentMood.id !== scene?.scene?.id){
+      if(mode === 'del' && (currentMood.id !== scene?.scene?.id || workMode !== WorkMode.Scene)){
         return {
           success: true
         }
       }
-      let workMode: WorkMode = getWorkMode(mood, params);
+      let workModeCode: WorkMode = getWorkMode(mood, params);
       return setScene({
         scene: cloneDeep(mood),
         sceneDataDpCode: params.sceneDataDpCode,
         mixSceneDataDpCode: params.mixSceneDataDpCode,
         workModeDpCode: params.workModeDpCode,
-        workMode: mood ? WorkMode.Scene : (params.isSupportColor ? WorkMode.Colour : WorkMode.White),
+        workMode: workModeCode,
         switchLedDpCode: params.switchLedDpCode
       })
     }
@@ -195,6 +195,13 @@ const MoodPage = () => {
     }
   }
 
+  function getWorkMode(mood: SceneUIState | undefined, params: MoodPageProps): WorkMode {
+    if (mood) return WorkMode.Scene;
+    if (params.isSupportFan) return WorkMode.Control;
+    if (params.isSupportColor) return WorkMode.Colour;
+    return WorkMode.White;
+  }
+
   const updateFlagMode = () =>{
     if(flagMode?.flagMode && params.isSupportColor){
       saveFlagMode(uaGroupInfo.tyGroupId.toString(), JSON.stringify({

package/src/modules/mood/SceneInfo.ts

@@ -20,7 +20,7 @@ export interface SceneInfo {
   expand: number,
   // 方向 0 顺时针方向, 1 逆时针方向
   direction: number,
-  
+
 }
 
 export interface SceneNodeInfo {
@@ -290,6 +290,7 @@ function getRGBWDefSceneList(): RemoteSceneInfo[] {
       t: 0,
       e: false,
     },
+    ...defColorSceneList
   ]
 }
 
@@ -337,6 +338,7 @@ function getRGBDefSceneList(): RemoteSceneInfo[] {
       t: 0,
       e: false,
     },
+    ...defColorSceneList
   ]
 }
 
@@ -349,13 +351,6 @@ function getOnlyRGBDefSceneList(): RemoteSceneInfo[] {
       t: 0,
       e: false,
     },
-    {
-      n: I18n.getLang('mesh_device_detail_lighting_read'),
-      i: '010e0d000084000003e800000000',
-      s: '',
-      t: 0,
-      e: false,
-    },
     {
       n: I18n.getLang('mesh_device_detail_lighting_work'),
       i: '020e0d00001403e803e800000000',
@@ -377,13 +372,7 @@ function getOnlyRGBDefSceneList(): RemoteSceneInfo[] {
       t: 0,
       e: false,
     },
-    {
-      n: I18n.getLang('mesh_device_detail_lighting_white_mode'),
-      i: '0646460100000000000003e8000046460100000000000003e8019046460100000000000003e803e8',
-      s: '',
-      t: 0,
-      e: false,
-    },
+    ...defColorSceneList
   ]
 }
 
@@ -860,6 +849,219 @@ function getStripLightSceneList(): RemoteSceneInfo[] {
   ]
 }
 
+const defColorSceneList: RemoteSceneInfo[] = [
+  {
+    n: I18n.getLang('dynamicmoods_forest'),
+    i: '074b4b02007802f80226000000004b4b02003303e803e8000000004b4b02007803e8018600000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_desert'),
+    i: '084b4b020022014a0334000000004b4b02001002b203e8000000004b4b02001003e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_dreams'),
+    i: '094b4b02014b00c803e8000000004b4b0200b4010403a2000000004b4b02001c010e03e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_breeze'),
+    i: '0a4b4b02002b03520352000000004b4b020000032a02bc000000004b4b02002703e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_waters'),
+    i: '0b4b4b0200c303e803e8000000004b4b0200a001f403e8000000004b4b0200f0030c01b800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_splash'),
+    i: '0c4b4b02003c03e803e8000000004b4b02002703e803e8000000004b4b02001003e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang("dynamicmoods_sunrise"),
+    i: '0d4b4b02000902d003e8000000004b4b020026012203e8000000004b4b02003303e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_wonderland'),
+    i: '0e4b4b0200bb00e60384000000004b4b020000001403e8000000004b4b020000000002ee00000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Twilight'),
+    i: '0f4b4b02014a024e03e8000000004b4b02002703e803e8000000004b4b0200b403e801f400000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_symphony'),
+    i: '104b4b0200d2037003e8000000004b4b020000000003e8000000004b4b02003303e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_sorbet'),
+    i: '114b4b02015e00fa03e8000000004b4b020011020803e8000000004b4b02003c03e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_mansion'),
+    i: '124b4b02012c03e801f4000000004b4b0200b403e803e8000000004b4b02002703e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_hour'),
+    i: '134b4b02003303e803e8000000004b4b02002103e803e8000000004b4b020026012203e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_isle'),
+    i: '144b4b02007803e801f4000000004b4b020092029e0226000000004b4b02005a03e803de00000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Beat'),
+    i: '154b4b0200b403e803e8000000004b4b02012c03e803e8000000004b4b02003c03e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_glamour'),
+    i: '164b4b02003303e803e8000000004b4b02012c03e801f4000000004b4b02015e00fa03e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_edreams'),
+    i: '174b4b02012c03e803e8000000004b4b0200b403e803e8000000004b4b02002703e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_sunset'),
+    i: '184b4b02001003e803e8000000004b4b02001d02b203e8000000004b4b02002b0352035200000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_carnival'),
+    i: '194b4b02012c03e803e8000000004b4b02002703e803e8000000004b4b02003c03e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_serenade'),
+    i: '1a4b4b0200f0030c01b8000000004b4b0200b4019a0136000000004b4b0200f0005003d400000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_glow'),
+    i: '1b4b4b02001e03e803e8000000004b4b02003003e803e8000000004b4b020000032003e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Canopy'),
+    i: '1c4b4b02007803e80190000000004b4b020078029e0258000000004b4b02001e029e025800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Burst'),
+    i: '1d4b4b02000003e803e8000000004b4b02002703e803e8000000004b4b02003c03e803e8000000004b4b02007803e803e8000000004b4b0200d203e803e8000000004b4b02011103e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Lights'),
+    i: '1e4b4b02012c03e803e8000000004b4b02003c03e803e8000000004b4b0200b403e803e8000000004b4b02001803e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Dreamscape'),
+    i: '1f4b4b02012c00c803e8000000004b4b0200f000c803e8000000004b4b02003c00c803e8000000004b4b0200b400c803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_NLights'),
+    i: '204b4b02009603e803e8000000004b4b0200d203e803e8000000004b4b02010e03e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_paradise'),
+    i: '214b4b020140025803e8000000004b4b02001e032003e8000000004b4b02003c025803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_ice'),
+    i: '224b4b02001803e803e8000000004b4b020000000003e8000000004b4b0200d803e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_voyage'),
+    i: '234b4b0200f003e80190000000004b4b02010e03e80190000000004b4b020000000003e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_wave'),
+    i: '244b4b0200d203e803e8000000004b4b0200b403e803e8000000004b4b02009603e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+]
+
 export const MAXSCENE = 8
 
 export const AddScene = {

package/src/modules/randomTimeForPlug/RandomTimeForPlugAction.ts

@@ -8,6 +8,7 @@
  */
 
 import {useFeatureHook} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import {Buffer} from "buffer";
 
 
 export interface RandomTimeParam {
@@ -33,80 +34,39 @@ export function useRandomTime() {
   return useFeatureHook<PlugConfig, RandomTimeItem[]>('randomTime', [], (val) => randomTimeItemsToBase64(val))
 }
 
-const base64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-const decodeBase64 = (base64: string): Uint8Array => {
-  const bufferLength = base64.length * 0.75;
-  const buffer = new Uint8Array(bufferLength);
-  let encoded1: number, encoded2: number, encoded3: number, encoded4: number;
-  let p = 0;
-
-  for (let i = 0; i < base64.length; i += 4) {
-    encoded1 = base64Chars.indexOf(base64[i]);
-    encoded2 = base64Chars.indexOf(base64[i + 1]);
-    encoded3 = base64Chars.indexOf(base64[i + 2]);
-    encoded4 = base64Chars.indexOf(base64[i + 3]);
-
-    buffer[p++] = (encoded1 << 2) | (encoded2 >> 4);
-    buffer[p++] = ((encoded2 & 15) << 4) | (encoded3 >> 2);
-    buffer[p++] = ((encoded3 & 3) << 6) | (encoded4 & 63);
-  }
-
-  return buffer;
-}
-
-const encodeBase64 = (buffer: Uint8Array): string => {
-  let base64 = '';
-  let p = 0;
-  const length = buffer.length;
-
-  while (p < length) {
-    const byte1 = buffer[p++];
-    const byte2 = p < length ? buffer[p++] : 0;
-    const byte3 = p < length ? buffer[p++] : 0;
-
-    const encoded1 = byte1 >> 2;
-    const encoded2 = ((byte1 & 3) << 4) | (byte2 >> 4);
-    const encoded3 = ((byte2 & 15) << 2) | (byte3 >> 6);
-    const encoded4 = byte3 & 63;
-
-    base64 += base64Chars[encoded1] + base64Chars[encoded2];
-    base64 += p < length + 2 ? base64Chars[encoded3] : '=';
-    base64 += p < length + 1 ? base64Chars[encoded4] : '=';
-  }
-
-  return base64;
-}
-
 // @ts-ignore
-const randomTimeItemsFromBase64 = (base64: string): RandomTimeItem[] => {
-  const bytes = decodeBase64(base64);
+const randomTimeItemsFromBase64 = (base64Str: string): RandomTimeItem[] => {
+  const buffer = Buffer.from(base64Str, 'base64');
+
   const items: RandomTimeItem[] = [];
 
-  for (let i = 0; i < bytes.length; i += 6) {
-    const channelByte = bytes[i];
-    const enable = (channelByte & 1) === 1;
-    const channel = (channelByte >> 1) & 0x7F;
-    const week = bytes[i + 1];
-    const startTime = (bytes[i + 2] << 8) | bytes[i + 3];
-    const endTime = (bytes[i + 4] << 8) | bytes[i + 5];
+  for (let i = 0; i < buffer.length; i += 6) {
+    const enable = (buffer[i] & 0x01) === 1;
+    const channel = (buffer[i] >> 1) & 0x7F;
+
+    const week = buffer[i + 1];
+    const weeks: number[] = [
+      (week & 0b00000001) >> 0,
+      (week & 0b00000010) >> 1,
+      (week & 0b00000100) >> 2,
+      (week & 0b00001000) >> 3,
+      (week & 0b00010000) >> 4,
+      (week & 0b00100000) >> 5,
+      (week & 0b01000000) >> 6,
+      (week & 0b10000000) >> 7,
+    ];
+
+    const startTime = (buffer[i + 2] << 8) | buffer[i + 3];
+    const endTime = (buffer[i + 4] << 8) | buffer[i + 5];
 
     items.push({
       enable,
       channel,
-      weeks: [
-        (week & 0b00000001) >> 0,
-        (week & 0b00000010) >> 1,
-        (week & 0b00000100) >> 2,
-        (week & 0b00001000) >> 3,
-        (week & 0b00010000) >> 4,
-        (week & 0b00100000) >> 5,
-        (week & 0b01000000) >> 6,
-        (week & 0b10000000) >> 7,
-      ],
+      weeks,
       startTime,
       endTime,
-      index: i % 6
+      name: `RandomTime ${items.length}`,
+      index: items.length
     });
   }
 
@@ -114,23 +74,26 @@ const randomTimeItemsFromBase64 = (base64: string): RandomTimeItem[] => {
 }
 
 export const randomTimeItemsToBase64 = (items: RandomTimeItem[]): string => {
-  const bytes = new Uint8Array(items.length * 6);
+  const buffer = new Uint8Array(6 * items.length);
 
   items.forEach((item, index) => {
-    const channelByte = (item.channel!! << 1) | (item.enable ? 1 : 0);
-    const week = item.weeks.reduce((acc, bit, i) => acc | (bit << i), 0);
-    const startTime = item.startTime;
-    const endTime = item.endTime;
-
     const offset = index * 6;
-    bytes[offset] = channelByte;
-    bytes[offset + 1] = week;
-    bytes[offset + 2] = (startTime >> 8) & 0xFF;
-    bytes[offset + 3] = startTime & 0xFF;
-    bytes[offset + 4] = (endTime >> 8) & 0xFF;
-    bytes[offset + 5] = endTime & 0xFF;
+
+    // Byte 1: Channel (bit0: enable, bit7-bit1: channel)
+    buffer[offset] = (item.enable ? 1 : 0) | ((item.channel ?? 0) << 1);
+
+    // Byte 2: Weeks
+    buffer[offset + 1] = item.weeks.reduce((acc, bit, i) => acc | (bit << i), 0);
+
+    // Byte 3-4: Start time
+    buffer[offset + 2] = (item.startTime >> 8) & 0xFF;
+    buffer[offset + 3] = item.startTime & 0xFF;
+
+    // Byte 5-6: End time
+    buffer[offset + 4] = (item.endTime >> 8) & 0xFF;
+    buffer[offset + 5] = item.endTime & 0xFF;
   });
 
-  return encodeBase64(bytes);
+  return Buffer.from(buffer).toString('base64');
 }