@ledvance/base 1.3.71 → 1.3.73

package/src/components/rect-color-and-bright-picker/WhitePicker.tsx

@@ -0,0 +1,362 @@
+import React, { Component } from 'react';
+import _ from 'lodash';
+import { View, ViewStyle } from 'react-native';
+import RectPicker, {
+  ValidBound,
+  ILinear,
+  ILinearColors,
+  Point,
+  defaultProps as baseDefault,
+} from './RectPicker';
+import Slider, { IBrightOption } from './Slider';
+import ColorUtils from './utils/color';
+
+export interface IWhite {
+  brightness: number;
+  temperature: number;
+}
+const defaultProps = {
+  ...baseDefault,
+  brightOption: {} as IBrightOption,
+  value: { brightness: 500, temperature: 500 } as IWhite,
+  lossSliderColor: 'rgba(255,255,255,0.4)',
+  hideBright: false,
+  /**
+   * 排布方向
+   * leftBottom 对角线， 0在左下角
+   * leftTop 对角线, 0在左上角
+   * rightBottom 反向对角线, 0在右下角
+   * rightTop 反向对角线, 0在右上角
+   * left 从左往右，0在左边
+   * right 从右往左，0在右边
+   * top 从上往下，0在上边
+   * bottom 从下往上，0在下边
+   * @version ^0.3.0
+   */
+  direction: 'left' as
+    | 'leftBottom'
+    | 'leftTop'
+    | 'rightBottom'
+    | 'rightTop'
+    | 'left'
+    | 'right'
+    | 'top'
+    | 'bottom',
+  bgs: [
+    { offset: '0%', stopColor: '#FFCA5C', stopOpacity: 1 },
+    { offset: '60%', stopColor: '#FFFFFF', stopOpacity: 1 },
+    { offset: '100%', stopColor: '#CDECFE', stopOpacity: 1 },
+  ] as ILinearColors[],
+  onGrant(_v: any, _option?: { isChangeBright: boolean }) {},
+  onMove(_v: any, _option?: { isChangeBright: boolean }) {},
+  onRelease(_v: any, _option?: { isChangeBright: boolean }) {},
+  onPress(_v: any, _option?: { isChangeBright: boolean }) {},
+};
+type DefaultProps = {
+  style?: ViewStyle;
+  rectStyle?: ViewStyle;
+} & Readonly<typeof defaultProps>;
+
+type WhiteProps = DefaultProps;
+
+export default class WhitePicker extends Component<WhiteProps, IWhite> {
+  static defaultProps = defaultProps;
+
+  constructor(props: WhiteProps) {
+    super(props);
+    const { value: { brightness, temperature }, } = this.props;
+    this.state = { brightness, temperature };
+  }
+
+  componentDidUpdate(prevProps: WhiteProps) {
+    const {
+      value: { temperature, brightness },
+    } = this.props;
+    if (temperature !== prevProps.value.temperature) {
+      this.setState({ temperature });
+      this.thumbPosition = this.autoTemperaturePosition(temperature);
+      this.currentTemperature = temperature;
+    }
+    if (brightness !== prevProps.value.brightness && brightness !== this.state.brightness) {
+      this.setState({ brightness });
+    }
+  }
+
+  componentWillUnmount() {
+    // 清理引用和状态
+    this.pickerRef = null;
+  }
+
+  shouldComponentUpdate(nextProps: WhiteProps, nextState: IWhite) {
+    return !_.isEqual(nextProps, this.props) || !_.isEqual(nextState, this.state);
+  }
+
+  onBrightGrant = () => {
+    const { brightness, temperature } = this.state;
+    this.firPropsEvent(this.props.onGrant, { brightness, temperature }, { isChangeBright: true });
+  };
+
+  onBrightMove = (brightness: number) => {
+    const { temperature } = this.state;
+    this.firPropsEvent(this.props.onMove, { temperature, brightness }, { isChangeBright: true });
+  };
+
+  onBrightRelease = (brightness: number) => {
+    const { temperature } = this.state;
+    this.setState({ temperature, brightness });
+    this.firPropsEvent(this.props.onRelease, { temperature, brightness }, { isChangeBright: true });
+  };
+
+  onBrightPress = (brightness: number) => {
+    const { temperature } = this.state;
+    this.setState({ temperature, brightness });
+    this.firPropsEvent(this.props.onPress, { temperature, brightness }, { isChangeBright: true });
+  };
+
+  getBgs() {
+    const { direction, bgs } = this.props;
+    // left bottom
+    let x1 = '0%';
+    let y1 = '100%';
+    let x2 = '100%';
+    let y2 = '0%';
+    switch (direction) {
+      case 'leftTop':
+        x1 = '0%';
+        y1 = '0%';
+        x2 = '100%';
+        y2 = '100%';
+        break;
+      case 'rightBottom':
+        x1 = '100%';
+        y1 = '100%';
+        x2 = '0%';
+        y2 = '0%';
+        break;
+      case 'rightTop':
+        x1 = '100%';
+        y1 = '0%';
+        x2 = '0%';
+        y2 = '100%';
+        break;
+      case 'left':
+        x1 = '0%';
+        y1 = '0%';
+        x2 = '100%';
+        y2 = '0%';
+        break;
+      case 'right':
+        x1 = '100%';
+        y1 = '0%';
+        x2 = '0%';
+        y2 = '0%';
+        break;
+      case 'top':
+        x1 = '0%';
+        y1 = '0%';
+        x2 = '0%';
+        y2 = '100%';
+        break;
+      case 'bottom':
+        x1 = '0%';
+        y1 = '100%';
+        x2 = '0%';
+        y2 = '0%';
+        break;
+
+      default:
+        break;
+    }
+
+    return [{ x1, y1, x2, y2, colors: bgs }] as ILinear[];
+  }
+
+  getNormalVector({ width, height, x, y }: ValidBound) {
+    switch (this.props.direction) {
+      case 'leftTop':
+        return { x: width, y: height, originX: x, originY: y };
+      case 'rightBottom':
+        return { x: -width, y: -height, originX: width + x, originY: height + y };
+      case 'rightTop':
+        return { x: -width, y: height, originX: width + x, originY: y };
+      case 'left':
+        return { x: width, y: 0, originX: x, originY: height / 2 + y };
+      case 'right':
+        return { x: -width, y: 0, originX: width + x, originY: height / 2 + y };
+      case 'top':
+        return { x: 0, y: height, originX: width / 2 + x, originY: y };
+      case 'bottom':
+        return { x: 0, y: -height, originX: width / 2 + x, originY: height + y };
+      default:
+        return { x: width, y: -height, originX: x, originY: height + y };
+    }
+  }
+
+  setValue({ temperature, brightness }: IWhite) {
+    this.thumbPosition = this.autoTemperaturePosition(temperature);
+    this.currentTemperature = temperature;
+    this.setState({ temperature, brightness });
+  }
+
+  initData = async (validBound: ValidBound) => {
+    const { temperature } = this.state;
+    // 根据色温计算位置
+    this.thumbPosition = this.autoTemperaturePosition(temperature, validBound);
+    this.currentTemperature = temperature;
+    this.pickerBound = validBound;
+  };
+
+  autoTemperaturePosition(temperature: number, validBound: any = { width: 0, height: 0 }) {
+    let position;
+    if (this.pickerRef) {
+      position = this.pickerRef.valueToCoor({ temperature });
+    } else {
+      position = this.valueToCoor(
+        { temperature, brightness: this.state.brightness },
+        null,
+        validBound
+      );
+    }
+    return position;
+  }
+
+  coorToValue = ({ x, y }: Point, bound: ValidBound) => {
+    const { brightness } = this.state;
+    // 获取基准向量
+    const normalVector = this.getNormalVector(bound);
+    const vector1 = { x: x - normalVector.originX, y: y - normalVector.originY };
+    // 对角线的长度
+    const total = Math.sqrt(normalVector.x ** 2 + normalVector.y ** 2);
+    const diff = (vector1.x * normalVector.x + vector1.y * normalVector.y) / total;
+    const temperature = Math.round((diff / total) * 1000);
+    return { temperature, brightness };
+  };
+
+  handleTemperaturePosition(temperature: number, bound: ValidBound) {
+    //  获取基准向量
+    const normalVector = this.getNormalVector(bound);
+    const total = Math.sqrt(normalVector.x ** 2 + normalVector.y ** 2);
+    const normal = { x: normalVector.x / total, y: normalVector.y / total };
+    const length = total * (temperature / 1000);
+    const position = {
+      x: normal.x * length + normalVector.originX,
+      y: normal.y * length + normalVector.originY,
+    };
+    return position;
+  }
+
+  valueToCoor = ({ temperature }: IWhite, origin: Point, validBound: ValidBound): Point => {
+    // origin 不存在时，不在滑动时候
+    if (!origin) {
+      let cacheEnabled = true;
+      if (!_.isEqual(validBound, this.pickerBound)) {
+        cacheEnabled = false;
+      }
+      if (this.currentTemperature === temperature && cacheEnabled) {
+        if (
+          this.thumbPosition &&
+          typeof this.thumbPosition.x === 'number' &&
+          this.thumbPosition.x >= 0
+        ) {
+          return this.thumbPosition;
+        }
+      }
+      return this.handleTemperaturePosition(temperature, validBound);
+    }
+    this.currentTemperature = temperature;
+    this.thumbPosition = origin;
+    return origin;
+  };
+
+  valueToColor = (data: IWhite): string => {
+    const { temperature, brightness } = data;
+    return ColorUtils.brightKelvin2rgba(brightness, temperature);
+  };
+
+  firPropsEvent(cb: (params?: any) => void, ...args: any[]) {
+    typeof cb === 'function' && cb(...args);
+  }
+
+  private thumbPosition: Point;
+  private currentTemperature: number;
+  private pickerRef: RectPicker | null;
+  private pickerBound: ValidBound;
+
+  handlePickerGrant = () => {
+    const { temperature, brightness } = this.state;
+    this.firPropsEvent(this.props.onGrant, { temperature, brightness });
+  };
+
+  handlePickerMove = (white: IWhite) => {
+    this.firPropsEvent(this.props.onMove, white);
+  };
+
+  handlePickerRelease = (white: IWhite) => {
+    this.setState({ ...white });
+    this.firPropsEvent(this.props.onRelease, white);
+  };
+
+  handlePickerPress = (white: IWhite) => {
+    this.setState({ ...white });
+    this.firPropsEvent(this.props.onPress, white);
+  };
+
+  render() {
+    const {
+      style,
+      rectStyle,
+      brightOption,
+      lossShow,
+      lossSliderColor,
+      clickEnabled,
+      hideBright,
+      opacityAnimationValue,
+      opacityAnimationDuration,
+      ...pickerProps
+    } = this.props;
+    const { temperature, brightness } = this.state;
+    const sliderProps: any = {};
+    if (lossShow) {
+      sliderProps.activeColor = lossSliderColor;
+    }
+    return (
+      <View style={[{ flex: 1 }, style]}>
+        <RectPicker
+          ref={(ref: RectPicker) => {
+            this.pickerRef = ref;
+          }}
+          coorToValue={this.coorToValue}
+          valueToColor={this.valueToColor}
+          valueToCoor={this.valueToCoor}
+          value={{ temperature, brightness }}
+          lossShow={lossShow}
+          clickEnabled={clickEnabled}
+          opacityAnimationValue={opacityAnimationValue}
+          opacityAnimationDuration={opacityAnimationDuration}
+          {...pickerProps}
+          bgs={this.getBgs()}
+          style={rectStyle}
+          onGrant={this.handlePickerGrant}
+          onMove={this.handlePickerMove}
+          onRelease={this.handlePickerRelease}
+          onPress={this.handlePickerPress}
+          initData={this.initData}
+        />
+        {!hideBright && (
+          <Slider
+            opacityAnimationValue={opacityAnimationValue}
+            opacityAnimationDuration={opacityAnimationDuration}
+            {...brightOption}
+            {...sliderProps}
+            clickEnabled={clickEnabled}
+            value={brightness}
+            onGrant={this.onBrightGrant}
+            onMove={this.onBrightMove}
+            onRelease={this.onBrightRelease}
+            onPress={this.onBrightPress}
+          />
+        )}
+      </View>
+    );
+  }
+}

package/src/components/rect-color-and-bright-picker/brightness-icons/index.ts

@@ -0,0 +1,8 @@
+export default {
+  brightLevel1:
+    'M512 736a32 32 0 1 1 0 64 32 32 0 0 1 0-64z m-158.4-65.6a32 32 0 1 1-45.248 45.248 32 32 0 0 1 45.248-45.248z m362.048 0a32 32 0 1 1-45.248 45.248 32 32 0 0 1 45.248-45.248zM512 352a160 160 0 1 1 0 320 160 160 0 0 1 0-320z m-256 128a32 32 0 1 1 0 64 32 32 0 0 1 0-64z m512 0a32 32 0 1 1 0 64 32 32 0 0 1 0-64z m-52.352-171.648a32 32 0 1 1-45.248 45.248 32 32 0 0 1 45.248-45.248z m-362.048 0a32 32 0 1 1-45.248 45.248 32 32 0 0 1 45.248-45.248zM512 224a32 32 0 1 1 0 64 32 32 0 0 1 0-64z',
+  brightLevel2:
+    'M512 736a32 32 0 0 1 32 32v32a32 32 0 0 1-64 0v-32a32 32 0 0 1 32-32z m-158.4-65.6a32 32 0 0 1 0 45.248l-22.624 22.624a32 32 0 0 1-45.248-45.248l22.624-22.624a32 32 0 0 1 45.248 0z m362.048 0l22.624 22.624a32 32 0 0 1-45.248 45.248l-22.624-22.624a32 32 0 1 1 45.248-45.248zM512 352a160 160 0 1 1 0 320 160 160 0 0 1 0-320z m-256 128a32 32 0 0 1 0 64H224a32 32 0 0 1 0-64h32z m544 0a32 32 0 0 1 0 64h-32a32 32 0 0 1 0-64h32z m-61.728-194.272a32 32 0 0 1 0 45.248l-22.624 22.624a32 32 0 1 1-45.248-45.248l22.624-22.624a32 32 0 0 1 45.248 0z m-407.296 0l22.624 22.624a32 32 0 1 1-45.248 45.248l-22.624-22.624a32 32 0 0 1 45.248-45.248zM512 192a32 32 0 0 1 32 32v32a32 32 0 0 1-64 0V224a32 32 0 0 1 32-32z',
+  brightLevel3:
+    'M512 736a32 32 0 0 1 32 32v64a32 32 0 0 1-64 0v-64a32 32 0 0 1 32-32z m-158.4-65.6a32 32 0 0 1 0 45.248l-45.248 45.248a32 32 0 1 1-45.248-45.248l45.248-45.248a32 32 0 0 1 45.248 0z m362.048 0l45.248 45.248a32 32 0 0 1-45.248 45.248l-45.248-45.248a32 32 0 1 1 45.248-45.248zM512 352a160 160 0 1 1 0 320 160 160 0 0 1 0-320z m320 128a32 32 0 0 1 0 64h-64a32 32 0 0 1 0-64h64zM256 480a32 32 0 0 1 0 64H192a32 32 0 0 1 0-64h64z m504.896-216.896a32 32 0 0 1 0 45.248l-45.248 45.248a32 32 0 1 1-45.248-45.248l45.248-45.248a32 32 0 0 1 45.248 0z m-452.544 0l45.248 45.248a32 32 0 1 1-45.248 45.248L263.104 308.352a32 32 0 0 1 45.248-45.248zM512 160a32 32 0 0 1 32 32v64a32 32 0 0 1-64 0V192a32 32 0 0 1 32-32z',
+};

package/src/components/rect-color-and-bright-picker/index.tsx

@@ -0,0 +1,5 @@
+import ColourPicker from './ColourPicker';
+import WhitePicker from './WhitePicker';
+import Slider from './Slider';
+
+export default { ColourPicker, WhitePicker, BrightnessSlider: Slider };

package/src/components/rect-color-and-bright-picker/res/index.ts

@@ -0,0 +1,3 @@
+export default {
+  thumbMask: require('./thumb-mask.png'),
+};

package/src/components/rect-color-and-bright-picker/utils/color.ts

@@ -0,0 +1,73 @@
+/* eslint-disable func-names */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+import { Utils } from 'tuya-panel-kit';
+import ColorObj from 'color';
+
+const { color: ColorUtils } = Utils.ColorUtils;
+
+ColorUtils.temp2rgb = function (
+  kelvin: number,
+  { temperatureMin = 4000, temperatureMax = 8000 } = {}
+) {
+  let newKelvin = kelvin;
+  newKelvin /= 10; // 0 - 1000 范围
+  const temp = temperatureMin + ((temperatureMax - temperatureMin) * newKelvin) / 100;
+  const hsv = this.rgb2hsv(...this.kelvin2rgb(temp));
+  return this.hsv2RgbString(...hsv);
+};
+
+ColorUtils.brightKelvin2rgb = function (
+  bright = 1000,
+  kelvin = 1000,
+  { temperatureMin = 4000, temperatureMax = 8000 } = {}
+) {
+  let newKelvin = kelvin;
+  let newBright = bright;
+  newBright /= 10;
+  newKelvin /= 10;
+  const temp = temperatureMin + ((temperatureMax - temperatureMin) * newKelvin) / 100;
+  const hsv = this.rgb2hsv(...this.kelvin2rgb(temp));
+  const brightV = newBright;
+  hsv[2] = brightV;
+  return this.hsv2RgbString(...hsv);
+};
+
+ColorUtils.bright2Opacity = (
+  brightness: number,
+  option: { min: number; max: number } = { min: 0.2, max: 1 }
+) => {
+  const { min = 0.2, max = 1 } = option;
+  return Math.round((min + ((brightness - 10) / (1000 - 10)) * (max - min)) * 100) / 100;
+};
+
+/**
+ * 格式化hsv
+ * 亮度将转化为透明度变化
+ */
+ColorUtils.hsv2rgba = function (hue: number, saturation: number, bright: number) {
+  try {
+    let color: string = ColorUtils.hsb2hex(hue, saturation / 10, 100);
+    // @ts-ignore
+    color = new ColorObj(color as string).alpha(this.bright2Opacity(bright)).rgbString();
+    return color;
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.warn(error);
+    return 'transparent';
+  }
+};
+
+ColorUtils.brightKelvin2rgba = function (bright: number, kelvin: number) {
+  try {
+    let color = ColorUtils.brightKelvin2rgb(1000, kelvin || 0);
+    // @ts-ignore
+    color = new ColorObj(color).alpha(this.bright2Opacity(bright)).rgbString();
+    return color;
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.warn(error);
+    return 'transparent';
+  }
+};
+
+export default ColorUtils;

package/src/components/weekSelect.tsx

@@ -8,10 +8,6 @@ const { withTheme } = Utils.ThemeUtils
 
 const repeatPeriod = [
   {
-    index: 1,
-    title: I18n.getLang('timeschedule_add_schedule_weekday7_text'),
-    enabled: false,
-  }, {
     index: 2,
     title: I18n.getLang('timeschedule_add_schedule_weekday1_text'),
     enabled: false,
@@ -35,14 +31,18 @@ const repeatPeriod = [
     index: 7,
     title: I18n.getLang('timeschedule_add_schedule_weekday6_text'),
     enabled: false,
+  }, {
+    index: 1,
+    title: I18n.getLang('timeschedule_add_schedule_weekday7_text'),
+    enabled: false,
   },
 ]
 
-export const setDataSource = (loop) => {
-  return repeatPeriod.map((item, index) => {
+export const setDataSource = (loop: number[] | string[] | string) => {
+  return repeatPeriod.map(item => {
     return {
       ...item,
-      enabled: loop[index] === 1,
+      enabled: [1, '1'].includes(loop[item.index - 1]),
     }
   })
 }

package/src/composeLayout.tsx

@@ -10,7 +10,7 @@ import {
   NativeProps,
   setGroupDevices,
   setGroupNativeProps,
-  setNativeProps,
+  setNativeProps, setNewPalette,
   setSystemTimeFormat,
   setTimeZone,
   UAGroupInfo,
@@ -26,6 +26,7 @@ interface Props {
   ldvDevInfo: LdvDevInfo
   uaGroupInfo: UAGroupInfoProps
   colorScheme?: string
+  newPalette?: boolean
 }
 
 interface LdvDevInfo extends DeviceInfo {
@@ -130,6 +131,8 @@ const composeLayout = (component: React.ComponentType) => {
       getTimeZone().then(timeZone => {
         dispatch(setTimeZone(timeZone))
       })
+
+      dispatch(setNewPalette(!!props.newPalette))
     }
 
     initReduxDeviceNativeProps(ldvDevInfo: LdvDevInfo) {

package/src/hooks/Hooks.ts

@@ -1,4 +1,5 @@
 import { useRoute, useNavigation } from '@react-navigation/core'
+import { useCallback, useEffect, useRef } from 'react'
 
 export function createParams<T>(params: T): T {
   return { ...params }
@@ -13,3 +14,48 @@ export function useCurrentPage(routeName: string): boolean {
   const { index, routes} = navigation.getState()
   return routeName === routes[index].name
 }
+
+/**
+ * dp 响应时间校验 hook
+ * 用于在指定时间内阻止长连接响应更新界面状态
+ */
+export function useDpResponseValidator(timeoutMs: number = 1000) {
+  const dpTimestamps = useRef<{[dpKey: string]: number}>({});
+  
+  // dp 响应时间校验函数
+  const sendDpWithTimestamps = useCallback((dpKey: string, sendFunc: () => Promise<any>) => {
+    // 记录发送时间戳
+    const timestamp = Date.now();
+    dpTimestamps.current[dpKey] = timestamp;
+
+    // 发送命令
+    return sendFunc();
+  }, []);
+
+  // 监听 dp 响应，比较时间戳
+  const onDpResponse = useCallback((dpKey: string) => {
+    const sendTimestamp = dpTimestamps.current[dpKey];
+    if (sendTimestamp) {
+      const responseTimestamp = Date.now();
+      const timeDiff = responseTimestamp - sendTimestamp;
+      
+      if (timeDiff <= timeoutMs) {
+        // 指定时间内收到响应，不接收更新
+        return true; // 阻止更新
+      }
+    }
+    return false; // 允许更新
+  }, [timeoutMs]);
+
+  // 组件卸载时清理所有记录
+  useEffect(() => {
+    return () => {
+      dpTimestamps.current = {};
+    };
+  }, []);
+
+  return {
+    sendDpWithTimestamps,
+    onDpResponse,
+  };
+}