@ledvance/ui-biz-bundle 1.1.133 → 1.1.135

package/src/newModules/swithInching/SwithInching.tsx

@@ -23,7 +23,7 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation()
   const [switchInching, setSwitchInching] = useSwitchInching(params.switchIngCode)
   const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps, true)
-  const [countdowns, setCountdowns] = useCountdowns(params.countdownCode || params.channelConfig.map(item => item.countdownCode))
+  const [countdowns, setCountdowns] = useCountdowns(params.countdownCode || params.channelConfig?.map(item => item.countdownCode) || [])
   const timeRef = useRef({
     minute: '00',
     second: '00',
@@ -41,23 +41,23 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
   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(() => {
@@ -73,8 +73,11 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
   const saveInchingConfig = async (item: SwitchInchingItem) => {
     const updatedSwitchInching = [...switchInching];
     const existingItemIndex = updatedSwitchInching.findIndex(item => item.channel === state.channel);
-    updatedSwitchInching[existingItemIndex] = item;
-    console.log('updatedSwitchInching', updatedSwitchInching)
+    if (existingItemIndex === -1) {
+      updatedSwitchInching.push(item);
+    } else {
+      updatedSwitchInching[existingItemIndex] = item;
+    }
     await setSwitchInching(updatedSwitchInching)
   }
 
@@ -143,18 +146,18 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
     >
       <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 />
+            <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}>

package/src/newModules/swithInching/SwithInchingAction.ts

@@ -3,14 +3,15 @@ import { Result } from "@ledvance/base/src/models/modules/Result"
 import { useDp } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { spliceByStep } from '@ledvance/base/src/utils/common';
 import { Utils } from '@tuya/tuya-panel-lamp-sdk'
+import {useEffect, useState} from "react";
 
 const { to16 } = Utils
 export interface SwitchInchingPageParams {
   switchIngCode: string
   countdownCode?: string
   channelConfig?: {
-    countdownCode: string 
-    channelTitle: string 
+    countdownCode: string
+    channelTitle: string
     channel: number
   }[]
   conflictDps: {
@@ -31,20 +32,20 @@ export function useCountdowns(countdownCodes: string | string[]): [Record<string
   const codes = Array.isArray(countdownCodes) ? countdownCodes : [countdownCodes];
   const countdownValues: Record<string, number> = {};
   const dpSetters: Record<string, (value: number) => Promise<Result<any>>> = {};
-  
+
   for (const code of codes) {
     const [value, setDp] = useDp<number, any>(code);
     countdownValues[code] = value;
     dpSetters[code] = setDp;
   }
-  
+
   const setCountdown = async (countdownCode: string, value: number) => {
     if (dpSetters[countdownCode]) {
       return await dpSetters[countdownCode](value);
     }
     return { success: false, msg: 'Countdown code not found' } as Result<any>;
   };
-  
+
   return [countdownValues, setCountdown];
 }
 
@@ -56,15 +57,19 @@ export const defSwitchInching = [{ enable: false, channel: 0, time: 1 }]
 
 export const useSwitchInching = (switchInchingCode: string) => {
   const [hex, setHex] = useSwitchInchingHex(switchInchingCode)
-  const switching = hex ? spliceByStep(Buffer.from(hex, 'base64').toString('hex'), 6).map(item => {
-    const powerInfo = parseInt(`${item.slice(0, 2)}`, 16).toString(2).padStart(8, '0');
-    const powerBits = powerInfo.split('');
-    const enable = !!Number(powerBits[powerBits.length - 1]);
-    // 通道号
-    const channel = parseInt(powerBits.slice(1, powerBits.length - 1).join(''), 2);
-    const time = parseInt(item.slice(2, 6), 16)
-    return { enable, channel, time }
-  }) : defSwitchInching
+  const [value, setValue] = useState(defSwitchInching)
+  useEffect(() => {
+    const switching = hex ? spliceByStep(Buffer.from(hex, 'base64').toString('hex'), 6).map(item => {
+      const powerInfo = parseInt(`${item.slice(0, 2)}`, 16).toString(2).padStart(8, '0');
+      const powerBits = powerInfo.split('');
+      const enable = !!Number(powerBits[powerBits.length - 1]);
+      // 通道号
+      const channel = parseInt(powerBits.slice(1, powerBits.length - 1).join(''), 2);
+      const time = parseInt(item.slice(2, 6), 16)
+      return { enable, channel, time }
+    }) : defSwitchInching
+    setValue(switching)
+  }, [hex]);
 
   const setSwitchInching = (switching: SwitchInchingItem[]) => {
     const inchingString = switching.map(item => {
@@ -75,8 +80,9 @@ export const useSwitchInching = (switchInchingCode: string) => {
       return powerChannelStr + timeHex
     }).join('')
     const inchingHex = Buffer.from(inchingString, 'hex').toString('base64')
+    setValue(switching)
     return setHex(inchingHex)
   }
-  return [switching, setSwitchInching] as const
+  return [value, setSwitchInching] as const
 }
 

package/src/newModules/biorhythm/circular/ItemIcon.d.ts

@@ -1,22 +0,0 @@
-import { PureComponent } from "react";
-import { PanResponderInstance } from "react-native";
-export default class ItemIcon extends PureComponent<any> {
-    lastX: any;
-    lastY: any;
-    _panResponder: PanResponderInstance;
-    state: any;
-    constructor(props: any);
-    componentWillMount(): void;
-    onMoveShouldSetPanResponder(): boolean;
-    onPanResponderMove(evt: any, gestureState: any): void;
-    onPanResponderEnd(evt: any, gestureState: any): void;
-    handlerData(_evt: any, ges: any, moving: any): void;
-    getPointValues(locationX: any, locationY: any): {
-        angle: number;
-        maxX: number;
-        maxY: number;
-        length: number;
-    };
-    getPointAngle(x: any, y: any): number;
-    render(): any;
-}

package/src/newModules/biorhythm/circular/ItemIcon.tsx

@@ -1,173 +0,0 @@
-import React, { PureComponent } from "react";
-import { Image, PanResponder, PanResponderInstance, StyleSheet, View } from "react-native";
-
-const timeIconSize = 40; //时间图标ding
-const deviationSize = 0;
-
-export default class ItemIcon extends PureComponent<any> {
-    lastX: any;
-    lastY: any;
-    _panResponder: PanResponderInstance;
-    state: any;
-
-    constructor(props) {
-        super(props);
-
-        this.onMoveShouldSetPanResponder = this.onMoveShouldSetPanResponder.bind(this);
-        this.onPanResponderMove = this.onPanResponderMove.bind(this);
-        this.onPanResponderEnd = this.onPanResponderEnd.bind(this);
-        const { leftValeu, topValue, circularRadius } = this.props;
-
-        this.lastX = leftValeu;
-        this.lastY = topValue;
-        this.state = { radius: circularRadius };
-    }
-
-    componentWillMount() {
-        this._panResponder = PanResponder.create({
-
-            onMoveShouldSetPanResponder: this.onMoveShouldSetPanResponder,
-            onPanResponderMove: this.onPanResponderMove,
-            onPanResponderRelease: this.onPanResponderEnd
-        });
-    }
-
-    //触摸点开始移动的时候，是否响应触摸交互
-    onMoveShouldSetPanResponder() {
-        return true;
-    }
-
-    // 最近一次的移动距离为gestureState.move{X,Y}
-    onPanResponderMove(evt, gestureState) {
-
-        this.handlerData(evt, gestureState, true);
-
-    }
-
-    // 停止移动
-    onPanResponderEnd(evt, gestureState) {
-        this.handlerData(evt, gestureState, false);
-    }
-
-    handlerData(_evt, ges, moving) {
-
-        //此时视图的坐标
-        let locationX = this.lastX + ges.dx + deviationSize;
-        let locationY = this.lastY + ges.dy + deviationSize;
-
-        // 获取在父元素的实际坐标点值
-        let result = this.getPointValues(locationX, locationY);
-        let maxX = result.maxX;
-        let maxY = result.maxY;
-
-        this.setState({
-            offset: {
-                x: maxX,
-                y: maxY
-            }
-        });
-
-        const { onPanMoving, onPanMoveEnd } = this.props;
-        onPanMoving && onPanMoving(maxX, maxY, result.angle);
-
-        if (!(!!moving)) {
-            // 记录滑动前 图表的位置
-            if (this.state.offset) {
-                this.lastX = this.state.offset.x;
-                this.lastY = this.state.offset.y;
-            }
-
-            onPanMoveEnd && onPanMoveEnd();
-        }
-    }
-
-    // 获取实际坐标的 角度 坐标值 步长
-    getPointValues(locationX, locationY) {
-        //半径
-        let radius = this.state.radius;
-        // 求斜边的长度
-        let offsetX = Math.abs(radius - locationX);
-        let offsetY = Math.abs(radius - locationY);
-        // 斜边长度
-        let length = Math.sqrt(offsetX * offsetX + offsetY * offsetY);
-
-        //求角度
-        let angle = this.getPointAngle(radius - locationX, radius - locationY);
-
-        // 最终的坐标
-        let maxX = locationX - deviationSize;
-        let maxY = locationY - deviationSize;
-
-        //超出边界: 在圆环滑动
-        if (length !== radius) {
-            let maxOffsetX = radius * (locationX - radius) / length;
-            let maxOffsetY = radius * (radius - locationY) / length;
-            //   maxX = radius + maxOffsetX - deviationSize + 1.5
-            //   maxY = radius - maxOffsetY - deviationSize + 1.5
-            maxX = radius + maxOffsetX - deviationSize;
-            maxY = radius - maxOffsetY - deviationSize;
-            length = radius;
-        }
-
-        return {
-            angle: angle,
-            maxX: maxX,
-            maxY: maxY,
-            length: length
-        };
-    }
-
-    getPointAngle(x, y) {
-        // 此时的角度是从左边为 0°开始 顺时针 到右边为 180° 逆时针到最右边为 -180°
-        let angle = Math.atan2(y, x) * (180 / Math.PI);
-        //改为正常坐标的角度（表盘中心为圆形）
-        if (angle > 0) {
-            //第四象限
-            if (angle < 90) {
-                angle = 270 + angle;
-            } else {
-                //第一象限
-                angle = angle - 90;
-            }
-        } else if (angle == 0) {
-            angle = 270;
-        } else if (angle < 0) {
-            //第三象限
-            if (angle > -90) {
-                angle = 270 + angle;
-
-            } else {
-                //第二象限
-                angle = 90 + (180 + angle);
-            }
-        }
-
-        return angle;
-    }
-    render() {
-        const { leftValeu, topValue, imageSource } = this.props;
-        return (
-            <View style={[styles.timeIconView, { left: leftValeu, top: topValue, alignItems: 'center', justifyContent: 'center' }]} {...this._panResponder.panHandlers}>
-                <Image source={imageSource}
-                    style={{
-                        width: 30,
-                        height: 30,
-                        marginLeft: 0,
-                        tintColor: '#474e5d'
-                    }} />
-            </View>
-        );
-    }
-}
-
-const styles = StyleSheet.create({
-    timeIconView: {
-        position: "absolute",
-        height: timeIconSize,
-        width: timeIconSize,
-        flexDirection: "row",
-        alignItems: "center",
-        backgroundColor: "#FFFFFF",
-        borderRadius: Math.round(timeIconSize / 2)
-    }
-});

package/src/newModules/biorhythm/circular/Progress.d.ts

@@ -1,24 +0,0 @@
-import { Component } from 'react';
-export default class Progress extends Component<any> {
-    timeIconList: any[];
-    timer: any;
-    state: any;
-    constructor(props: any);
-    UNSAFE_componentWillReceiveProps(nextProps: any): void;
-    componentWillUnmount(): void;
-    render(): any;
-    playTimeChangeCallBack(id: number, time: string): void;
-    getTimeIntVale(time: any): number;
-    createFormTime(totalMinutes: any): string;
-    checkTimesFormat(newTimeMinutes: any): {
-        ret: boolean;
-        failMinutes: number;
-    } | {
-        ret: boolean;
-        failMinutes?: undefined;
-    };
-    getColorTempStringVale(colorTempInt: any): {
-        rgbColor: number[];
-        normalColor: string;
-    };
-}