@ledvance/base 1.0.25 → 1.0.27

package/package.json

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

package/src/api/native.d.ts

@@ -17,3 +17,4 @@ export declare class NativeApi {
     static putJson(deviceId: string, featureType: string, json: string): Promise<Result<any>>;
     static getJson(deviceId: string, featureType: string): Promise<Result<string>>;
 }
+export declare const queryDpIds: (dpIds: string, deviceId: string) => Promise<unknown>;

package/src/api/native.ts

@@ -1,5 +1,5 @@
-import {NativeModules} from 'react-native'
-import {NativeResult, Result} from '../models/modules/Result'
+import { NativeModules } from 'react-native'
+import { NativeResult, Result } from '../models/modules/Result'
 
 interface LDVDevicePanelManager {
     back: () => void
@@ -11,6 +11,7 @@ interface LDVDevicePanelManager {
     toDeviceSettingsPage: (deviceId: string) => void
     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
 }
 
 const devicePanel: LDVDevicePanelManager = NativeModules.LDVDevicePanelManager
@@ -31,7 +32,7 @@ const showObj = (objc) => {
 }
 
 const control = (devId, dps, callback) => {
-    devicePanel.control({devId, dps: JSON.stringify(dps)}, res => {
+    devicePanel.control({ devId, dps: JSON.stringify(dps) }, res => {
         callback && callback(res)
     })
 }
@@ -41,7 +42,7 @@ const TASK = 'LDV_TY'
 
 const timerList = devId => {
     return new Promise((resolve, _reject) => {
-        const params = {devId, task: TASK, action: 'list', bizType: 0}
+        const params = { devId, task: TASK, action: 'list', bizType: 0 }
         devicePanel.setTimer(params, res => {
             resolve(res)
         })
@@ -49,21 +50,21 @@ const timerList = devId => {
 }
 
 const addTimer = (devId, value, callback: any = undefined) => {
-    const params = {devId, task: TASK, action: 'add', value, bizType: 0}
+    const params = { devId, task: TASK, action: 'add', value, bizType: 0 }
     devicePanel.setTimer(params, res => {
         callback && callback(res)
     })
 }
 
 const editTimer = (devId, value, callback: any = undefined) => {
-    const params = {devId, task: TASK, action: 'update', value, bizType: 0}
+    const params = { devId, task: TASK, action: 'update', value, bizType: 0 }
     devicePanel.setTimer(params, res => {
         callback && callback(res)
     })
 }
 
 const deleteTimer = (devId, value, callback: any = undefined) => {
-    const params = {devId, task: TASK, action: 'delete', value, bizType: 0}
+    const params = { devId, task: TASK, action: 'delete', value, bizType: 0 }
     devicePanel.setTimer(params, res => {
         callback && callback(res)
     })
@@ -81,7 +82,7 @@ function getAllTaskTimer(devId: string, type: number = 0, callback: ((res: Nativ
 
 const setDp = <T>(deviceId: string, key: string, value: any) => {
     return new Promise<NativeResult<T>>((resolve, _reject) => {
-        control(deviceId, {[key]: value}, res => {
+        control(deviceId, { [key]: value }, res => {
             resolve(res)
         })
     })
@@ -207,4 +208,12 @@ export class NativeApi {
             })
         })
     }
+}
+
+export const queryDpIds = (dpIds: string, deviceId: string) => {
+    return new Promise((resolve, _reject) => {
+        devicePanel.getInitiativeQueryDpsInfoWithDpsArray(dpIds, deviceId, res => {
+            resolve(res)
+        })
+    })
 }

package/src/components/ldvTopBar.d.ts

@@ -2,7 +2,7 @@ interface TopBarProps {
     title: string;
     onBackPress: () => void;
     rightButtonIcon?: any | {};
-    rightButtonStyle?: any | undefined;
+    rightButtonStyle?: any | undefined | number;
     onRightButtonPress?: (() => void) | undefined;
 }
 declare const LDVTopBar: (props: TopBarProps) => JSX.Element;

package/src/components/ldvTopBar.tsx

@@ -10,11 +10,12 @@ interface TopBarProps {
     title: string,
     onBackPress: () => void,
     rightButtonIcon?: any | {},
-    rightButtonStyle?: any | undefined,
+    rightButtonStyle?: any | undefined | number,
     onRightButtonPress?: (() => void) | undefined,
 }
 
 const LDVTopBar = (props: TopBarProps) => {
+    const icon = typeof props.rightButtonIcon === 'number' ? props.rightButtonIcon : { uri: props.rightButtonIcon }
     return (
         <View
             style={{
@@ -52,7 +53,7 @@ const LDVTopBar = (props: TopBarProps) => {
                                 { width: cx(28), height: cx(28) },
                                 props.rightButtonStyle,
                             ]}
-                            source={{ uri: props.rightButtonIcon }} />
+                            source={icon} />
                     </View>
                 </TouchableOpacity>
             }

package/src/components/ldvTopName.d.ts

@@ -1,6 +1,6 @@
 interface LdvTopNameProps {
     title: string;
-    rightIcon?: string | undefined;
+    rightIcon?: string | undefined | number;
     rightIconClick?: () => void;
 }
 declare const LdvTopName: (props: LdvTopNameProps) => JSX.Element;

package/src/components/ldvTopName.tsx

@@ -6,11 +6,12 @@ const cx = Utils.RatioUtils.convertX
 
 interface LdvTopNameProps {
     title: string,
-    rightIcon?: string | undefined,
+    rightIcon?: string | undefined | number,
     rightIconClick?: () => void
 }
 
 const LdvTopName = (props: LdvTopNameProps) => {
+    const icon = typeof props.rightIcon === 'number' ? props.rightIcon : { uri: props.rightIcon }
     return (
         <View style={styles.container}>
             <View
@@ -25,7 +26,7 @@ const LdvTopName = (props: LdvTopNameProps) => {
                     onPress={props.rightIconClick}>
                     <Image
                         style={{ width: cx(24), height: cx(24), tintColor: '#ff6600' }}
-                        source={{ uri: props.rightIcon }} />
+                        source={icon} />
                 </TouchableOpacity>}
             </View>
         </View>