@ledvance/group-ui-biz-bundle 1.0.19 → 1.0.21

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -2,7 +2,7 @@ import { useFeatureHook } from "@ledvance/base/src/models/modules/NativePropsSli
 import { SceneNodeTransitionMode } from "@ledvance/group-ui-biz-bundle/src/modules/mood/SceneInfo";
 import { parseJSON } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import { cloneDeep } from "lodash";
-import { FlagItemInfo, FlagUiInfo, defFlagList } from "./FlagInfo";
+import { FlagItemInfo, FlagUiInfo, defFlagList, def2FlagList, def3FlagList } from "./FlagInfo";
 import { hex2Int } from "@ledvance/base/src/utils/common";
 import { spliceByStep } from "@ledvance/base/src/utils/common";
 import { NativeApi } from "@ledvance/base/src/api/native";
@@ -94,10 +94,6 @@ export function obj2Dp(flagItem: FlagItemInfo, option?: FlagOption): string {
     }).join('')
     return version + idHex + whiteHex + colorHex
   } else {
-    if (option?.isFan) {
-      fanEnableHex = (flagItem.fanEnable ? 1 : 0).toString(16).padStart(2, '0')
-      fanSpeedHex = (flagItem.fanSpeed || 1).toString(16).padStart(2, '0')
-    }
     if (!flagItem.speed) {
       flagItem.speed = 12
     }
@@ -169,8 +165,6 @@ export function dp2Obj(dp: string, option?: FlagOption): FlagItemInfo | undefine
       id,
       mode,
       speed,
-      fanEnable,
-      fanSpeed,
       colors,
       whiteColors
     }
@@ -178,8 +172,11 @@ export function dp2Obj(dp: string, option?: FlagOption): FlagItemInfo | undefine
 
 }
 
-
-export async function getRemoteFlag(devId: string) {
+interface defFlagOption {
+  isDef2?: boolean
+  isDef3?: boolean
+}
+export async function getRemoteFlag(devId: string, defFlag?: defFlagOption) {
   const res = await NativeApi.getJson(devId, featureId)
   const isNormalData = Array.isArray(parseJSON(res?.data))
   if (res.success && isNormalData) {
@@ -189,11 +186,12 @@ export async function getRemoteFlag(devId: string) {
     }
   } else {
     if (res.msg?.includes('资源未找到') || !isNormalData) {
-      const res = await NativeApi.putJson(devId, featureId, JSON.stringify(defFlagList))
+      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(defFlagList)
+          data: cloneDeep(flags)
         }
       }
       return { success: false }

package/src/modules/flags/FlagInfo.tsx

@@ -31,7 +31,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 231,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('flag_leverkusen'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -42,7 +42,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 255,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_DE'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -56,7 +56,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 254,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_BE'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -67,7 +67,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 253,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_FR'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -78,7 +78,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 252,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_PT'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -89,7 +89,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 251,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_scotland'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -100,18 +100,18 @@ export const defFlagList: FlagUiInfo[] = [
     id: 250,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_ES'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 357, s: 87, v: 100}, {h: 47, s: 100, v: 100}, {h: 357, s: 87, v: 100}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 47, s: 100, v: 100}, {h: 357, s: 87, v: 100}]
   },
   {
     id: 249,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_TR'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -122,7 +122,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 248,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_AT'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -133,7 +133,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 247,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_england'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -144,7 +144,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 246,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_HU'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -155,7 +155,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 245,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_SK'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -166,7 +166,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 244,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_AL'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -177,7 +177,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 243,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_DK'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -188,7 +188,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 242,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_NL'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -199,7 +199,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 241,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_RO'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -210,7 +210,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 240,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_CH'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -221,7 +221,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 239,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_RS'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -232,7 +232,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 238,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_IT'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -243,7 +243,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 237,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_CZ'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -254,7 +254,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 236,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_SI'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -265,7 +265,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 235,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_HR'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -276,7 +276,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 234,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_SE'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -287,7 +287,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 233,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_NO'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -298,7 +298,7 @@ export const defFlagList: FlagUiInfo[] = [
     id: 232,
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
-    speed: 70,
+    speed: 75,
     name: I18n.getLang('country_PL'),
     whiteColors: [
       { brightness: 100, colorTemp: 0},
@@ -306,3 +306,570 @@ export const defFlagList: FlagUiInfo[] = [
     colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
   },
 ]
+
+export const def2Pids = ['k588eygmfkdzmpzm']
+// k588eygmfkdzmpzm
+export const def2FlagList: FlagUiInfo[] = [
+  {
+    id: 231,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('flag_leverkusen'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 0, s: 0, v: 100}, {h: 60, s: 100, v: 100}]
+  },
+  {
+    id: 255,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_DE'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [
+      {h: 48, s: 100, v: 100},
+      {h: 360, s: 100, v: 100},
+      {h: 0, s: 85, v: 46},
+      {h: 0, s: 0, v:0}],
+  },
+  {
+    id: 254,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_BE'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 48, s: 100, v: 100}, {h: 48, s: 99, v: 58}, {h: 0, s: 0, v: 0}]
+  },
+  {
+    id: 253,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_FR'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 0, s: 0, v: 100}, {h: 212, s: 100, v: 100}]
+  },
+  {
+    id: 252,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_PT'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 150, s: 96, v: 100}]
+  },
+  {
+    id: 251,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_scotland'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 209, s: 86, v: 100}, {h: 0, s: 0, v: 100}, {h: 0, s: 0, v: 100}, {h: 209, s: 86, v: 100}]
+  },
+  {
+    id: 250,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_ES'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 47, s: 100, v: 100}, {h: 47, s: 100, v: 100}, {h: 357, s: 87, v: 100}]
+  },
+  {
+    id: 249,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_TR'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 248,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_AT'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 247,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_england'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 0, s: 0, v: 100}]
+  },
+  {
+    id: 246,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_HU'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 133, s: 36, v: 100}, {h: 0, s: 0, v: 100}, {h: 0, s: 0, v: 100},{h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 245,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_SK'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 213, s: 93, v: 100}, {h: 0, s: 0, v: 100}, {h: 0, s: 0, v: 100}]
+  },
+  {
+    id: 244,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_AL'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v:0}, {h: 0, s: 0, v:0}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 243,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_DK'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v:100}, {h: 0, s: 0, v:100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 242,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_NL'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 217, s: 100, v: 100}, {h: 0, s: 0, v:100}, {h: 0, s: 0, v:100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 241,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_RO'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 48, s: 91, v: 100}, {h: 219, s: 100, v: 100}]
+  },
+  {
+    id: 240,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_CH'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 239,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_RS'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 231, s: 100, v: 100}, {h: 0, s: 0, v: 100},{h: 0, s: 0, v: 100}]
+  },
+  {
+    id: 238,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_IT'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100},{h: 0, s: 0, v: 100}, {h: 149, s: 100, v: 100}]
+  },
+  {
+    id: 237,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_CZ'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 0, s: 0, v: 100}, {h: 211, s: 99, v: 100}]
+  },
+  {
+    id: 236,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_SI'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 217, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 0, s: 0, v: 100}]
+  },
+  {
+    id: 235,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_HR'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 231, s: 100, v: 100}, {h: 0, s: 0, v: 100},{h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 234,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_SE'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 201, s: 100, v: 100}, {h: 48, s: 99, v: 100},{h: 48, s: 99, v: 100}, {h: 201, s: 100, v: 100}]
+  },
+  {
+    id: 233,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_NO'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 0, s: 0, v: 100}, {h: 231, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 232,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_PL'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
+  }
+]
+
+export const def3Pids = ['uzoammz8zm0onv1i', '85bmfxhxpmwj7exf']
+// uzoammz8zm0onv1i  85bmfxhxpmwj7exf
+export const def3FlagList: FlagUiInfo[] = [
+  {
+    id: 231,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('flag_leverkusen'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 60, s: 100, v: 100}]
+  },
+  {
+    id: 255,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_DE'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [
+      {h: 48, s: 100, v: 100},
+      {h: 360, s: 100, v: 100},
+      {h: 0, s: 0, v:0}],
+  },
+  {
+    id: 254,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_BE'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 48, s: 100, v: 100}, {h: 0, s: 0, v: 0}]
+  },
+  {
+    id: 253,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_FR'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 212, s: 100, v: 100}]
+  },
+  {
+    id: 252,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_PT'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 120, s: 96, v: 100}]
+  },
+  {
+    id: 251,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_scotland'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 209, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 209, s: 100, v: 100}]
+  },
+  {
+    id: 250,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_ES'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 47, s: 100, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 249,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_TR'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
+  },
+  {
+    id: 248,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_AT'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 247,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_england'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
+  },
+  {
+    id: 246,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_HU'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 120, s: 100, v: 58}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 245,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_SK'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 213, s: 100, v: 84}, {h: 0, s: 0, v: 100}]
+  },
+  {
+    id: 244,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_AL'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v:0}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 243,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_DK'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v:100}, {h: 360, s: 100, v: 100}, {h: 0, s: 0, v:100}]
+  },
+  {
+    id: 242,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_NL'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 217, s: 100, v: 77}, {h: 0, s: 0, v:0}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 241,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_RO'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 48, s: 91, v: 100}, {h: 219, s: 100, v: 100}]
+  },
+  {
+    id: 240,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_CH'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 239,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_RS'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 0, s: 0, v: 100}, {h: 210, s: 100, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 238,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_IT'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 212, s: 4, v: 100}, {h: 120, s: 100, v: 100}]
+  },
+  {
+    id: 237,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_CZ'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 211, s: 100, v: 100}]
+  },
+  {
+    id: 236,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_SI'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 217, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
+  },
+  {
+    id: 235,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_HR'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 0, s: 0, v: 100}, {h: 220, s: 89, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 234,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_SE'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 201, s: 100, v: 100}, {h: 48, s: 99, v: 100}, {h: 201, s: 100, v: 100}]
+  },
+  {
+    id: 233,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_NO'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 0, s: 0, v: 100}, {h: 218, s: 100, v: 100}, {h: 360, s: 100, v: 100}]
+  },
+  {
+    id: 232,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 75,
+    name: I18n.getLang('country_PL'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
+  },
+]

package/src/modules/flags/FlagPage.tsx

@@ -5,11 +5,11 @@ import { FlatList } from "react-native";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import { Utils } from "tuya-panel-kit";
 import FlagItem from "./FlagItem";
-import { FlagUiInfo } from "./FlagInfo";
+import { FlagUiInfo, def2Pids, def3Pids } from "./FlagInfo";
 import { getRemoteFlag, saveFlag, saveFlagMode, useFlag } from "./FlagActions";
 import { useRoute, useNavigation } from '@react-navigation/core'
 import I18n from "@ledvance/base/src/i18n";
-import { useReactive } from "ahooks";
+import { useReactive, useUpdateEffect } from "ahooks";
 import { cloneDeep, difference, isEqual, last, map, range } from "lodash";
 import { ui_biz_routerKey } from "../../navigation/Routers";
 import res from "@ledvance/base/src/res";
@@ -17,6 +17,7 @@ import { hsv2Hex } from "@ledvance/base/src/utils";
 import { SceneNodeTransitionMode } from "@ledvance/group-ui-biz-bundle/src/modules/mood/SceneInfo";
 import { Result } from "@ledvance/base/src/models/modules/Result";
 import { WorkMode } from "@ledvance/base/src/utils/interface";
+import TextField from "@ledvance/base/src/components/TextField";
 const cx = Utils.RatioUtils.convertX
 
 export interface FlagPageProps {
@@ -51,7 +52,8 @@ const FlagPage = () => {
   const state = useReactive({
     loading: true,
     flags: cloneDeep(flags) as FlagUiInfo[],
-    moods: params.isStripLight ? [] : cloneDeep(moods)
+    moods: params.isStripLight ? [] : cloneDeep(moods),
+    searchText: ''
   })
   const defParams = {
     workModeDpCode: params.workModeCode,
@@ -69,6 +71,7 @@ const FlagPage = () => {
     if (flagState && state.flags?.length) {
       const { flag } = flagState
       if(params.isStripLight && flag?.colors !== undefined){
+        if(flagMode?.flagId !== undefined) return flagMode.flagId
         const v = state.flags.find(item => {
           return isEqual(item.colors, flag?.colors)
         })
@@ -80,7 +83,7 @@ const FlagPage = () => {
     }
 
     return -1
-  }, [JSON.stringify(flagState), JSON.stringify(state.flags)])
+  }, [JSON.stringify(flagState), JSON.stringify(state.flags), flagMode])
 
   useEffect(() => {
     if(!flags?.length){
@@ -96,8 +99,17 @@ const FlagPage = () => {
     }
   }, [])
 
+  useUpdateEffect(() =>{
+    state.flags = state.searchText !== '' ? cloneDeep(flags).filter(flag => flag.name.includes(state.searchText)) : cloneDeep(flags)
+  }, [state.searchText, flags])
+
   const getRemoteFlagInfo = async () => {
-    const res = await getRemoteFlag(uaGroupInfo.tyGroupId.toString())
+    const defNum = uaGroupInfo.groupDevices.filter(device => !(def2Pids.includes(device.tyPid) || def3Pids.includes(device.tyPid))).length
+    const def2Num = uaGroupInfo.groupDevices.filter(device => def2Pids.includes(device.tyPid)).length
+    const def3Num = uaGroupInfo.groupDevices.filter(device => def3Pids.includes(device.tyPid)).length
+    const isDef2 = def2Num > def3Num && def2Num > defNum
+    const isDef3 = def3Num > def2Num && def3Num > defNum
+    const res = await getRemoteFlag(uaGroupInfo.tyGroupId.toString(), {isDef2, isDef3})
     if (res.success) {
       let cloneFlag: FlagUiInfo[] = cloneDeep(res.data) || []
       if(!params.drawToolLight){
@@ -147,27 +159,38 @@ const FlagPage = () => {
     if (res.success) {
       state.flags = cloneDeep(newScene)
       setFlags(cloneDeep(newScene))
-      if(mode === 'del' && flagState?.flag && (checkedMood.id !== flagState.flag.id)){
+      if(mode === 'del' && flagState?.flag && (checkedMood.id !== flagId)){
         return{
           success: true
         }
       }
-      updateFlagMode()
-      return setFlag({
-        ...defParams,
-        flag: cloneDeep(mood)
-      })
+      if(mood){
+        setFlag({
+          ...defParams,
+          flag: cloneDeep(mood)
+        }).then()
+        updateFlagMode(true, mood)
+      }else{
+        updateFlagMode(false)
+      }
+      return {
+        success: true
+      }
     }
     return {
       success: false
     }
   }
 
-  const updateFlagMode = () =>{
-    if(!flagMode){
-      saveFlagMode(uaGroupInfo.tyGroupId.toString(), JSON.stringify(true)).then()
-      setFlagMode(true)
-    }
+  const updateFlagMode = (flagMode: boolean, flag?:FlagUiInfo) =>{
+    saveFlagMode(uaGroupInfo.tyGroupId.toString(), JSON.stringify({
+      flagMode,
+      flagId: flag?.id
+    })).then()
+    setFlagMode({
+      flagMode,
+      flagId: flag?.id
+    })
   }
 
   return (
@@ -180,7 +203,6 @@ const FlagPage = () => {
           ...state.flags,
           ...state.moods
         ], 'id')
-        console.log(useIds, '< --- useIds')
         const idRange = range(0, 256)
         const unuseId = last(difference(idRange, useIds))
         if (unuseId !== undefined) {
@@ -188,6 +210,13 @@ const FlagPage = () => {
         }
       }}
     >
+      <TextField 
+        style={{marginHorizontal: cx(24)}}
+        value={state.searchText}
+        onChangeText={(v)=>{
+          state.searchText = v
+        }}
+      />
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
@@ -201,7 +230,7 @@ const FlagPage = () => {
                 ...defParams,
                 flag: cloneDeep(item),
               })
-              updateFlagMode()
+              updateFlagMode(true, item)
             }
           }}
           onPress={() => {

package/src/modules/mood/MoodPage.tsx

@@ -33,7 +33,7 @@ interface MoodPageUIState extends ScenePageUIState {
 export interface MoodPageProps {
   switchLedDpCode: string
   sceneDataDpCode: string
-  mixSceneDataDpCode: string
+  mixSceneDataDpCode?: string
   workModeDpCode: string
   isSupportFan?: boolean
   isSupportUVC?: boolean

package/src/modules/mood/SceneAction.ts

@@ -32,7 +32,7 @@ export function useSwitchLed(): [boolean, (value: boolean) => Promise<Result<any
 
 interface SceneDataType {
   sceneDataDpCode: string
-  mixSceneDataDpCode: string
+  mixSceneDataDpCode?: string
   scene?: SceneUIState
   workModeDpCode: string
   workMode: WorkMode

package/src/modules/time_schedule/TimeScheduleDetailPage.tsx

@@ -32,6 +32,7 @@ import SocketItem from '@ledvance/base/src/components/SocketItem'
 import { WorkMode } from "@ledvance/base/src/utils/interface";
 import { Buffer } from 'buffer'
 import { fanModeOption, actionOption } from "./TimeScheduleActions";
+import LoadingView from "@ledvance/base/src/components/LoadingView";
 
 const { convertX: cx } = Utils.RatioUtils;
 const { toFixedString } = Utils.NumberUtils;
@@ -65,7 +66,8 @@ const TimeScheduleDetailPage = () => {
     hsv: defaultHsv(),
     stripState: defaultStripState(),
     scene: '',
-    loading: false
+    loading: false,
+    moodLoading: false
   })
 
   const tabList = useCreation(() => {
@@ -113,6 +115,7 @@ const TimeScheduleDetailPage = () => {
 
   useEffect(() => {
     if (!(moods && moods.length) && props.sceneDataCode) {
+      state.moodLoading = true
       getRemoteSceneList(uaGroupInfo.tyGroupId.toString(), {
         isSupportColor: props.isSupportColor,
         isSupportTemperature: props.isSupportTemperature,
@@ -124,6 +127,9 @@ const TimeScheduleDetailPage = () => {
           setMoods(res.data)
           if (props.mode === 'add') state.scene = getDpByScene(res.data[0])
         }
+        state.moodLoading = false
+      }).catch(() => {
+        state.moodLoading = false
       })
     }
   }, [])
@@ -680,7 +686,10 @@ const TimeScheduleDetailPage = () => {
               isSupportMode={props.isSupportUVC}
             />}
           </> :
-          <FlatList
+          ( state.moodLoading ?
+              <LoadingView />
+              :
+            <FlatList
             data={cloneDeep(moods)}
             renderItem={({ item }) => {
               return (
@@ -702,6 +711,7 @@ const TimeScheduleDetailPage = () => {
               />
             </View>)}
             keyExtractor={item => `${item.id}`} />
+          )
         }
         <Spacer height={cx(20)} />
         <Text style={[styles.itemTitle, styles.cardContainer]}>{I18n.getLang('timeschedule_add_schedule_subheadline4_text')}</Text>