@ledvance/base 1.2.98 → 1.2.99

package/package.json

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

package/src/api/native.ts

@@ -60,6 +60,8 @@ export interface DeviceInfo {
   deviceCategory: UADeviceCategory
   roomName: string
   status: number
+  dps: string 
+  tuyaDeviceId: string
 }
 
 const devicePanel: LDVDevicePanelManager = NativeModules.LDVDevicePanelManager

package/src/components/Page.tsx

@@ -23,6 +23,7 @@ interface PageProps extends PropsWithChildren<ViewProps> {
   headlineIcon?: string | number
   onHeadlineIconClick?: () => void
   headlineContent?: React.ReactNode
+  headlineTopContent?: React.ReactNode
   showGreenery?: boolean
   greeneryIcon?: string | undefined | number
   loading?: boolean
@@ -88,6 +89,7 @@ const Page = (props: PageProps) => {
             showGreenery={props.showGreenery}
             greeneryIcon={props.greeneryIcon}
             headlineContent={props.headlineContent}
+            headlineTopContent={props.headlineTopContent}
             />}
         {props.children}
       </View>

package/src/components/ldvTopName.tsx

@@ -1,3 +1,4 @@
+import Spacer from '@ledvance/base/src/components/Spacer'
 import React from 'react'
 import {Image, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 import {Utils} from 'tuya-panel-kit'
@@ -13,6 +14,7 @@ interface LdvTopNameProps {
   showGreenery?: boolean
   greeneryIcon?: string | undefined | number
   headlineContent?: React.ReactNode
+  headlineTopContent?: React.ReactNode
 }
 
 const LdvTopName = (props: LdvTopNameProps) => {
@@ -31,12 +33,13 @@ const LdvTopName = (props: LdvTopNameProps) => {
   })
   return (
     <View style={styles.container}>
+      {props.headlineTopContent && props.headlineTopContent}
+      {!props.headlineTopContent && <Spacer height={cx(38)}/>}
       <View
         style={{
           flexDirection: 'row',
           justifyContent: 'space-between',
           alignItems: 'center',
-          marginTop: cx(38),
         }}>
         <View style={{flexDirection: 'row', flex: 1}}>
           <Text style={styles.title}>

package/src/components/segmentControl.tsx

@@ -6,7 +6,7 @@ const {convertX} = Utils.RatioUtils
 
 export default function SegmentControl(props) {
 
-  const {title1, title2, isFirst, setIsFirst, style} = props
+  const {title1, title2, isFirst, setIsFirst, style, tabStyle} = props
 
   return (<View style={{}}>
     <View style={[{
@@ -25,7 +25,7 @@ export default function SegmentControl(props) {
           borderRadius: convertX(6.9),
         }, isFirst ?
           {backgroundColor: '#fff', margin: convertX(2), borderRadius: 6.9} :
-          {backgroundColor: '#eeeeef'}]
+          {backgroundColor: '#eeeeef'}, tabStyle]
       } onPress={() => setIsFirst(true)}>
         <Text
           style={{
@@ -48,7 +48,7 @@ export default function SegmentControl(props) {
           },
             !isFirst ?
               {backgroundColor: '#fff'} :
-              {backgroundColor: '#eeeeef'}]
+              {backgroundColor: '#eeeeef'}, tabStyle]
         }
         onPress={() => setIsFirst(false)}>
         <Text