@ledvance/base 1.3.57 → 1.3.59

package/localazy.json

@@ -1183,7 +1183,12 @@
                 "MATCH:camera_site_overview_warning_max_number_text",
                 "MATCH:camera_site_overview_empty_button_add_text",
                 "MATCH:camera_site_overview_empty_information_text",
-                "MATCH:camera_settings_onvif_ip_topic"
+                "MATCH:camera_settings_onvif_ip_topic",
+                "MATCH:camera_settings_power_management_settings_topic",
+                "MATCH:motion_detection_alarm_interval",
+                "MATCH:camera_operation_site_error",
+                "MATCH:camera_calibration",
+                "MATCH:camera_calibration_desc"
             ],
             "replacements": {
                 "REGEX:% %1\\$s.*?\\)%": "{0}",

package/package.json

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

package/src/components/BatteryPercentageView.tsx

@@ -67,7 +67,7 @@ const BatteryPercentageView = (props: BatteryProps) => {
           theme={{batteryColor: props.theme?.global.secondFontColor || '#000'}}
         />
       </View>
-      <Text style={[styles.content, value < middleValue ? styles.low : null]}>{value}%</Text>
+      <Text style={[styles.content, value <= middleValue ? styles.low : null]}>{value}%</Text>
     </Card>
   )
 }

package/src/components/HybridSwitchView.tsx

@@ -0,0 +1,118 @@
+import React from 'react'
+import { View, Text, TouchableOpacity, StyleSheet, StyleProp, ViewStyle, Platform } from 'react-native'
+import { Utils } from 'tuya-panel-kit'
+import LinearGradient from 'react-native-linear-gradient'
+import Card from '@ledvance/base/src/components/Card'
+import ThemeType from '@ledvance/base/src/config/themeType'
+import Spacer from '@ledvance/base/src/components/Spacer'
+
+const { convertX: cx } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
+
+interface HybridSwitchViewProps {
+  theme?: ThemeType
+  style?: StyleProp<ViewStyle>
+  switchChannels: boolean[]
+  onSwitchChange?: (index: number, value: boolean) => void
+}
+
+const HybridSwitchView = (props: HybridSwitchViewProps) => {
+
+  const styles = StyleSheet.create({
+    root: {
+      paddingHorizontal: cx(16),
+    },
+    switchPanelContainer: {
+      flex: 1,
+      alignItems: 'center',
+      justifyContent: 'center',
+    },
+    switchPanelCardTitle: {
+      color: props.theme?.global.fontColor,
+      fontSize: cx(16),
+      fontWeight: 'bold',
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    switchPanel: {
+      width: cx(120),
+      height: cx(120),
+      borderRadius: cx(6),
+      justifyContent: 'center',
+      alignItems: 'center',
+      borderWidth: cx(3),
+      borderColor: '#ECECEC',
+      overflow: 'hidden',
+      backgroundColor: '#F3F1F1',
+    },
+    container: {
+      width: cx(90),
+      height: cx(90),
+      flexDirection: 'row',
+      borderRadius: cx(6),
+      borderWidth: 1,
+      borderColor: '#B8B7B7',
+      overflow: 'hidden'
+    },
+    touchContainer: {
+      flex: 1,
+      borderRightWidth: 1,
+      borderColor: '#9E9E9E',
+    },
+    innerPanel: {
+      flex: 1,
+      backgroundColor: '#F8F8F8',
+      justifyContent: 'flex-end',
+      alignItems: 'center',
+    },
+    insertColor: {
+      width: '100%',
+      height: cx(10),
+      backgroundColor: '#FF6A00',
+    },
+    indicator: {
+      width: cx(20),
+      height: cx(2),
+      borderRadius: cx(1),
+      backgroundColor: '#F60',
+      marginBottom: cx(15),
+    },
+  })
+
+  return (
+    <Card style={[styles.root, props.style]}>
+      <Spacer width={cx(16)} />
+      <Text style={styles.switchPanelCardTitle}>Hybrid Switch</Text>
+      <Spacer />
+      <View style={styles.switchPanelContainer}>
+        <LinearGradient
+          colors={['#FFFFFF', '#F3F1F1']}
+          style={styles.switchPanel}
+        >
+          <View style={styles.container}>
+            {props.switchChannels.map((channel, index) => (
+              <TouchableOpacity
+                key={index}
+                activeOpacity={Platform.OS === 'ios' ? 0.5 : 0.9}
+                onPress={() => {
+                  props.onSwitchChange?.(index, !channel)
+                }}
+                style={[styles.touchContainer, { borderRightWidth: index === props.switchChannels.length - 1 ? 0 : 1 }]}
+              >
+                <View style={styles.innerPanel}>
+                  <View style={[styles.indicator, { backgroundColor: channel ? '#F60' : '#585858' }]} />
+                  <LinearGradient
+                    colors={['#DDDDDD', '#EBEBEB']}
+                    style={styles.insertColor}
+                  />
+                </View>
+              </TouchableOpacity>
+            ))}
+          </View>
+        </LinearGradient>
+        <Spacer height={cx(30)}/>
+      </View>
+    </Card>
+  )
+}
+
+export default withTheme(HybridSwitchView)

package/src/components/OptionGroup.tsx

@@ -0,0 +1,128 @@
+import ThemeType from "../config/themeType";
+import {Utils} from "tuya-panel-kit";
+import {Image, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
+import Spacer from "./Spacer";
+import res from "../res";
+import React from "react";
+import Card from "./Card";
+
+const {convertX: cx} = Utils.RatioUtils
+const {withTheme} = Utils.ThemeUtils
+
+interface OptionGroupProps {
+  theme?: ThemeType
+  tips: string
+  selected: any
+  options: OptionItemProps[]
+}
+
+interface OptionItemProps {
+  title: string
+  value: any
+  content?: string
+  enable?: boolean
+  onPress?: (value: any) => void
+}
+
+const OptionGroup = (props: OptionGroupProps) => {
+  const styles = StyleSheet.create({
+    modeSelectGroup: {
+      marginHorizontal: cx(24),
+      backgroundColor: props.theme?.container.background,
+      borderRadius: cx(4),
+    },
+    modeTip: {
+      marginHorizontal: cx(8),
+      color: props.theme?.global.fontColor,
+      fontSize: cx(14),
+      fontWeight: 'bold',
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    modeSelectCard: {
+      marginHorizontal: cx(8),
+    },
+    line: {
+      height: cx(1),
+      marginHorizontal: cx(12),
+      backgroundColor: props.theme?.container.divider,
+    },
+    itemRoot: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      paddingHorizontal: cx(12),
+      paddingBottom: cx(8),
+    },
+    itemTextGroup: {
+      flex: 1,
+      marginEnd: cx(12),
+      justifyContent: 'center',
+    },
+    itemTitle: {
+      color: props.theme?.global.fontColor,
+      fontSize: cx(14),
+      fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+    itemContent: {
+      color: props.theme?.global.secondFontColor,
+      fontSize: cx(14),
+      fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+  })
+
+  const OptionItem = (props: OptionItemProps) => {
+    return (
+      <TouchableOpacity onPress={() => props.onPress && props.onPress(props.value)}>
+        <View style={styles.itemRoot}>
+          <View style={styles.itemTextGroup}>
+            <Text style={styles.itemTitle}>{props.title}</Text>
+            <Spacer height={cx(4)}/>
+            {
+              props.content ? <Text style={styles.itemContent}>{props.content}</Text>
+                : <></>
+            }
+          </View>
+          <Image
+            source={{uri: res.ic_check}}
+            style={{
+              width: cx(32),
+              height: cx(32),
+              marginEnd: cx(4),
+              display: props.enable ? 'flex' : 'none',
+            }}/>
+        </View>
+      </TouchableOpacity>
+    )
+  }
+
+  return (
+    <View style={styles.modeSelectGroup}>
+      <Spacer height={cx(8)}/>
+      <Text style={styles.modeTip}>
+        {props.tips}
+      </Text>
+      <Spacer height={cx(8)}/>
+      <Card style={styles.modeSelectCard}>
+        <Spacer height={cx(12)}/>
+        {
+          props.options.map((item, index) => {
+            return (
+              <React.Fragment key={`Fragment${index}`}>
+                <OptionItem
+                  key={index}
+                  {...item}
+                  enable={item.value === props.selected}
+                />
+                {
+                  index !== props.options.length - 1 ? <><View style={styles.line}/><Spacer height={cx(12)}/></> : <></>
+                }
+              </React.Fragment>
+            )
+          })
+        }
+      </Card>
+      <Spacer height={cx(12)}/>
+    </View>
+  )
+}
+
+export default withTheme(OptionGroup)

package/src/components/ldvSwitch.tsx

@@ -10,7 +10,7 @@ interface Prop {
   theme?: ThemeType
   title: string
   color?: string
-  colorAlpha: number
+  colorAlpha?: number
   enable: boolean
   setEnable: (enable: boolean) => void
   showSwitch?:boolean
@@ -21,7 +21,7 @@ interface Prop {
 }
 
 const LdvSwitch = (props: Prop) => {
-  const {title, color, colorAlpha, enable, description, titleStyle, setEnable, leftValue, rightValue, showSwitch = true} = props
+  const {title, color, colorAlpha = 0, enable, description, titleStyle, setEnable, leftValue, rightValue, showSwitch = true} = props
   return (
     <View style={styles.titleBGView}>
       <View style={{flexDirection: 'column', flex: 1}}>

package/src/composeLayout.tsx

@@ -15,7 +15,7 @@ import {
   setTimeZone,
   UAGroupInfo,
 } from './models/modules/NativePropsSlice'
-import { DpSchema, GlobalParams } from './models/GlobalParams'
+import { LdvDpSchema, GlobalParams } from './models/GlobalParams'
 import Connect from './components/connect'
 import darkTheme from "./config/dark-theme";
 import lightTheme from "./config/light-theme";
@@ -204,17 +204,19 @@ const composeLayout = (component: React.ComponentType) => {
 
     setDpSchemaMap(schema: string): any {
       // 处理物模型协议和dps
-      const dpSchemaMap: Record<string, DpSchema> = {}
+      const dpSchemaMap: Record<string, LdvDpSchema> = {}
       const dps = {}
       JSON.parse(schema || '[]')
         .forEach((schemaItem: any) => {
-          dpSchemaMap[schemaItem.code] = {
+          const dpSchema = {
             name: schemaItem.name,
             dp: schemaItem.id,
             type: schemaItem.type,
             mode: schemaItem.mode,
             property: schemaItem.property,
-          }
+          };
+          dpSchemaMap[schemaItem.code] = dpSchema
+          dpSchemaMap[schemaItem.id] = dpSchema
           dps[schemaItem.id] = null
         })
       GlobalParams.dpSchemaMap = dpSchemaMap