@ledvance/group-ui-biz-bundle 1.0.128 → 1.0.130

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -84,7 +84,8 @@ export const useFlag: UseFlagType = (params) => {
       }else{
         const paintHex = drawToolFormat({
           adjustCode: 3,
-          colors: flag.colors.map(f => ColorUtils.hsv2hex(f.h,f.s,f.v)).slice(0, 5),
+          colors: flag.colors.map(f => ColorUtils.hsv2hex(f.h,f.s,f.v)),
+          num: flag.colors.length,
           daubType: 0,
           effect: 0
         })

package/src/modules/{swithInching → switchInching}/Router.ts

@@ -1,5 +1,5 @@
 import {NavigationRoute} from "tuya-panel-kit";
-import SwitchInching from "./SwithInching";
+import SwitchInching from "./SwitchInching";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 
 const SwitchInchingRouters: NavigationRoute[] = [

package/src/modules/switchInching/SwitchInching.tsx

@@ -0,0 +1,203 @@
+import React, {useEffect, useMemo, useRef, useState} from "react";
+import {ScrollView, StyleSheet, Text, View} from "react-native";
+import Page from "@ledvance/base/src/components/Page";
+import {useUAGroupInfo} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import {useNavigation} from '@react-navigation/native'
+import {SwitchButton, Utils} from "tuya-panel-kit";
+import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
+import I18n from '@ledvance/base/src/i18n'
+import {defSwitchInching, SwitchInchingItem, SwitchInchingPageParams, useSwitchInching} from "./SwitchInchingAction";
+import ThemeType from '@ledvance/base/src/config/themeType'
+import Segmented from "@ledvance/base/src/components/Segmented";
+import Spacer from "@ledvance/base/src/components/Spacer";
+import { useParams } from "@ledvance/base/src/hooks/Hooks";
+
+const { convertX: cx } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
+
+const SwitchInching = (props: { theme?: ThemeType }) => {
+  const params = useParams<SwitchInchingPageParams>()
+  const uaGroupInfo = useUAGroupInfo()
+  const navigation = useNavigation()
+  const [switchInching, setSwitchInching] = useSwitchInching()
+  const timeRef = useRef({
+    minute: '00',
+    second: '00',
+  })
+  const [state, setState] = useState({
+    loading: false,
+    channel: 0,
+    switchInchingItem: defSwitchInching[0]
+  })
+
+  const updateState = (newState: Partial<typeof state>) => {
+    setState(prev => ({ ...prev, ...newState }));
+  };
+
+  const updateTime = (minute?: string, second?: string) => {
+    if (minute !== undefined) timeRef.current.minute = minute;
+    if (second !== undefined) timeRef.current.second = second;
+
+    if (!Number(timeRef.current.minute) && Number(timeRef.current.second) < 1) {
+      timeRef.current.second = '01';
+    }
+
+    if (Number(timeRef.current.minute) === 60) {
+      timeRef.current.second = '00';
+    }
+
+    const time = Number(timeRef.current.minute) * 60 + Number(timeRef.current.second);
+    const newSwitchInchingItem = {
+      ...state.switchInchingItem,
+      time
+    };
+
+    updateState({ switchInchingItem: newSwitchInchingItem });
+
+  };
+
+  const switchInchingItem = useMemo(() => {
+    return switchInching.find(item => item.channel === state.channel) ?? { ...defSwitchInching[0], channel: state.channel }
+  }, [state.channel, JSON.stringify(switchInching)])
+
+  useEffect(() => {
+    const { minute, second } = formateValue(switchInchingItem)
+    timeRef.current = { minute, second }
+    updateState({ switchInchingItem })
+  }, [switchInchingItem])
+
+  const saveInchingConfig = async (item: SwitchInchingItem) => {
+    const updatedSwitchInching = [...switchInching];
+    const existingItemIndex = updatedSwitchInching.findIndex(item => item.channel === state.channel);
+    if (existingItemIndex === -1) {
+      updatedSwitchInching.push(item);
+    } else {
+      updatedSwitchInching[existingItemIndex] = item;
+    }
+    await setSwitchInching(updatedSwitchInching)
+  }
+
+  const formateValue = (switchInchingItem: SwitchInchingItem) => {
+    const minute = Math.floor((switchInchingItem.time || 0) / 60).toString().padStart(2, '0')
+    const second = ((switchInchingItem.time || 0) % 60).toString().padStart(2, '0')
+    return { minute, second }
+  }
+
+  const styles = StyleSheet.create({
+    switchContainer: {
+      backgroundColor: props.theme?.container.background,
+      marginHorizontal: cx(24),
+      padding: cx(10),
+      borderRadius: cx(6),
+      flexDirection: 'column',
+    },
+    switchCardContainer: {
+      paddingVertical: cx(4),
+      paddingHorizontal: cx(10),
+      backgroundColor: props.theme?.global.background,
+      flexDirection: 'row',
+      justifyContent: 'center',
+      alignItems: 'center',
+      borderRadius: cx(6),
+    },
+    switchCardTitle: {
+      color: props.theme?.global.fontColor,
+      fontSize: cx(14),
+      flex: 1,
+      fontWeight: '400',
+    },
+    switchDescription: {
+      color: props.theme?.global.fontColor,
+      flexWrap: 'wrap',
+      fontSize: cx(12),
+      marginTop: cx(4),
+    },
+    secondTopic: {
+      color: props.theme?.global.fontColor,
+      flexWrap: 'wrap',
+      fontSize: cx(14),
+      marginTop: cx(30),
+      marginHorizontal: cx(24),
+    },
+    pickContainer: {
+      position: 'relative',
+      marginVertical: cx(24),
+      marginHorizontal: cx(24),
+    },
+    disabledCover: {
+      position: 'absolute',
+      width: '100%',
+      height: '100%',
+      left: 0,
+      top: 0,
+      zIndex: 999,
+    },
+  })
+
+  return (
+    <Page
+      backText={uaGroupInfo.name}
+      onBackClick={navigation.goBack}
+      headlineText={I18n.getLang('sockets_specific_settings_switch_inching')}
+    >
+      <ScrollView nestedScrollEnabled={true}>
+        {params.channelConfig && params.channelConfig.length > 1 && <>
+            <Segmented
+                style={{ marginHorizontal: cx(24) }}
+                options={params.channelConfig.map(item => ({
+                  label: item.channelTitle,
+                  value: item.channel
+                }))}
+                value={state.channel}
+                onChange={v => {
+                  updateState({ channel: Number(v) })
+                }}
+            />
+            <Spacer />
+        </>}
+        <View style={styles.switchContainer}>
+          <View style={styles.switchCardContainer}>
+            <Text style={styles.switchCardTitle}>
+              {I18n.getLang('socket_settings_switch_off_firstbox_text')}
+            </Text>
+            <SwitchButton
+              value={state.switchInchingItem.enable}
+              onValueChange={async v => {
+                const time = Number(timeRef.current.minute) * 60 + Number(timeRef.current.second)
+                const newSwitchInchingItem = {
+                  ...state.switchInchingItem,
+                  enable: v,
+                  time
+                }
+                updateState({ switchInchingItem: newSwitchInchingItem })
+                await saveInchingConfig(newSwitchInchingItem)
+              }}
+            />
+          </View>
+          <Text style={styles.switchDescription}>
+            {I18n.getLang('switchinching_overview_description_text')}
+          </Text>
+        </View>
+        <Text style={styles.secondTopic}>
+          {I18n.getLang('socket_settings_switch_off_secondtopic')}
+        </Text>
+        <View style={styles.pickContainer}>
+          {state.switchInchingItem.enable && <View style={styles.disabledCover} />}
+          <LdvPickerView
+            hour={timeRef.current.minute}
+            minute={timeRef.current.second}
+            unit={[
+              I18n.getLang('socket_settings_switch_off_min'),
+              I18n.getLang('socket_settings_switch_off_s'),
+            ]}
+            setHour={m => updateTime(m, undefined)}
+            setMinute={s => updateTime(undefined, s)}
+            maxHour={61}
+          />
+        </View>
+      </ScrollView>
+    </Page>
+  );
+};
+
+export default withTheme(SwitchInching)

package/src/modules/switchInching/SwitchInchingAction.ts

@@ -0,0 +1,60 @@
+import {Buffer} from 'buffer'
+import {Result} from "@ledvance/base/src/models/modules/Result"
+import {useFeatureHook} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { useMemo } from 'react';
+
+interface SwitchInchingConfig {
+  switchInching: SwitchInchingItem[]
+}
+
+export interface SwitchInchingItem {
+  channel: number,
+  enable: boolean,
+  time: number
+}
+
+export interface SwitchInchingPageParams {
+  channelConfig?: {
+    channelTitle: string
+    channel: number
+  }[]
+}
+
+export const defSwitchInching = [{ enable: false, channel: 0, time: 1 }]
+
+export const useSwitchInching = (): [SwitchInchingItem[], (v: SwitchInchingItem[]) => Promise<Result<any>>] => {
+  const [switchInching, setSwitchInching] = useFeatureHook<SwitchInchingConfig, SwitchInchingItem[]>('switchInching', defSwitchInching, modes => {
+    const buffers = modes.map(mode => { 
+      const buffer = new Uint8Array(3)
+      // 第1个字节：开/关+通道号
+      buffer[0] = packOnOffChannel(mode.enable, mode.channel)
+      // 第2、3个字节：点动时间
+      buffer[1] = (mode.time >> 8) & 0xff
+      buffer[2] = mode.time & 0xff
+      return buffer
+    })
+    const combinedBuffer = new Uint8Array(buffers.length * 3)
+    buffers.forEach((buffer, index) => {
+      combinedBuffer.set(buffer, index * 3)
+    })
+    return Buffer.from(combinedBuffer).toString('base64')
+  })
+
+  
+  const newSwitchInching = useMemo(() => { 
+    if (typeof switchInching === 'object' && !Array.isArray(switchInching)) {
+      const item = JSON.parse(JSON.stringify(switchInching))
+      return [{ ...item, channel: 0 }]
+    }
+    return switchInching
+  }, [switchInching])
+
+  return [newSwitchInching, setSwitchInching]
+}
+
+// 工具函数：将开/关和通道号打包为一个字节
+function packOnOffChannel(enable: boolean, channel: number = 0): number {
+  const enableBit = enable ? 1 : 0;
+  const channelBits = (channel << 1) & 0b11111110;
+  return enableBit | channelBits;
+}

package/src/modules/swithInching/SwithInching.tsx

@@ -1,172 +0,0 @@
-import React, {useEffect} from "react";
-import {StyleSheet, Text, View} from "react-native";
-import Page from "@ledvance/base/src/components/Page";
-import {useUAGroupInfo} from "@ledvance/base/src/models/modules/NativePropsSlice";
-import {useNavigation} from '@react-navigation/native'
-import {SwitchButton, Utils} from "tuya-panel-kit";
-import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
-import I18n from '@ledvance/base/src/i18n'
-import {useReactive, useUpdateEffect} from "ahooks";
-import {useSwitchInching} from "./SwithInchingAction";
-import ThemeType from '@ledvance/base/src/config/themeType'
-
-const {convertX: cx} = Utils.RatioUtils
-const { withTheme } = Utils.ThemeUtils
-
-interface SwitchInchingState {
-  enable: boolean,
-  minute: string,
-  second: string,
-  flag: Symbol | number
-}
-
-const SwitchInching = (props: { theme?: ThemeType }) => {
-  const uaGroupInfo = useUAGroupInfo()
-  const navigation = useNavigation()
-  const [switchInching, setSwitchInching] = useSwitchInching()
-
-  const state = useReactive<SwitchInchingState>({
-    enable: false,
-    minute: '00',
-    second: '00',
-    flag: 1
-  })
-
-  useEffect(() => {
-    state.enable = switchInching.enable
-    state.minute = formatValue('minute')
-    state.second = formatValue('second')
-  }, [JSON.stringify(switchInching)])
-
-
-  const requestSwitchInching = () => {
-    const enable = state.enable
-    const time = Number(state.minute) * 60 + Number(state.second)
-    setSwitchInching({enable, time}).then(_r => {})
-  }
-
-  useEffect(() => {
-    if (state.flag !== 1) {
-      requestSwitchInching()
-    }
-  }, [state.flag])
-
-  useUpdateEffect(() => {
-    if (!Number(state.minute) && Number(state.second) < 2) {
-      state.second = '02'
-    }
-    if (Number(state.minute) === 60) {
-      state.second = '00'
-    }
-  }, [state.minute, state.second])
-
-  const formatValue = (type: string) => {
-    const m = parseInt(String((switchInching?.time || 0) / 60))
-    if (type === 'minute') {
-      return m.toString().padStart(2, '0')
-    } else {
-      const s = switchInching.time - 60 * m
-      return s === 0 ? '00' : s < 10 ? '0' + s : String(s)
-    }
-  }
-
-  const styles = StyleSheet.create({
-    switchContainer: {
-      backgroundColor: props.theme?.container.background,
-      marginHorizontal: cx(24),
-      padding: cx(10),
-      borderRadius: cx(6),
-      flexDirection: 'column',
-    },
-    switchCardContainer: {
-      paddingVertical: cx(4),
-      paddingHorizontal: cx(10),
-      backgroundColor: props.theme?.global.background,
-      flexDirection: 'row',
-      justifyContent: 'center',
-      alignItems: 'center',
-      borderRadius: cx(6),
-    },
-    switchCardTitle: {
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      flex: 1,
-      fontWeight: '400',
-    },
-    switchDescription: {
-      color: props.theme?.global.fontColor,
-      flexWrap: 'wrap',
-      fontSize: cx(12),
-      marginTop: cx(4),
-    },
-    secondTopic: {
-      color: props.theme?.global.fontColor,
-      flexWrap: 'wrap',
-      fontSize: cx(14),
-      marginTop: cx(30),
-      marginHorizontal: cx(24),
-    },
-    pickContainer: {
-      position: 'relative',
-      marginVertical: cx(24),
-      marginHorizontal: cx(24),
-    },
-    disabledCover: {
-      position: 'absolute',
-      width: '100%',
-      height: '100%',
-      left: 0,
-      top: 0,
-      zIndex: 999,
-    },
-  })
-
-  return (
-    <Page
-      backText={uaGroupInfo.name}
-      onBackClick={navigation.goBack}
-      headlineText={I18n.getLang('socket_settings_switch_off_firstbox_text')}
-    >
-      <View style={styles.switchContainer}>
-        <View style={styles.switchCardContainer}>
-          <Text style={styles.switchCardTitle}>
-            {I18n.getLang('socket_settings_switch_off_firstbox_text')}
-          </Text>
-          <SwitchButton
-            value={switchInching.enable}
-            onValueChange={v => {
-              state.enable = v
-              state.flag = Symbol()
-            }}
-          />
-        </View>
-        <Text style={styles.switchDescription}>
-          {I18n.getLang('switchinching_overview_description_text')}
-        </Text>
-      </View>
-      <Text style={styles.secondTopic}>
-        {I18n.getLang('socket_settings_switch_off_secondtopic')}
-      </Text>
-      <View style={styles.pickContainer}>
-        {switchInching.enable && <View style={styles.disabledCover}/>}
-        <LdvPickerView
-          maxHour={61}
-          hour={state.minute}
-          minute={state.second}
-          unit={[
-            I18n.getLang('socket_settings_switch_off_min'),
-            I18n.getLang('socket_settings_switch_off_s'),
-          ]}
-          setHour={m => {
-            state.minute = m
-          }}
-          setMinute={s => {
-            state.second = s
-          }}
-        />
-      </View>
-    </Page>
-  )
-}
-
-export default withTheme(SwitchInching)

package/src/modules/swithInching/SwithInchingAction.ts

@@ -1,32 +0,0 @@
-import {Buffer} from 'buffer'
-import {Result} from "@ledvance/base/src/models/modules/Result"
-import {useFeatureHook} from "@ledvance/base/src/models/modules/NativePropsSlice";
-
-interface SwitchInchingConfig {
-  switchInching: SwitchInchingModel
-}
-
-interface SwitchInchingModel {
-  enable: boolean
-  channel?: number
-  time: number
-}
-
-export const useSwitchInching = (): [SwitchInchingModel, (v: SwitchInchingModel) => Promise<Result<any>>] => {
-  return useFeatureHook<SwitchInchingConfig, SwitchInchingModel>('switchInching', {enable: false, channel: 0, time: 1}, mode => {
-    const buffer = new Uint8Array(3)
-    // 第1个字节：开/关+通道号
-    buffer[0] = packOnOffChannel(mode.enable, mode.channel)
-    // 第2、3个字节：点动时间
-    buffer[1] = (mode.time >> 8) & 0xff
-    buffer[2] = mode.time & 0xff
-    return Buffer.from(buffer).toString('base64')
-  })
-}
-
-// 工具函数：将开/关和通道号打包为一个字节
-function packOnOffChannel(enable: boolean, channel: number = 0): number {
-  const enableBit = enable ? 1 : 0;
-  const channelBits = (channel << 1) & 0b11111110;
-  return enableBit | channelBits;
-}