@ledvance/ui-biz-bundle 1.1.70 → 1.1.72

package/package.json

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

package/src/modules/timer/TimerPageAction.ts

@@ -129,3 +129,14 @@ export const useProgress = (dps: dpItem[]) => {
     ...dp
   }))
 }
+
+export function timeFormat(time: number): string {
+  let hour = Math.trunc(time / 3600)
+  const beforeMin = (time % 3600) / 60
+  let min = Math.ceil(beforeMin)
+  if (min === 60) {
+    hour += 1
+    min = 0
+  }
+  return `${hour > 0 ? `${hour} h ` : ''}${min > 0 ? `${min} min` : ''}`
+}

package/src/navigation/Routers.ts

@@ -43,4 +43,5 @@ export const ui_biz_routerKey = {
   'ui_biz_light_mode': 'ui_biz_light_mode',
   'ui_biz_overcharge_switch': 'ui_biz_overcharge_switch',
   'ui_biz_child_lock': 'ui_biz_child_lock',
+  'ui_biz_remote_control': 'ui_biz_remote_control'
 }

package/src/newModules/fixedTime/FixedTimeActions.ts

@@ -91,7 +91,7 @@ export const useFixedTime: UseFixedTimeType = (dpKey, isPlug, disableFeature) =>
               return {
                 ...item,
                 index: idx,
-                name: featureItem ? featureItem?.n : `${I18n.getLang('randomtimecycle_sockets_headline_text')} ${idx + 1}`
+                name: featureItem && featureItem?.n ? featureItem?.n : `${I18n.getLang('randomtimecycle_sockets_headline_text')} ${idx + 1}`
               }
             })
             setFixedTimeUiList(uiPlan)
@@ -218,7 +218,7 @@ const fixedTimeObj2Dp = (randomTimerData: FixedTimerData, isPlug?: boolean) => {
 
 const fixedTimeToHex = (fixedTime: FixedTimer, isPlug?: boolean, isFeatureData?: boolean) => {
   const { weeks, startTime, endTime, openTime, closeTime, channel, enable } = fixedTime
-  const channelStr = padStart((channel ?? 0).toString(2), 7, '0');
+  const channelStr = padStart((channel ?? (isPlug ? 0 : 1)).toString(2), 7, '0');
   const powerChannel = parseInt(`${channelStr}${enable ? 1 : 0}`, 2);
   const powerChannelStr = to16(powerChannel, 2);
   const weeksValue: string = padStart([...weeks].reverse().join(''), 8, '0');

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -146,7 +146,7 @@ const FixedTimeDetailPage = () => {
             {state.fixedTime.channel === undefined ?
               <Text>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text> :
               <View style={[styles.applyItem, { marginBottom: cx(10), borderRadius: 4 }]}>
-                <Text style={{ color: '#000' }}>{params.applyForList[state.fixedTime.channel]?.key}</Text>
+                <Text style={{ color: '#000' }}>{params.applyForList[params.isPlug ? state.fixedTime.channel : 0]?.key}</Text>
                 {params.applyForList.length > 1 && <TouchableOpacity
                   onPress={() => {
                     state.fixedTime.channel = undefined
@@ -158,13 +158,13 @@ const FixedTimeDetailPage = () => {
             }
           </View>
           {params.applyForList.map((item, index) => {
-            if (state.fixedTime.channel === index) return null
+            if ((params.isPlug ? state.fixedTime.channel : 0)=== index) return null
             return (
               <TouchableOpacity
                 style={styles.applyItem}
                 key={item.key}
                 onPress={() => {
-                  state.fixedTime.channel = index
+                  state.fixedTime.channel = params.isPlug ? index : 1
                 }}>
                 <Text style={{ color: '#000' }}>{item.key}</Text>
                 <Image style={{ width: cx(16), height: cx(16) }} source={res.device_panel_timer_add} />

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -117,7 +117,7 @@ const FixedTimePage = () => {
       loading={state.loading}
       onBackClick={navigation.goBack}
       onHeadlineIconClick={() => {
-        navigateToEdit('add', newFixedTime())
+        navigateToEdit('add', newFixedTime(!!params.isPlug))
       }}
     >
       <ScrollView nestedScrollEnabled={true}>
@@ -185,7 +185,7 @@ const FixedTimePage = () => {
               }}
               textStyle={{ color: '#fff' }}
               onPress={() => {
-                navigateToEdit('add', newFixedTime())
+                navigateToEdit('add', newFixedTime(!!params.isPlug))
               }} />}
           </View>}
       </ScrollView>
@@ -230,7 +230,7 @@ const FixedTimeCard = memo((props: {
   )
 })
 
-const newFixedTime = () => {
+const newFixedTime = (isPlug: boolean) => {
   const startTime = dayjs().hour() * 60 + dayjs().minute()
   return {
     name: '',
@@ -240,7 +240,7 @@ const newFixedTime = () => {
     endTime: startTime + 60,
     closeTime: 1,
     openTime: 1,
-    channel: 0,
+    channel: isPlug ? 0 : 1,
     color: {
       h: 0,
       s: 100,

package/src/newModules/mood/AddMoodPage.tsx

@@ -1,194 +1,194 @@
-import Strings from '@ledvance/base/src/i18n';
-import Page from '@ledvance/base/src/components/Page';
-import React, { useCallback } from 'react';
-import { FlatList, StyleSheet, Text, View } from 'react-native';
-import { Utils } from 'tuya-panel-kit';
-import RecommendMoodItem from './RecommendMoodItem';
-import Spacer from '@ledvance/base/src/components/Spacer';
-import { useReactive } from 'ahooks';
-import { useNavigation, useRoute } from '@react-navigation/native';
-import {
-  MoodPageParams,
-  MoodNodeTransitionMode,
-  MoodUIInfo,
-  MoodJumpGradientMode,
-} from './Interface';
-import { Result } from '@ledvance/base/src/models/modules/Result';
-import { ui_biz_routerKey } from '../../navigation/Routers'
-import { difference, head, range } from 'lodash';
-import { RecommendMood, getRecommendMixMoods, getRecommendMoods } from './MoodInfo';
-
-const cx = Utils.RatioUtils.convertX;
-
-export interface AddMoodPageParams {
-  isStatic: boolean;
-  moodIds: number[];
-  moduleParams: MoodPageParams;
-  nameRepeat: (mood: MoodUIInfo) => boolean
-  modDeleteMood: (mode: 'add' | 'edit' | 'del', currentMood: MoodUIInfo) => Promise<Result<any>>;
-}
-
-interface AddMoodPageState {
-  data: RecommendMood[];
-}
-
-const AddMoodPage = () => {
-  const navigation = useNavigation();
-  const routeParams = useRoute().params as AddMoodPageParams;
-  const moduleParams = routeParams.moduleParams;
-  const isMix = !!(moduleParams.isMixLight || moduleParams.isCeilingLight);
-  const state = useReactive<AddMoodPageState>({
-    data: isMix
-      ? getRecommendMixMoods(routeParams.isStatic, moduleParams)
-      : getRecommendMoods(routeParams.isStatic, moduleParams),
-  });
-
-  const getFormateItem = item => {
-    return {
-      ...item,
-      version: 0,
-      secondaryLamp: item.secondaryLamp ?? {
-        nodes: [],
-        mode: 0,
-        speed: 75,
-      },
-    };
-  };
-
-  const onMoodItemClick = useCallback(
-    (moodItem: RecommendMood) => {
-      const idRange = range(0, 256);
-      const mainId: number = head(difference(idRange, routeParams.moodIds)) || 0;
-      const secondaryId: number = moduleParams.isCeilingLight ? head(difference(idRange, [...routeParams.moodIds, mainId])) || 0 : 0
-      const url = routeParams.isStatic
-        ? ui_biz_routerKey.ui_biz_static_mood_edit
-        : !!(moduleParams.isCeilingLight || moduleParams.isMixLight)
-          ? ui_biz_routerKey.ui_biz_dynamic_mix_mood_edit
-          : ui_biz_routerKey.ui_biz_dynamic_mood_edit;
-      const currentMood = moodItem.mainLamp
-        ? { ...moodItem, id: mainId, mainLamp: { ...moodItem.mainLamp, id: mainId }, secondaryLamp: { ...moodItem.secondaryLamp, id: secondaryId } }
-        : newMood(mainId, secondaryId, moduleParams.isSupportColor, routeParams.isStatic, moduleParams);
-      navigation.navigate(url, {
-        ...routeParams,
-        mode: 'add',
-        currentMood,
-      });
-    },
-    [routeParams]
-  );
-
-  return (
-    <Page
-      backText={Strings.getLang('add_new_static_mood_system_back')}
-      headlineText={Strings.getLang(
-        routeParams.isStatic
-          ? 'add_new_static_mood_headline_text'
-          : 'add_new_dynamic_mood_headline_text'
-      )}
-    >
-      <View style={styles.root}>
-        <Text style={styles.desc}>
-          {Strings.getLang(
-            routeParams.isStatic
-              ? 'add_new_static_mood_description_text'
-              : 'add_new_dynamic_mood_description_text'
-          )}
-        </Text>
-        <FlatList
-          style={{ flex: 1 }}
-          data={state.data}
-          renderItem={({ item }) => {
-            return (
-              <RecommendMoodItem
-                title={item.name}
-                isMix={isMix}
-                mood={getFormateItem(item)}
-                deviceTypeOption={moduleParams}
-                onPress={() => {
-                  onMoodItemClick(item);
-                }}
-              />
-            );
-          }}
-          ItemSeparatorComponent={() => <Spacer />}
-          ListHeaderComponent={() => <Spacer />}
-          ListFooterComponent={() => <Spacer />}
-          keyExtractor={item => item.name}
-        />
-      </View>
-    </Page>
-  );
-};
-
-const styles = StyleSheet.create({
-  root: {
-    flex: 1,
-    flexDirection: 'column',
-  },
-  desc: {
-    color: '#000',
-    fontSize: cx(16),
-    marginHorizontal: cx(24),
-    marginTop: cx(12),
-  },
-});
-
-export default AddMoodPage;
-
-const defStripConfig = {
-  version: 0,
-  expand: 0,
-  reserved1: 0,
-  reserved2: 0,
-  segmented: 0,
-  loop: 0,
-  excessive: 0,
-  direction: 0,
-}
-
-function newMood(
-  mainId: number,
-  secondaryId: number,
-  isColorMode: boolean,
-  isStatic: boolean,
-  moduleParams: MoodPageParams
-): MoodUIInfo {
-  const jump = moduleParams.isStringLight
-    ? MoodJumpGradientMode.StringJump
-    : moduleParams.isStripLight
-      ? MoodJumpGradientMode.StripJump
-      : MoodJumpGradientMode.SourceJump;
-  const node = {
-    brightness: 100,
-    colorTemp: 100,
-    h: 0,
-    s: 100,
-    v: 100,
-    isColorNode: !!(moduleParams.isCeilingLight || moduleParams.isMixLight) ? false : isColorMode,
-  };
-  return {
-    version: 0,
-    name: '',
-    image: '',
-    id: mainId,
-    mainLamp: {
-      id: mainId,
-      speed: 75,
-      enable: true,
-      fanEnable: true,
-      fanSpeed: 1,
-      ...defStripConfig,
-      mode: isStatic ? MoodNodeTransitionMode.Static : jump,
-      nodes: isStatic ? [node] : [node, { ...node }],
-    },
-    secondaryLamp: {
-      id: secondaryId,
-      enable: true,
-      mode: MoodJumpGradientMode.StripJump,
-      speed: 75,
-      ...defStripConfig,
-      version: 1,
-      nodes: isStatic ? [] : [{ ...node, isColorNode: true }, { ...node, isColorNode: true }],
-    },
-  };
-}
+import Strings from '@ledvance/base/src/i18n';
+import Page from '@ledvance/base/src/components/Page';
+import React, { useCallback } from 'react';
+import { FlatList, StyleSheet, Text, View } from 'react-native';
+import { Utils } from 'tuya-panel-kit';
+import RecommendMoodItem from './RecommendMoodItem';
+import Spacer from '@ledvance/base/src/components/Spacer';
+import { useReactive } from 'ahooks';
+import { useNavigation, useRoute } from '@react-navigation/native';
+import {
+  MoodPageParams,
+  MoodNodeTransitionMode,
+  MoodUIInfo,
+  MoodJumpGradientMode,
+} from './Interface';
+import { Result } from '@ledvance/base/src/models/modules/Result';
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import { difference, head, range } from 'lodash';
+import { RecommendMood, getRecommendMixMoods, getRecommendMoods } from './MoodInfo';
+
+const cx = Utils.RatioUtils.convertX;
+
+export interface AddMoodPageParams {
+  isStatic: boolean;
+  moodIds: number[];
+  moduleParams: MoodPageParams;
+  nameRepeat: (mood: MoodUIInfo) => boolean
+  modDeleteMood: (mode: 'add' | 'edit' | 'del', currentMood: MoodUIInfo) => Promise<Result<any>>;
+}
+
+interface AddMoodPageState {
+  data: RecommendMood[];
+}
+
+const AddMoodPage = () => {
+  const navigation = useNavigation();
+  const routeParams = useRoute().params as AddMoodPageParams;
+  const moduleParams = routeParams.moduleParams;
+  const isMix = !!(moduleParams.isMixLight || moduleParams.isCeilingLight);
+  const state = useReactive<AddMoodPageState>({
+    data: isMix
+      ? getRecommendMixMoods(routeParams.isStatic, moduleParams)
+      : getRecommendMoods(routeParams.isStatic, moduleParams),
+  });
+
+  const getFormateItem = item => {
+    return {
+      ...item,
+      version: 0,
+      secondaryLamp: item.secondaryLamp ?? {
+        nodes: [],
+        mode: 0,
+        speed: 75,
+      },
+    };
+  };
+
+  const onMoodItemClick = useCallback(
+    (moodItem: RecommendMood) => {
+      const idRange = range(0, 256);
+      const mainId: number = head(difference(idRange, routeParams.moodIds)) || 0;
+      const secondaryId: number = moduleParams.isCeilingLight ? head(difference(idRange, [...routeParams.moodIds, mainId])) || 0 : 0
+      const url = routeParams.isStatic
+        ? ui_biz_routerKey.ui_biz_static_mood_edit
+        : !!(moduleParams.isCeilingLight || moduleParams.isMixLight)
+          ? ui_biz_routerKey.ui_biz_dynamic_mix_mood_edit
+          : ui_biz_routerKey.ui_biz_dynamic_mood_edit;
+      const currentMood = moodItem.mainLamp
+        ? { ...moodItem, id: mainId, mainLamp: { ...moodItem.mainLamp, id: mainId }, secondaryLamp: { ...moodItem.secondaryLamp, id: secondaryId } }
+        : newMood(mainId, secondaryId, moduleParams.isSupportColor, routeParams.isStatic, moduleParams);
+      navigation.navigate(url, {
+        ...routeParams,
+        mode: 'add',
+        currentMood,
+      });
+    },
+    [routeParams]
+  );
+
+  return (
+    <Page
+      backText={Strings.getLang('add_new_static_mood_system_back')}
+      headlineText={Strings.getLang(
+        routeParams.isStatic
+          ? 'add_new_static_mood_headline_text'
+          : 'add_new_dynamic_mood_headline_text'
+      )}
+    >
+      <View style={styles.root}>
+        <Text style={styles.desc}>
+          {Strings.getLang(
+            routeParams.isStatic
+              ? 'add_new_static_mood_description_text'
+              : 'add_new_dynamic_mood_description_text'
+          )}
+        </Text>
+        <FlatList
+          style={{ flex: 1 }}
+          data={state.data}
+          renderItem={({ item }) => {
+            return (
+              <RecommendMoodItem
+                title={item.name}
+                isMix={isMix}
+                mood={getFormateItem(item)}
+                deviceTypeOption={moduleParams}
+                onPress={() => {
+                  onMoodItemClick(item);
+                }}
+              />
+            );
+          }}
+          ItemSeparatorComponent={() => <Spacer />}
+          ListHeaderComponent={() => <Spacer />}
+          ListFooterComponent={() => <Spacer />}
+          keyExtractor={item => item.name}
+        />
+      </View>
+    </Page>
+  );
+};
+
+const styles = StyleSheet.create({
+  root: {
+    flex: 1,
+    flexDirection: 'column',
+  },
+  desc: {
+    color: '#000',
+    fontSize: cx(16),
+    marginHorizontal: cx(24),
+    marginTop: cx(12),
+  },
+});
+
+export default AddMoodPage;
+
+const defStripConfig = {
+  version: 0,
+  expand: 0,
+  reserved1: 0,
+  reserved2: 0,
+  segmented: 0,
+  loop: 0,
+  excessive: 0,
+  direction: 0,
+}
+
+function newMood(
+  mainId: number,
+  secondaryId: number,
+  isColorMode: boolean,
+  isStatic: boolean,
+  moduleParams: MoodPageParams
+): MoodUIInfo {
+  const jump = moduleParams.isStringLight
+    ? MoodJumpGradientMode.StringJump
+    : moduleParams.isStripLight
+      ? MoodJumpGradientMode.StripJump
+      : MoodJumpGradientMode.SourceJump;
+  const node = {
+    brightness: 100,
+    colorTemp: 100,
+    h: 0,
+    s: 100,
+    v: 100,
+    isColorNode: !!(moduleParams.isCeilingLight || moduleParams.isMixLight) ? false : isColorMode,
+  };
+  return {
+    version: 0,
+    name: '',
+    image: '',
+    id: mainId,
+    mainLamp: {
+      id: mainId,
+      speed: 75,
+      enable: true,
+      fanEnable: true,
+      fanSpeed: 1,
+      ...defStripConfig,
+      mode: isStatic ? MoodNodeTransitionMode.Static : jump,
+      nodes: isStatic ? [node] : [node, { ...node }],
+    },
+    secondaryLamp: {
+      id: secondaryId,
+      enable: true,
+      mode: MoodJumpGradientMode.StripJump,
+      speed: 75,
+      ...defStripConfig,
+      version: 1,
+      nodes: isStatic ? [] : [{ ...node, isColorNode: true }, { ...node, isColorNode: true }],
+    },
+  };
+}