@ledvance/base 1.3.45 → 1.3.46

package/localazy.json

@@ -147,11 +147,6 @@
                 "MATCH:fixedTimeCycle_socket_headline",
                 "MATCH:randomtimecycle_sockets_headline_text",
                 "MATCH:history_socket_headline_text",
-                "MATCH:feature_summary_action_component_5",
-                "MATCH:feature_summary_action_component_6",
-                "MATCH:feature_summary_action_component_7",
-                "MATCH:feature_summary_action_component_8",
-                "MATCH:feature_summary_action_component_9",
                 "MATCH:sockets_feature_2_socket_text_min_off",
                 "MATCH:sockets_feature_2_socket_text_min_on",
                 "MATCH:timer_powerstrip_socket1_switched_off_text",
@@ -163,7 +158,6 @@
                 "MATCH:timer_nightplug_active_timer_subheadline2_text",
                 "MATCH:addTimeCycle_settings_sec_text",
                 "MATCH:addTimeCycle_settings_sec_text2",
-                "MATCH:power_strip_tile_socket_4_headline",
                 "MATCH:conflict_dialog_active_item_fixedtimecycle_description",
                 "MATCH:conflict_dialog_active_item_randomtimecycle_description",
                 "MATCH:timeschedule_add_schedule_Lighting_applyfor_selection2_text",
@@ -378,6 +372,10 @@
                 "MATCH:power_strip_feature_2_socket_2_text_min_off",
                 "MATCH:power_strip_feature_2_socket_3_text_min_on",
                 "MATCH:power_strip_feature_2_socket_3_text_min_off",
+                "MATCH:power_strip_feature_2_socket_4_text_min_on",
+                "MATCH:power_strip_feature_2_socket_4_text_min_off",
+                "MATCH:power_strip_feature_2_socket_5_text_min_on",
+                "MATCH:power_strip_feature_2_socket_5_text_min_off",
                 "MATCH:power_strip_feature_2_socket_usb_text_min_off",
                 "MATCH:power_strip_feature_2_socket_usb_text_min_on",
                 "MATCH:generation_data_description_text",
@@ -1041,7 +1039,14 @@
                 "MATCH:offline",
                 "MATCH:consumption_data_field4_button_text",
                 "MATCH:consumption_data_price_per_l_headline_text",
-                "MATCH:consumption_data_price_per_l_description_text"
+                "MATCH:consumption_data_price_per_l_description_text",
+                "MATCH:power_strip_tile_socket_1_headline",
+                "MATCH:power_strip_tile_socket_2_headline",
+                "MATCH:power_strip_tile_socket_3_headline",
+                "MATCH:power_strip_tile_socket_4_headline",
+                "MATCH:power_strip_tile_socket_5_headline",
+                "MATCH:power_strip_tile_socket_usb_headline",
+                "MATCH:manual_search_button_socket"
             ],
             "replacements": {
                 "REGEX:% %1\\$s.*?\\)%": "{0}",

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.3.45",
+  "version": "1.3.46",
   "scripts": {
     "prepublishOnly": "python update-localazy.py"
   },

package/src/api/native.ts

@@ -1,6 +1,6 @@
 import {NativeModules, Platform} from 'react-native'
 import {NativeResult, Result} from '../models/modules/Result'
-import { TYSdk } from 'tuya-panel-kit'
+import {DpSchema, TYSdk} from 'tuya-panel-kit'
 interface LDVDevicePanelManager {
   back: () => void
   control: (params: any, callback: (result: any) => void) => void
@@ -64,6 +64,7 @@ export interface DeviceInfo {
   status: number
   dps: string
   tuyaDeviceId: string
+  tuyaSchema?: DpSchema[]
 }
 
 const devicePanel: LDVDevicePanelManager = NativeModules.LDVDevicePanelManager
@@ -213,7 +214,7 @@ function toDeviceSettingsPage(tuyaDeviceId: string, isGroup: boolean = false) {
   devicePanel.toDeviceSettingsPage(tuyaDeviceId, isGroup)
 }
 
-function toRoutinesPage(params: {backTitle:string, deviceId:string}) {
+function toRoutinesPage(params: {backTitle:string, deviceId:string, type?: 'DeviceStatusChange', dpId?: string, dpValue?: any}) {
   devicePanel.toRoutinesPage(params)
 }
 
@@ -298,7 +299,7 @@ export class NativeApi {
     toDeviceSettingsPage(deviceId, isGroup)
   }
 
-  static toRoutinesPage(params: {backTitle:string, deviceId:string}): void{
+  static toRoutinesPage(params: {backTitle:string, deviceId:string, type?: 'DeviceStatusChange', dpId?: string, dpValue?: any}): void{
     toRoutinesPage(params)
   }
 

package/src/components/AdvanceList.tsx

@@ -41,7 +41,7 @@ function AdvanceList(props: AdvanceListProps) {
           justifyContent: 'center',
           alignItems: 'center',
         }}>
-          <Image source={item.icons} style={{ width: cx(80), height: cx(80) }} />
+          <Image source={{ uri: item.icons }} style={{ width: cx(80), height: cx(80) }} />
         </View>}
       </AdvanceCard>
     </View>

package/src/components/ApplyForDeviceItem.tsx

@@ -92,7 +92,7 @@ const ApplyForDeviceItem = (props: ApplyForDeviceItemProps) => {
         <Spacer height={cx(6)} />
       </View>
       <View style={[styles.offlineIcon, { marginHorizontal: cx(5) }]}>
-        {!props.deviceInfo.status && <Image style={styles.offlineIcon} source={res.offline_wifi} />}
+        {!props.deviceInfo.status && <Image style={styles.offlineIcon} source={{ uri: res.offline_wifi }} />}
         {!!props.deviceInfo.status && isNumber(curPower) && <View style={{ alignItems: 'flex-end' }}>
           <Text style={styles.onlineText}>{`${curPower / 10} W`}</Text>
           <Text style={[styles.onlineText, { fontSize: cx(12), marginTop: cx(5) }]}>{I18n.getLang('consumption_data_field1_headline_text')}</Text>

package/src/components/ApplyForText.tsx

@@ -47,7 +47,7 @@ const ApplyForText = (props: ApplyForTextProps) => {
                 transform: [{ rotate: props.expand ? '0deg' : '180deg' }],
               },
             ]}
-          source={res.ic_top_arrow}/>
+          source={{ uri: res.ic_top_arrow}}/>
       </View>
     </TouchableOpacity>
   )

package/src/components/BallDirectionView.tsx

@@ -132,24 +132,24 @@ const BallDirectionView = (props: BallDirectionProps) => {
                 <TouchableOpacity style={{width: cx(40), height: cx(40)}} onPress={() => {
                     onPaintModeChanged(PaintMode.Top);
                 }}>
-                    <Image source={res.half} style={styles.paintModeHalf}/>
+                    <Image source={{ uri: res.half}} style={styles.paintModeHalf}/>
                 </TouchableOpacity>}
             <TouchableOpacity
                 style={{width: cx(40), height: cx(40), marginTop: cx(10),}}
                 onPress={() => {
                     onPaintModeChanged(PaintMode.ALL);
                 }}>
-                <Image source={res.all} style={styles.paintModeAll}/>
+                <Image source={{ uri: res.all }} style={styles.paintModeAll}/>
             </TouchableOpacity>
         </View>
         <View style={styles.circleLayout}>
             <View style={styles.circleBorder}/>
             {state.paintMode === PaintMode.ALL &&
-                <Image source={res.coloring} style={styles.coloring}/>}
+                <Image source={{ uri: res.coloring}} style={styles.coloring}/>}
             {state.paintMode === PaintMode.Top &&
-                <Image source={res.ringdown} style={styles.ringUp}/>}
+                <Image source={{ uri: res.ringdown}} style={styles.ringUp}/>}
             {state.paintMode === PaintMode.Bottom &&
-                <Image source={res.ringdown} style={styles.ringDown}/>}
+                <Image source={{ uri: res.ringdown}} style={styles.ringDown}/>}
             <TouchableOpacity
                 style={styles.halfCircleUp}
                 disabled={state.paintMode === PaintMode.ALL}

package/src/components/BatteryPercentageView.tsx

@@ -0,0 +1,75 @@
+import React from 'react'
+import Card from './Card'
+import {Battery, Utils} from 'tuya-panel-kit'
+import {StyleSheet, Text, View} from 'react-native'
+import I18n from '../i18n'
+import Spacer from './Spacer'
+import ThemeType from '../config/themeType'
+
+const cx = Utils.RatioUtils.convertX
+const {withTheme} = Utils.ThemeUtils
+type BatteryProps = {
+  value: number
+  lowValue?: number
+  middleValue?: number
+  highValue?: number
+  theme?: ThemeType
+}
+
+const BatteryPercentageView = (props: BatteryProps) => {
+  const {value, middleValue = 30, highValue = 70} = props
+  const calcColor = (_: any, normalColor: string, lowColor: string, emptyColor: string) => {
+    if (value >= highValue) {
+      return normalColor
+    } else if (props.value >= middleValue) {
+      return lowColor
+    } else {
+      return emptyColor
+    }
+  }
+
+  const styles = StyleSheet.create({
+    title: {
+      marginStart: cx(16),
+      marginVertical: cx(18),
+      color: props.theme?.global.fontColor,
+      fontSize: cx(16),
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    batteryRotate: {
+      transform: [{rotate: '90deg'}],
+      position: 'relative',
+      right: cx(30),
+    },
+    content: {
+      marginEnd: cx(16),
+      color: props.theme?.global.fontColor,
+      fontSize: cx(14),
+      fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+    low: {
+      color: props.theme?.global.error
+    }
+  })
+
+  return (
+    <Card
+      style={{marginHorizontal: cx(24), marginTop: cx(10)}}
+      containerStyle={{flexDirection: 'row', alignItems: 'center'}}
+    >
+      <Text style={styles.title}>{I18n.getLang('motion_detector_battery__state4')}</Text>
+      <Spacer height={0} style={{flex: 1}}/>
+      <View style={styles.batteryRotate}>
+        <Battery
+          value={props.value}
+          onCalcColor={calcColor}
+          size={cx(30)}
+          theme={{batteryColor: props.theme?.global.secondFontColor || '#000'}}
+        />
+      </View>
+      <Text style={[styles.content, value < middleValue ? styles.low : null]}>{value}%</Text>
+    </Card>
+  )
+}
+
+export default withTheme(BatteryPercentageView)

package/src/components/DiySceneNodeView.tsx

@@ -81,7 +81,7 @@ const DiySceneNodeView = (props: DiySceneNodeProps) => {
           resizeMode: 'contain',
           tintColor: state.halfCircleTopColor
         }}/>
-        { (isCurrent && position === 'Top') && <Image source={res.halfborder} style={styles.borderTop} />}
+        { (isCurrent && position === 'Top') && <Image source={{uri: res.halfborder}} style={styles.borderTop} />}
       </TouchableOpacity>
       <TouchableOpacity
         style={styles.halfCircleDown}
@@ -95,7 +95,7 @@ const DiySceneNodeView = (props: DiySceneNodeProps) => {
           transform: [{rotate: '180deg'}],
           tintColor: state.halfCircleBottomColor
         }}/>
-        {(isCurrent && position === 'Bottom') && <Image source={res.halfborder} style={styles.borderBottom} />}
+        {(isCurrent && position === 'Bottom') && <Image source={{uri: res.halfborder}} style={styles.borderBottom} />}
       </TouchableOpacity>
     </View>)
 }

package/src/components/DrawToolView.tsx

@@ -154,7 +154,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
                       }}>
                       <Image
                           style={[styles.adjustButton, { tintColor: props.adjustType === 1 ? props.theme?.icon.primary : props.theme?.icon.normal }]}
-                          source={res.ic_paint_bucket} />
+                          source={{ uri: res.ic_paint_bucket}} />
                   </TouchableOpacity>
                 {!props.hideDisableLight && <TouchableOpacity
                     onPress={() => {
@@ -162,7 +162,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
                     }}>
                     <Image
                         style={[styles.adjustButton, { tintColor: props.adjustType === 3 ? props.theme?.icon.primary : props.theme?.icon.normal }]}
-                        source={res.ic_disabled_light} />
+                        source={{uri: res.ic_disabled_light}} />
                 </TouchableOpacity>}
                 {!props.hideColorize && <TouchableOpacity
                     onPress={() => {
@@ -170,7 +170,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
                     }}>
                     <Image
                         style={[styles.adjustButton, { tintColor: props.adjustType === 2 ? props.theme?.icon.primary : props.theme?.icon.normal }]}
-                        source={res.ic_colorize} />
+                        source={{uri: res.ic_colorize}} />
                 </TouchableOpacity>}
                 {!props.hideLedNum && <TouchableOpacity
                     onPress={() => {

package/src/components/FanAdjustView.tsx

@@ -88,7 +88,7 @@ export function FanAdjustViewContent(props: FanAdjustViewProps) {
                   <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_direction_info_option_2_text')}</Text>
                 </View>,
               })}>
-                  <Image style={{width: cx(16), height: cx(16), tintColor: props.theme?.icon.primary}} source={res.ic_info}/>
+                  <Image style={{width: cx(16), height: cx(16), tintColor: props.theme?.icon.primary}} source={{uri: res.ic_info}}/>
               </TouchableOpacity>
           </View>
           <Segmented
@@ -118,7 +118,7 @@ export function FanAdjustViewContent(props: FanAdjustViewProps) {
                   <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_mode_info_option_2_text')}</Text>
                 </View>,
               })}>
-                  <Image style={{width: cx(16), height: cx(16), tintColor: props.theme?.icon.primary}} source={res.ic_info}/>
+                  <Image style={{width: cx(16), height: cx(16), tintColor: props.theme?.icon.primary}} source={{uri: res.ic_info}}/>
               </TouchableOpacity>
           </View>
           <Segmented

package/src/components/MoodStripAdjustView.tsx

@@ -100,7 +100,7 @@ const MoodStripAdjustView = (props: MoodStripAdjustViewProps) => {
                     }}>
                       {
                         sceneInfo.id === -1 ?
-                          <Image source={res.cycle} style={{width: cx(50), height: cx(50)}}/> :
+                          <Image source={{ uri: res.cycle}} style={{width: cx(50), height: cx(50)}}/> :
                           <View style={{justifyContent: 'center', alignItems: 'center', width: '100%', height: '100%'}}>
                             {props.favoriteScenes.length > 3 &&
                                 <TouchableOpacity
@@ -108,7 +108,7 @@ const MoodStripAdjustView = (props: MoodStripAdjustViewProps) => {
                                     onPress={() => {
                                       props.onFavoriteSceneRemove && props.onFavoriteSceneRemove(sceneInfo)
                                     }}>
-                                    <Image source={res.minus} style={{width: cx(10), height: cx(10), tintColor: props.theme?.icon.primary}}/>
+                                    <Image source={{uri: res.minus}} style={{width: cx(10), height: cx(10), tintColor: props.theme?.icon.primary}}/>
                                 </TouchableOpacity>
                             }
                             <Text style={{fontSize: cx(8), color: props.theme?.global.fontColor}}>{sceneInfo.name}</Text>

package/src/components/PressActionView.tsx

@@ -0,0 +1,158 @@
+import React, {useCallback, useEffect, useState} from 'react';
+import Card from './Card';
+import {Utils} from 'tuya-panel-kit';
+import {FlatList, StyleSheet, Text, View} from 'react-native';
+import Spacer from './Spacer';
+import ThemeType from '../config/themeType';
+import {useNavigation} from '@react-navigation/core';
+import {NativeApi} from "../api/native";
+
+const cx = Utils.RatioUtils.convertX;
+const {withTheme} = Utils.ThemeUtils;
+
+type PressActionProps = {
+  channel: 1 | 2 | 4
+  backTitle: string
+  deviceId: string
+  dpIds: string[]
+  dpIndex: number
+  routerKey?: string
+  theme?: ThemeType
+};
+
+enum PressType {
+  Single = 'single_click',
+  Double = 'double_click',
+  Long = 'long_press'
+}
+
+interface ActionData {
+  title: string
+  onPress: () => void
+}
+
+const PressActionView = (props: PressActionProps) => {
+  const navigation = useNavigation()
+  const [actionData, setActionData] = useState<ActionData[]>([])
+
+  const toSettingPage = useCallback((dpIndex: number) => {
+    navigation.navigate(props.routerKey ?? 'setting', {
+      dpIds: props.dpIds,
+      dpIndex: dpIndex
+    })
+  }, [props.routerKey, props.backTitle, props.deviceId, props.dpIds, props.dpIndex])
+
+  const toRoutinesPage = useCallback((dpValue: PressType) => {
+    NativeApi.toRoutinesPage({
+      backTitle: props.backTitle,
+      deviceId: props.deviceId,
+      type: 'DeviceStatusChange',
+      dpId: props.dpIds[props.dpIndex],
+      dpValue: dpValue
+    })
+  }, [props.backTitle, props.deviceId, props.dpIds, props.dpIndex])
+
+  useEffect(() => {
+    let data: ActionData[]
+    if (props.channel === 1) {
+      data = [
+        {
+          title: 'Single Press', onPress: () => toRoutinesPage(PressType.Single)
+        },
+        {
+          title: 'Double Press', onPress: () => toRoutinesPage(PressType.Double)
+        },
+        {
+          title: 'Long Press', onPress: () => toRoutinesPage(PressType.Long)
+        },
+      ]
+    } else {
+      data = [
+        {
+          title: 'Switch 1',
+          onPress: () => toSettingPage(0)
+        },
+        {
+          title: 'Switch 2',
+          onPress: () => toSettingPage(1)
+        },
+      ]
+      if (props.channel === 4) {
+        data = data.concat(
+          {
+            title: 'Switch 3',
+            onPress: () => toSettingPage(2)
+          },
+          {
+            title: 'Switch 4',
+            onPress: () => toSettingPage(3)
+          }
+        )
+      }
+    }
+    setActionData(data)
+  }, [props.channel, props.backTitle, props.deviceId])
+
+  const styles = StyleSheet.create({
+    container: {
+      marginHorizontal: cx(14),
+    },
+    item: {
+      flex: 0.5,
+      justifyContent: 'center',
+      alignItems: 'center',
+    },
+    itemContainer: {
+      width: cx(154),
+      borderRadius: cx(16),
+    },
+    itemContent: {},
+    titleBg: {
+      height: cx(118),
+      justifyContent: 'center',
+      alignItems: 'center',
+    },
+    title: {
+      marginHorizontal: cx(16),
+      color: props.theme?.global.fontColor ?? 'black', // 添加默认值
+      fontSize: cx(14),
+      textAlign: 'center',
+      fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+  })
+
+  const renderItem = useCallback(({item}) => (
+    <View style={styles.item}>
+      <Card
+        style={styles.itemContainer}
+        containerStyle={styles.itemContent}
+        onPress={item.onPress}>
+        <View style={styles.titleBg}>
+          <Text style={styles.title}>{item.title}</Text>
+          <Spacer height={cx(8)}/>
+        </View>
+      </Card>
+    </View>
+  ), [styles])
+
+  const keyExtractor = useCallback((_: ActionData, index: number) => `key-${index}`, [])
+  const Header = useCallback(() => <Spacer height={cx(10)}/>, [])
+  const Separator = useCallback(() => <Spacer/>, [])
+  const Footer = useCallback(() => <Spacer height={cx(30)}/>, [])
+
+  return (
+    <FlatList
+      scrollEnabled={false}
+      numColumns={2}
+      style={styles.container}
+      data={actionData}
+      renderItem={renderItem}
+      keyExtractor={keyExtractor}
+      ListHeaderComponent={Header}
+      ItemSeparatorComponent={Separator}
+      ListFooterComponent={Footer}
+    />
+  )
+}
+
+export default withTheme(PressActionView)

package/src/components/ShowSelect.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { View, Text, TouchableOpacity, Image } from 'react-native'
 import { Utils, Popup } from 'tuya-panel-kit'
-import Img from '@res'
+import res from '@res'
 import Strings from '@i18n'
 
 const { convertX, height } = Utils.RatioUtils
@@ -83,7 +83,7 @@ export const ShowSelectView = (title, data, defaultValue, callback) => {
       {defaultValue === title &&
         <Image
           style={{ width: convertX(16), height: convertX(16) }}
-          source={Img.app_music_check}
+          source={{ uri: res.app_music_check}}
           resizeMode="contain"
         />}
     </TouchableOpacity>)

package/src/components/SocketItem.tsx

@@ -35,7 +35,7 @@ function SocketItem(props: SocketItemProps) {
       fontWeight: 'bold',
     },
     icon: {
-      width: cx(60),
+      width: cx(80),
       height: cx(20),
     },
     nameLine: {

package/src/components/Stepper.tsx

@@ -114,7 +114,7 @@ const Stepper = (props: StepperProps) => {
         style={[styles.stepperButton, props.buttonStyle]}
         onPress={() => handlePress(false)}
       >
-        <Image style={styles.stepperIcon} source={res.ic_minus} />
+        <Image style={styles.stepperIcon} source={{uri: res.ic_minus}} />
       </TouchableOpacity>
       <TextInput
         style={[styles.stepperInput, props.inputStyle]}
@@ -130,7 +130,7 @@ const Stepper = (props: StepperProps) => {
         style={[styles.stepperButton, props.buttonStyle]}
         onPress={() => handlePress(true)}
       >
-        <Image style={styles.stepperIcon} source={res.ic_plus} />
+        <Image style={styles.stepperIcon} source={{uri: res.ic_plus}} />
       </TouchableOpacity>
     </View>
   )

package/src/components/Tag.tsx

@@ -54,7 +54,7 @@ const Tag = (props: TagProps) => {
         {
           props.checked &&
             <Image
-                source={res.ic_arrows_nav_clear}
+                source={{uri: res.ic_arrows_nav_clear}}
                 style={styles.icon}/>
         }
       </View>

package/src/components/TextField.tsx

@@ -17,7 +17,7 @@ interface TextFieldProps extends TextInputProps {
 }
 
 const TextField = (props: TextFieldProps) => {
-  const icon = props.tipIcon || res.ic_warning_amber
+  const icon = props.tipIcon || { uri: res.ic_warning_amber}
   const color = props.tipColor || props.theme?.global.warning
   const editable = props.editable ?? !props.editable
 

package/src/components/TextFieldStyleButton.tsx

@@ -68,7 +68,7 @@ const TextFieldStyleButton = (props: TextFieldStyleButtonProps) => {
           <View style={styles.tipParent}>
               <Text style={styles.topTip}>{props.placeholder}</Text>
               {props.showTipIcon && <TouchableOpacity onPress={props.onTipIconPress}>
-                  <Image source={res.ic_info} style={styles.tipIcon}/>
+                  <Image source={{uri: res.ic_info}} style={styles.tipIcon}/>
               </TouchableOpacity>}
           </View>
           <TouchableOpacity onPress={props.onPress}>

package/src/components/UATabTitle.tsx

@@ -28,7 +28,7 @@ const UATabTitle = (props: UATabTitleProps) => {
       <Text style={styles.tabsTitle}>{props.text}</Text>
       <Spacer height={cx(0)} width={cx(4)}/>
       <TouchableOpacity onPress={props.onIconClick}>
-        <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.icon.primary }} source={res.ic_info}/>
+        <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.icon.primary }} source={{ uri: res.ic_info}}/>
       </TouchableOpacity>
     </View>
   )