@ledvance/base 1.3.81 → 1.3.82

package/src/components/Tag.tsx

@@ -1,6 +1,6 @@
-import {Image, StyleSheet, Text, TouchableOpacity, View, ViewProps} from 'react-native'
+import { Image, StyleSheet, Text, TouchableOpacity, View, ViewProps } from 'react-native'
 import React from 'react'
-import {Utils} from 'tuya-panel-kit'
+import { Utils } from 'tuya-panel-kit'
 import res from '../res'
 import ThemeType from '../config/themeType'
 
@@ -49,17 +49,17 @@ const Tag = (props: TagProps) => {
       onPress={() => {
         props.onCheckedChange(!props.checked)
       }}>
-      <View style={[styles.root, props.checked ? styles.checked : styles.uncheck, props.style]}>
-        <Text
-          accessibilityLabel={"Tag"}
-          accessibilityHint={props.text}
-          accessibilityState={{checked: props.checked}}
-          style={[styles.text, {marginEnd: cx(props.checked ? 4 : 12)}]}
-        >
+      <View
+        accessibilityLabel={"Tag"}
+        accessibilityHint={props.text}
+        accessibilityState={{ checked: props.checked }}
+        style={[styles.root, props.checked ? styles.checked : styles.uncheck, props.style]}
+      >
+        <Text style={[styles.text, { marginEnd: cx(props.checked ? 4 : 12) }]}>
           {props.text}
         </Text>
         {
-          props.checked ? <Image source={{uri: res.ic_arrows_nav_clear}} style={styles.icon}/> : <></>
+          props.checked ? <Image accessibilityLabel='TagClearIcon' source={{ uri: res.ic_arrows_nav_clear }} style={styles.icon} /> : <></>
         }
       </View>
     </TouchableOpacity>

package/src/components/UATabs.tsx

@@ -55,7 +55,7 @@ const UATabs = (props: UATabsProps) => {
 
           return <TouchableOpacity
             accessibilityLabel={"UATabs"}
-            accessibilityHint={item.value}
+            accessibilityHint={`${item.value}`}
             accessibilityState={{checked: active}}
             key={index}
             style={{ flex: 1 }}

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

@@ -10,6 +10,7 @@ import RectPicker, {
 } from './RectPicker';
 import Slider, { IBrightOption } from './Slider';
 import ColorUtils from './utils/color';
+import StorageUtils from './utils/storage';
 
 export interface IWhite {
   brightness: number;
@@ -52,20 +53,38 @@ const defaultProps = {
   onRelease(_v: any, _option?: { isChangeBright: boolean }) {},
   onPress(_v: any, _option?: { isChangeBright: boolean }) {},
 };
+
+interface TempStorageData {
+  temperature: number;
+  position: Point;
+}
+
 type DefaultProps = {
   style?: ViewStyle;
   rectStyle?: ViewStyle;
+  storageKey?: string;
 } & Readonly<typeof defaultProps>;
 
 type WhiteProps = DefaultProps;
 
+let storageKeyIndex = 0;
+
 export default class WhitePicker extends Component<WhiteProps, IWhite> {
   static defaultProps = defaultProps;
 
   constructor(props: WhiteProps) {
     super(props);
-    const { value: { brightness, temperature }, } = this.props;
+    // 是否定义了storageKey
+    const {
+      storageKey,
+      value: { brightness, temperature },
+    } = this.props;
     this.state = { brightness, temperature };
+    if (!storageKey) {
+      this.storageKey = `temperature_key_${storageKeyIndex++}`;
+    } else {
+      this.storageKey = storageKey;
+    }
   }
 
   componentDidUpdate(prevProps: WhiteProps) {
@@ -199,7 +218,26 @@ export default class WhitePicker extends Component<WhiteProps, IWhite> {
   }
 
   initData = async (validBound: ValidBound) => {
+    let cacheEnabled = true;
+    // 尺寸有变化时，不使用缓存
+    if (!_.isEqual(validBound, this.pickerBound)) {
+      cacheEnabled = false;
+    }
+
     const { temperature } = this.state;
+
+    // 获取当前positon的值
+    const data = (await StorageUtils.getDevItem(this.storageKey)) as TempStorageData;
+    // 是否相同色温，相同使用缓存坐标展示
+    if (data && data.temperature === temperature && cacheEnabled) {
+      this.thumbPosition = data.position;
+      this.currentTemperature = temperature;
+    } else {
+      // 根据色温计算位置
+      this.thumbPosition = this.autoTemperaturePosition(temperature, validBound);
+      this.currentTemperature = temperature;
+    }
+
     // 根据色温计算位置
     this.thumbPosition = this.autoTemperaturePosition(temperature, validBound);
     this.currentTemperature = temperature;
@@ -217,6 +255,8 @@ export default class WhitePicker extends Component<WhiteProps, IWhite> {
         validBound
       );
     }
+
+    StorageUtils.setDevItem(this.storageKey, { temperature, position });
     return position;
   }
 
@@ -242,6 +282,7 @@ export default class WhitePicker extends Component<WhiteProps, IWhite> {
       x: normal.x * length + normalVector.originX,
       y: normal.y * length + normalVector.originY,
     };
+    StorageUtils.setDevItem(this.storageKey, { temperature, position });
     return position;
   }
 
@@ -263,6 +304,11 @@ export default class WhitePicker extends Component<WhiteProps, IWhite> {
       }
       return this.handleTemperaturePosition(temperature, validBound);
     }
+
+    StorageUtils.setDevItem(this.storageKey, {
+      temperature,
+      position: origin,
+    });
     this.currentTemperature = temperature;
     this.thumbPosition = origin;
     return origin;
@@ -281,6 +327,7 @@ export default class WhitePicker extends Component<WhiteProps, IWhite> {
   private currentTemperature: number;
   private pickerRef: RectPicker | null;
   private pickerBound: ValidBound;
+  private storageKey: string;
 
   handlePickerGrant = () => {
     const { temperature, brightness } = this.state;

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

@@ -0,0 +1,97 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { AsyncStorage } from 'react-native';
+import { TYSdk } from 'tuya-panel-kit';
+
+const getDevKey = (name: string) => {
+  const { devId } = TYSdk.devInfo;
+  return `${devId}_${name}`;
+};
+
+const getPidKey = (name: string) => {
+  const { productId } = TYSdk.devInfo;
+  return `${productId}_${name}`;
+};
+
+const getUiKey = (name: string) => {
+  const { uiId } = TYSdk.devInfo;
+  return `${uiId}_${name}`;
+};
+
+export default {
+  async setItem(key: string, value: any) {
+    const data = { value, type: typeof value };
+    const jsonValue = JSON.stringify(data);
+    return new Promise((resolve, reject) => {
+      AsyncStorage.setItem(key, jsonValue, err => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        resolve('');
+      });
+    });
+  },
+  async setDevItem(name: string, value: any) {
+    const key = getDevKey(name);
+    return this.setItem(key, value);
+  },
+  async setPidItem(name: string, value: any) {
+    const key = getPidKey(name);
+    return this.setItem(key, value);
+  },
+  async setUiItem(name: string, value: any) {
+    const key = getUiKey(name);
+    return this.setItem(key, value);
+  },
+  async getItem(key: string) {
+    return new Promise((resolve, reject) => {
+      AsyncStorage.getItem(key, (err, data) => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        if (data) {
+          resolve(JSON.parse(data).value);
+        }
+        resolve(null);
+      });
+    });
+  },
+  async getDevItem(name: string) {
+    const key = getDevKey(name);
+    return this.getItem(key);
+  },
+  async getPidItem(name: string) {
+    const key = getPidKey(name);
+    return this.getItem(key);
+  },
+  async getUiItem(name: string) {
+    const key = getUiKey(name);
+    return this.getItem(key);
+  },
+  async removeItem(key: string) {
+    return new Promise((resolve, reject) => {
+      AsyncStorage.removeItem(key, err => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        resolve('');
+      });
+    });
+  },
+
+  async removeDevItem(name: string) {
+    const key = getDevKey(name);
+    return this.removeItem(key);
+  },
+
+  async removePidItem(name: string) {
+    const key = getDevKey(name);
+    return this.removeItem(key);
+  },
+  async removeUiItem(name: string) {
+    const key = getUiKey(name);
+    return this.removeItem(key);
+  },
+};