@ledvance/base 1.3.9 → 1.3.11

package/localazy.json

@@ -900,7 +900,10 @@
                 "MATCH:thermostat_maxtime",
                 "MATCH:thermostat_schedule",
                 "MATCH:thermostat_unit",
-                "MATCH:thermostat_comforttemp"
+                "MATCH:thermostat_comforttemp",
+                "MATCH:mood_resetbutton",
+                "MATCH:reset_mooddescription",
+                "MATCH:settings_wateralarmrecovery"
             ],
             "replacements": {
                 "REGEX:% %1\\$s.*?\\)%": "{0}",

package/localazy.keys.json

@@ -1,4 +1,5 @@
 {
-  "writeKey": "",
-  "readKey": "a7349213573288779040-d092b120e7d6d90c7e9528ddf2aa600659f60631bd4a5c2d55de0aa2b081af1b"
-}
+    "writeKey": "",
+    "readKey": "a7349213573288779040-d092b120e7d6d90c7e9528ddf2aa600659f60631bd4a5c2d55de0aa2b081af1b"
+}
+

package/package.json

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

package/src/components/AdvanceList.tsx

@@ -4,7 +4,7 @@ import AdvanceCard, { AdvancedData } from './AdvanceCard'
 import Spacer from './Spacer'
 import { useNavigation } from '@react-navigation/core'
 import { Utils } from 'tuya-panel-kit'
-import { getMicrophoneAccess } from '@ledvance/base/src/api/native'
+import { getMicrophoneAccess } from '../api/native'
 
 const { convertX: cx } = Utils.RatioUtils
 
@@ -27,7 +27,7 @@ function AdvanceList(props: AdvanceListProps) {
         onPress={async () => {
           if(MusicRouterKey.includes(item.router.key)){
             getMicrophoneAccess().then(res =>{
-              if(!res) return 
+              if(!res) return
               navigation.navigate(item.router.key, item.router.params)
             })
           }else{
@@ -77,4 +77,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default React.memo(AdvanceList)
+export default React.memo(AdvanceList)

package/src/components/ApplyForDeviceItem.tsx

@@ -5,6 +5,9 @@ import { DeviceInfo } from '../api/native'
 import Spacer from './Spacer'
 import res from '../res'
 import ThemeType from '../config/themeType'
+import { getGlobalParamsDp } from '../utils/common'
+import I18n from '../i18n'
+import { isNumber } from 'lodash'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
@@ -15,6 +18,9 @@ export interface ApplyForDeviceItemProps {
 }
 
 const ApplyForDeviceItem = (props: ApplyForDeviceItemProps) => {
+  const { dps } = props.deviceInfo
+  const curPowerDp = getGlobalParamsDp('cur_power')
+  const curPower = dps && JSON.parse(dps) && JSON.parse(dps)[curPowerDp]
 
   const styles = StyleSheet.create({
     root: {
@@ -59,8 +65,12 @@ const ApplyForDeviceItem = (props: ApplyForDeviceItemProps) => {
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
     offlineIcon: {
-      width: cx(24),
-      height: cx(24)
+      minWidth: cx(24),
+      minHeight: cx(24)
+    },
+    onlineText: {
+      color: props.theme?.global.fontColor,
+      fontSize: cx(14),
     }
   })
 
@@ -78,8 +88,12 @@ const ApplyForDeviceItem = (props: ApplyForDeviceItemProps) => {
         </View>
         <Spacer height={cx(6)} />
       </View>
-      <View style={[styles.offlineIcon, {marginRight: cx(5)}]}>
+      <View style={[styles.offlineIcon, {marginHorizontal: cx(5)}]}>
         {!props.deviceInfo.status && <Image style={styles.offlineIcon} source={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>
+          </View>}
       </View>
     </View>
   )

package/src/components/BatteryStateView.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
-import Card from '@ledvance/base/src/components/Card';
+import Card from './Card';
 import { Battery, Utils } from 'tuya-panel-kit';
 import { View, Text, StyleSheet } from 'react-native';
-import I18n from '@ledvance/base/src/i18n';
-import Spacer from '@ledvance/base/src/components/Spacer';
+import I18n from '../i18n';
+import Spacer from './Spacer';
 
 const cx = Utils.RatioUtils.convertX;
 type BatteryProps = {

package/src/components/Stepper.tsx

@@ -1,4 +1,4 @@
-import { exchangeNumber, localeNumber } from "@ledvance/base/src/utils/common";
+import { exchangeNumber, localeNumber } from "../utils/common";
 import res from "@res";
 import { useReactive } from "ahooks";
 import React, { memo, useCallback } from "react";

package/src/components/TextField.tsx

@@ -69,7 +69,7 @@ const TextField = (props: TextFieldProps) => {
       <Text style={[styles.topTip, { opacity: (!!props.value) ? 1 : 0 }]}>{props.placeholder}</Text>
       <View style={styles.textInputGroup}>
         <TextInput{...props} style={styles.textInput} />
-        {!!props.value &&
+        {!!props.value && props.editable &&
             <TouchableOpacity
                 style={styles.iconTouchable}
                 onPress={() => {

package/src/components/ldvSwitch.tsx

@@ -9,7 +9,7 @@ const { withTheme } = Utils.ThemeUtils
 interface Prop {
   theme?: ThemeType
   title: string
-  color: string
+  color?: string
   colorAlpha: number
   enable: boolean
   setEnable: (enable: boolean) => void
@@ -24,7 +24,7 @@ const LdvSwitch = (props: Prop) => {
         <View style={{flexDirection: 'column', flex: 1}}>
           <View style={{flexDirection: 'row', alignItems: 'center'}}>
             <Text style={{...styles.title, color: props.theme?.global.fontColor}}>{title}</Text>
-            <View style={[styles.colorBlock, {backgroundColor: color, opacity: colorAlpha}]}/>
+            <View style={[styles.colorBlock, {backgroundColor: color || props.theme?.card.background, opacity: colorAlpha}]}/>
           </View>
           {description && <Text style={{color: props.theme?.global.fontColor}}>{description}</Text>}
         </View>

package/src/components/ldvTopName.tsx

@@ -1,4 +1,4 @@
-import Spacer from '@ledvance/base/src/components/Spacer'
+import Spacer from './Spacer'
 import React from 'react'
 import { Image, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import { Utils } from 'tuya-panel-kit'