@ledvance/ui-biz-bundle 1.1.54 → 1.1.56

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -2,8 +2,7 @@ import { useDps } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { FlagPageProps } from "./FlagPage";
 import { SceneNodeTransitionMode } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo";
 import { WORK_MODE, nToHS, parseJSON, toFixed } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
-import { cloneDeep } from "lodash";
-import { FlagItemInfo, FlagUiInfo, defFlagList, def2FlagList, def3FlagList } from "./FlagInfo";
+import { FlagItemInfo, FlagUiInfo, defFlagList } from "./FlagInfo";
 import { hex2Int } from "@ledvance/base/src/utils/common";
 import { spliceByStep } from "@ledvance/base/src/utils/common";
 import { useMemo, useState } from "react";
@@ -222,7 +221,16 @@ export function dp2Obj(dp: string, option?: FlagOption): FlagItemInfo | undefine
 
 }
 
-export async function getRemoteFlag(devId: string) {
+export async function getRemoteFlag(devId: string, isRefresh?: boolean) {
+  if (isRefresh){
+    const res = await NativeApi.putJson(devId, featureId, JSON.stringify(defFlagList))
+    if (res.success){
+      return {
+        success: true,
+        data: defFlagList
+      }
+    }
+  }
   const res = await NativeApi.getJson(devId, featureId)
   const isNormalData = Array.isArray(parseJSON(res?.data))
   if (res.success && isNormalData) {
@@ -236,7 +244,7 @@ export async function getRemoteFlag(devId: string) {
       if (res.success) {
         return {
           success: true,
-          data: cloneDeep(defFlagList)
+          data: defFlagList
         }
       }
       return { success: false }

package/src/modules/flags/FlagPage.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo } from "react";
 import Page from "@ledvance/base/src/components/Page";
 import { useDeviceId, useDeviceInfo, useFlagMode, useFlags, useMoods } from "@ledvance/base/src/models/modules/NativePropsSlice";
-import { FlatList } from "react-native";
+import { FlatList, Image, TouchableOpacity, View } from "react-native";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import { Utils } from "tuya-panel-kit";
 import FlagItem from "./FlagItem";
@@ -19,6 +19,7 @@ import { Result } from "@ledvance/base/src/models/modules/Result";
 import { useDps } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { ColorUtils, WORK_MODE } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import TextField from "@ledvance/base/src/components/TextField";
+import { showDialog } from "@ledvance/base/src/utils/common";
 const cx = Utils.RatioUtils.convertX
 
 export interface FlagPageProps {
@@ -108,8 +109,8 @@ const FlagPage = () => {
     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(devInfo.devId)
+  const getRemoteFlagInfo = async (isRefresh?: boolean) => {
+    const res = await getRemoteFlag(devInfo.devId, isRefresh)
     if (res.success) {
       let cloneFlag: FlagUiInfo[] = cloneDeep(res.data) || []
       state.flags = cloneFlag
@@ -212,14 +213,33 @@ const FlagPage = () => {
         }
       }}
     >
-      <TextField 
-        value={state.searchText}
-        onChangeText={text => {
-          state.searchText = text
-        }}
-        placeholder={I18n.getLang('country_selection_textfield_headline_search')}
-        style={{ marginHorizontal: cx(24) }}
-      />
+      <View style={{flexDirection: 'row', display: 'flex', alignItems: 'center'}}>
+        <TextField 
+          value={state.searchText}
+          onChangeText={text => {
+            state.searchText = text
+          }}
+          placeholder={I18n.getLang('country_selection_textfield_headline_search')}
+          style={{ marginHorizontal: cx(24), flex: 1 }}
+        />
+        <TouchableOpacity style={{paddingRight: cx(24)}}
+          onPress={() =>{
+            showDialog({
+              method: 'confirm',
+              title: I18n.getLang('flag_resetbutton'),
+              subTitle: I18n.getLang('flag_resetdescription'),
+              onConfirm: async (_, {close}) =>{
+                close()
+                state.loading = true 
+                await getRemoteFlagInfo(true)
+                state.loading = false 
+              }
+            })
+          }}
+        >
+          <Image source={res.ic_refresh} style={{width: cx(24), height: cx(24)}}/>
+        </TouchableOpacity>
+      </View>
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem

package/src/modules/mood/MixMood/AddMixMoodPage.tsx

@@ -115,7 +115,7 @@ function newMixMood(mainId: number, secondlyId: number, isStatic: boolean): MixS
       id: mainId,
       speed: 100,
       mode: isStatic ? SceneNodeTransitionMode.Static : 1,
-      nodes: isStatic ? [node] : [node, node]
+      nodes: isStatic ? [{...node}] : [{...node}, {...node}]
     },
     secondlyLamp: {
       ...defSecondly,

package/src/modules/mood/MixMood/MixMoodItem.tsx

@@ -69,7 +69,7 @@ export function MixMoodColorsLine(props: { mixSubLight: MixMainLampInfo, colorLi
       <MoodColorsLine
         nodeStyle={{ borderColor: '#ccc', borderWidth: 1 }}
         width={cx(264)}
-        type={'separate'}
+        type={!colorLight ? 'separate' : (mixSubLight.mode === 1 ? 'gradient' : 'separate')}
         colors={lightColors} />
       <Spacer height={0} width={cx(7)} />
       <View style={styles.gradientItemIconView}>

package/src/modules/timeSchedule/MoodSetting.tsx

@@ -147,7 +147,7 @@ const MoodSetting = (props: MoodSettingProps) => {
             ListFooterComponent={() => (<Spacer />)}
             keyExtractor={item => `${item.name}`} /> :
           <>
-            <View style={styles.tagLine}>
+            <View style={[styles.tagLine, {marginHorizontal: cx(24)}]}>
               <Tag
                 checked={state.staticTagChecked}
                 text={I18n.getLang('mood_overview_filter_name_text1')}
@@ -180,7 +180,7 @@ const MoodSetting = (props: MoodSettingProps) => {
               ListHeaderComponent={() => (<Spacer height={cx(10)} />)}
               ItemSeparatorComponent={() => (<Spacer />)}
               ListFooterComponent={() => (
-                <View style={styles.infoLine}>
+                <View style={[styles.infoLine, {marginHorizontal: cx(24)}]}>
                   <Spacer />
                   <InfoText
                     icon={res.ic_info}