@ledvance/base 1.0.32 → 1.0.34

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "scripts": {},
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",

package/src/api/native.ts

@@ -1,4 +1,4 @@
-import { NativeModules } from 'react-native'
+import { NativeModules, Platform } from 'react-native'
 import { NativeResult, Result } from '../models/modules/Result'
 
 interface LDVDevicePanelManager {
@@ -12,8 +12,10 @@ interface LDVDevicePanelManager {
     putJson: (deviceId: string, featureType: string, json: string, callback: (res: NativeResult<any>) => void) => void
     getJson: (deviceId: string, featureType: string, callback: (res: NativeResult<string>) => void) => void
     getInitiativeQueryDpsInfoWithDpsArray: (dpIds: string, deviceId: string, callback: (res: NativeResult<string>) => void) => void
-    openDownloadFile: (filePath: string) => void 
+    openDownloadFile: (filePath: string) => void
     formatNumber: (num: number, fixed: number) => string
+    getTimeZone: () => string
+
 }
 
 const devicePanel: LDVDevicePanelManager = NativeModules.LDVDevicePanelManager
@@ -33,6 +35,7 @@ const showObj = (objc) => {
     }
 }
 
+
 const control = (devId, dps, callback) => {
     devicePanel.control({ devId, dps: JSON.stringify(dps) }, res => {
         callback && callback(res)
@@ -216,20 +219,24 @@ export class NativeApi {
 // 打开下载文件
 export const openDownloadFile = (filePath: string) => {
     return new Promise((_reject) => {
-      devicePanel.openDownloadFile(filePath)
+        devicePanel.openDownloadFile(filePath)
     })
-  }
-  
-  export const queryDpIds = (dpIds: string, deviceId: string) => {
+}
+
+export const queryDpIds = (dpIds: string, deviceId: string) => {
     return new Promise((resolve, _reject) => {
-      devicePanel.getInitiativeQueryDpsInfoWithDpsArray(dpIds, deviceId, res => {
-        resolve(res)
-      })
+        devicePanel.getInitiativeQueryDpsInfoWithDpsArray(dpIds, deviceId, res => {
+            resolve(res)
+        })
     })
-  }
-  
-  export const formatNumber: (num: number, fixed: number) => string = (num, fixed) => {
+}
+
+export const formatNumber: (num: number, fixed: number) => string = (num, fixed) => {
     const res = devicePanel.formatNumber(num, fixed)
     log(`formatNumber: num=${num}, fixed=${fixed}, res=${res}`)
     return res
-  }
+}
+
+export const getTimeZone: () => string = () => {
+    return Platform.OS === 'android' ? devicePanel.getTimeZone() || '' : Intl.DateTimeFormat().resolvedOptions().timeZone
+}

package/src/components/Page.tsx

@@ -10,8 +10,10 @@ interface PageProps extends PropsWithChildren<ViewProps> {
     rightButtonIcon?: string
     rightButtonIconClick?: () => void
     headlineText?: string
-    headlineIcon?: string
+    headlineIcon?: string | number
     onHeadlineIconClick?: () => void
+    showGreenery?: boolean
+    greeneryIcon?: string | undefined | number
 }
 
 const Page = (props: PageProps) => {
@@ -31,7 +33,10 @@ const Page = (props: PageProps) => {
                 <LdvTopName
                     title={props.headlineText}
                     rightIcon={props.headlineIcon}
-                    rightIconClick={props.onHeadlineIconClick} />}
+                    rightIconClick={props.onHeadlineIconClick} 
+                    showGreenery={props.showGreenery}
+                    greeneryIcon={props.greeneryIcon}
+                />}
             {props.children}
         </View>
     )

package/src/components/ldvTopName.tsx

@@ -8,10 +8,13 @@ interface LdvTopNameProps {
     title: string,
     rightIcon?: string | undefined | number,
     rightIconClick?: () => void
+    showGreenery?: boolean
+    greeneryIcon?: string | undefined | number
 }
 
 const LdvTopName = (props: LdvTopNameProps) => {
-    const icon = typeof props.rightIcon === 'number' ? props.rightIcon : { uri: props.rightIcon }
+    const rightIcon = typeof props.rightIcon === 'number' ? props.rightIcon : {uri : props.rightIcon}
+    const greeneryIcon = typeof props.greeneryIcon === 'number' ? props.greeneryIcon : {uri : props.greeneryIcon}
     return (
         <View style={styles.container}>
             <View
@@ -21,12 +24,21 @@ const LdvTopName = (props: LdvTopNameProps) => {
                     alignItems: 'center',
                     marginTop: cx(38),
                 }}>
-                <Text style={styles.title}>{props.title}</Text>
+                <View style={{ flexDirection: 'row', flex: 1 }}>
+                    <Text style={styles.title}>
+                        {props.title}
+                    </Text>
+                    {props.showGreenery && <Image
+                        source={greeneryIcon}
+                        resizeMode="contain"
+                        style={{ height: cx(16), width: cx(16), left: 0 }}
+                    /> || null}
+                </View>
                 {props.rightIcon && <TouchableOpacity
                     onPress={props.rightIconClick}>
                     <Image
                         style={{ width: cx(24), height: cx(24), tintColor: '#ff6600' }}
-                        source={icon} />
+                        source={rightIcon} />
                 </TouchableOpacity>}
             </View>
         </View>
@@ -39,7 +51,6 @@ const styles = StyleSheet.create({
         marginBottom: cx(12),
     },
     title: {
-        flex: 1,
         color: '#f60',
         fontSize: cx(24),
     },