@ledvance/base 1.1.14 → 1.1.16

package/package.json

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

package/src/api/native.d.ts

@@ -1,4 +1,15 @@
 import { NativeResult, Result } from '../models/modules/Result';
+export interface DeviceInfo {
+    deviceId: string;
+    deviceName: string;
+    deviceIcon: string;
+    roomName: string;
+    status: number;
+}
+declare type GetFeatureResultType = (deviceId: string, featureId: string) => Promise<NativeResult<any>>;
+declare type SetFeatureResultType = (deviceId: string, featureId: string, value: any) => Promise<NativeResult<any>>;
+export declare const getFeature: GetFeatureResultType;
+export declare const putFeature: SetFeatureResultType;
 export declare class NativeApi {
     static back(): void;
     static log(msg: string): void;
@@ -17,8 +28,10 @@ export declare class NativeApi {
     static putJson(deviceId: string, featureType: string, json: string): Promise<Result<any>>;
     static getJson(deviceId: string, featureType: string): Promise<Result<any>>;
     static groupControl(tyGroupId: number, dps: string, config: string): Promise<Result<any>>;
+    static getGroupDevices(tyGroupId: number): Promise<Result<DeviceInfo[]>>;
 }
 export declare const openDownloadFile: (filePath: string) => Promise<unknown>;
 export declare const queryDpIds: (dpIds: string, deviceId: string) => Promise<unknown>;
 export declare const formatNumber: (num: number, fixed: number) => string;
 export declare const getTimeZone: () => string;
+export {};

package/src/api/native.ts

@@ -2,79 +2,88 @@ import {NativeModules, Platform} from 'react-native'
 import {NativeResult, Result} from '../models/modules/Result'
 
 interface LDVDevicePanelManager {
-    back: () => void
-    control: (params: any, callback: (result: any) => void) => void
-    setTimer: (params: any, callback: (result: any) => void) => void
-    getAllTaskTimer: (deviceId: string, type: number, callback: (res: NativeResult<string>) => void) => void
-    deleteDevice: (deviceId: string, isReset: boolean, callback: (result: any) => void) => void
-    rename: (deviceId: string, name: string, callback: (result: any) => void) => void
-    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
-    openDownloadFile: (filePath: string) => void
-    formatNumber: (num: number, fixed: number) => string
-    getTimeZone: () => string
-    groupControl: (tyGroupId: number, dps: string, config: string) => Promise<NativeResult<any>>
-    getFeature: (deviceId: string, featureId: string, callback: (res: NativeResult<string>) => void) => void
-    putFeature: (deviceId: string, featureId: string, value: any, callback: (res: NativeResult<string>) => void) => void
+  back: () => void
+  control: (params: any, callback: (result: any) => void) => void
+  setTimer: (params: any, callback: (result: any) => void) => void
+  getAllTaskTimer: (deviceId: string, type: number, callback: (res: NativeResult<string>) => void) => void
+  deleteDevice: (deviceId: string, isReset: boolean, callback: (result: any) => void) => void
+  rename: (deviceId: string, name: string, callback: (result: any) => void) => void
+  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
+  openDownloadFile: (filePath: string) => void
+  formatNumber: (num: number, fixed: number) => string
+  getTimeZone: () => string
+  groupControl: (tyGroupId: number, dps: string, config: string) => Promise<NativeResult<any>>
+  getFeature: (deviceId: string, featureId: string, callback: (res: NativeResult<string>) => void) => void
+  putFeature: (deviceId: string, featureId: string, value: any, callback: (res: NativeResult<string>) => void) => void
+  getGroupDevices: (tyGroupId: number) => Promise<NativeResult<string>>
+}
+
+export interface DeviceInfo {
+  deviceId: string
+  deviceName: string
+  deviceIcon: string
+  roomName: string
+  status: number
 }
 
 const devicePanel: LDVDevicePanelManager = NativeModules.LDVDevicePanelManager
 const logManager = NativeModules.RNLogManager
 
 const back = () => {
-    devicePanel.back()
+  devicePanel.back()
 }
 
 const log = (str: string) => {
-    logManager.log(str)
+  logManager.log(str)
 }
 
 const showObj = (objc) => {
-    if (!!objc) {
-        logManager.objc(objc)
-    }
+  if (!!objc) {
+    logManager.objc(objc)
+  }
 }
 
 
 const control = (devId, dps, callback) => {
-    devicePanel.control({ devId, dps: JSON.stringify(dps) }, res => {
-        callback && callback(res)
-    })
+  devicePanel.control({devId, dps: JSON.stringify(dps)}, res => {
+    callback && callback(res)
+  })
 }
 
 // timer
 const TASK = 'LDV_TY'
 
 const timerList = devId => {
-    return new Promise((resolve, _reject) => {
-        const params = { devId, task: TASK, action: 'list', bizType: 0 }
-        devicePanel.setTimer(params, res => {
-            resolve(res)
-        })
+  return new Promise((resolve, _reject) => {
+    const params = {devId, task: TASK, action: 'list', bizType: 0}
+    devicePanel.setTimer(params, res => {
+      resolve(res)
     })
+  })
 }
 
 const addTimer = (devId, value, callback: any = undefined) => {
-    const params = { devId, task: TASK, action: 'add', value, bizType: 0 }
-    devicePanel.setTimer(params, res => {
-        callback && callback(res)
-    })
+  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 }
-    devicePanel.setTimer(params, res => {
-        callback && callback(res)
-    })
+  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 }
-    devicePanel.setTimer(params, res => {
-        callback && callback(res)
-    })
+  const params = {devId, task: TASK, action: 'delete', value, bizType: 0}
+  devicePanel.setTimer(params, res => {
+    callback && callback(res)
+  })
 }
 
 /**
@@ -84,200 +93,209 @@ const deleteTimer = (devId, value, callback: any = undefined) => {
  * @param callback
  */
 function getAllTaskTimer(devId: string, type: number = 0, callback: ((res: NativeResult<string>) => void)) {
-    devicePanel.getAllTaskTimer(devId, type, callback)
+  devicePanel.getAllTaskTimer(devId, type, callback)
 }
 
 const setDp = <T>(deviceId: string, key: string, value: any) => {
-    return new Promise<NativeResult<T>>((resolve, _reject) => {
-        control(deviceId, { [key]: value }, res => {
-            resolve(res)
-        })
+  return new Promise<NativeResult<T>>((resolve, _reject) => {
+    control(deviceId, {[key]: value}, res => {
+      resolve(res)
     })
+  })
 }
 
 const setDps = <T>(deviceId: string, dps: any) => {
-    return new Promise<NativeResult<T>>((resolve, _reject) => {
-        control(deviceId, dps, res => {
-            resolve(res)
-        })
+  return new Promise<NativeResult<T>>((resolve, _reject) => {
+    control(deviceId, dps, res => {
+      resolve(res)
     })
+  })
 }
 
 type GetFeatureResultType = (deviceId: string, featureId: string) => Promise<NativeResult<any>>;
 type SetFeatureResultType = (
-    deviceId: string,
-    featureId: string,
-    value: any,
+  deviceId: string,
+  featureId: string,
+  value: any,
 ) => Promise<NativeResult<any>>;
 
 export const getFeature: GetFeatureResultType = (deviceId: string, featureId: string) => {
-    return new Promise((resolve, _reject) => {
-        devicePanel.getFeature(deviceId, featureId, res => {
-            const result: NativeResult<any> = {
-                ...res,
-                data: !!res.data ? JSON.parse(res.data).value : null,
-            }
-            resolve(result)
-        })
+  return new Promise((resolve, _reject) => {
+    devicePanel.getFeature(deviceId, featureId, res => {
+      const result: NativeResult<any> = {
+        ...res,
+        data: !!res.data ? JSON.parse(res.data).value : null,
+      }
+      resolve(result)
     })
+  })
 }
 
 export const putFeature: SetFeatureResultType = (
-    deviceId: string,
-    featureId: string,
-    value: any,
+  deviceId: string,
+  featureId: string,
+  value: any,
 ) => {
-    return new Promise((resolve, _reject) => {
-        devicePanel.putFeature(deviceId, featureId, JSON.stringify({ value }), res => {
-            resolve(res)
-        })
+  return new Promise((resolve, _reject) => {
+    devicePanel.putFeature(deviceId, featureId, JSON.stringify({value}), res => {
+      resolve(res)
     })
+  })
 }
 
 type DeleteDeviceResultType = (deviceId: string, isReset: boolean) => Promise<NativeResult<any>>
 
 const deleteDevice: DeleteDeviceResultType = (deviceId: string, isReset: boolean) => {
-    return new Promise((resolve, _reject) => {
-        devicePanel.deleteDevice(deviceId, isReset, res => {
-            resolve(res)
-        })
+  return new Promise((resolve, _reject) => {
+    devicePanel.deleteDevice(deviceId, isReset, res => {
+      resolve(res)
     })
+  })
 }
 
 type RenameResultType = (deviceId: string, name: string) => Promise<NativeResult<any>>
 
 const rename: RenameResultType = (deviceId: string, name: string) => {
-    return new Promise((resolve, _reject) => {
-        devicePanel.rename(deviceId, name, res => {
-            resolve(res)
-        })
+  return new Promise((resolve, _reject) => {
+    devicePanel.rename(deviceId, name, res => {
+      resolve(res)
     })
+  })
 }
 
 function toDeviceSettingsPage(tuyaDeviceId: string) {
-    devicePanel.toDeviceSettingsPage(tuyaDeviceId)
+  devicePanel.toDeviceSettingsPage(tuyaDeviceId)
 }
 
 export class NativeApi {
-    static back(): void {
-        back()
-    }
-
-    static log(msg: string): void {
-        log(msg)
-    }
-
-    static logObj(msg: any): void {
-        this.log(JSON.stringify(msg))
-    }
-
-    static showObj(obj: any): void {
-        showObj(obj)
-    }
-
-    static getAllTaskTimer(devId: string, type: number = 0): Promise<Result<any>> {
-        return new Promise<Result<any>>((resolve, _reject) => {
-            getAllTaskTimer(devId, type, res => {
-                resolve({
-                    success: res.result,
-                    data: res.result ? JSON.parse(res.data || '[]') : undefined,
-                    msg: res.msg,
-                })
-            })
+  static back(): void {
+    back()
+  }
+
+  static log(msg: string): void {
+    log(msg)
+  }
+
+  static logObj(msg: any): void {
+    this.log(JSON.stringify(msg))
+  }
+
+  static showObj(obj: any): void {
+    showObj(obj)
+  }
+
+  static getAllTaskTimer(devId: string, type: number = 0): Promise<Result<any>> {
+    return new Promise<Result<any>>((resolve, _reject) => {
+      getAllTaskTimer(devId, type, res => {
+        resolve({
+          success: res.result,
+          data: res.result ? JSON.parse(res.data || '[]') : undefined,
+          msg: res.msg,
         })
-    }
-
-    static timerList(deviceId: string): Promise<any> {
-        return timerList(deviceId)
-    }
-
-    static addTimer(deviceId: string, value: any, callback?: (res: any) => void): void {
-        addTimer(deviceId, value, callback)
-    }
-
-    static editTimer(deviceId: string, value: any, callback?: (res: any) => void): void {
-        editTimer(deviceId, value, callback)
-    }
-
-    static deleteTimer(deviceId: string, value: any, callback?: (res: any) => void): void {
-        deleteTimer(deviceId, value, callback)
-    }
-
-    static setDp<T>(deviceId: string, key: string, value: any): Promise<NativeResult<T>> {
-        return setDp<T>(deviceId, key, value)
-    }
-
-    static setDps<T>(deviceId: string, dps: any): Promise<NativeResult<T>> {
-        return setDps<T>(deviceId, dps)
-    }
-
-    static deleteDevice(deviceId: string, isReset: boolean): Promise<NativeResult<any>> {
-        return deleteDevice(deviceId, isReset)
-    }
-
-    static renameDevice(deviceId: string, name: string): Promise<NativeResult<any>> {
-        return rename(deviceId, name)
-    }
-
-    static toDeviceSettingsPage(deviceId: string): void {
-        toDeviceSettingsPage(deviceId)
-    }
-
-    static putJson(deviceId: string, featureType: string, json: string): Promise<Result<any>> {
-        return new Promise<Result<any>>(resolve => {
-            devicePanel.putJson(deviceId, featureType, json, nativeRes => {
-                resolve({
-                    success: nativeRes.result,
-                    data: nativeRes.data,
-                    msg: nativeRes.msg,
-                })
-            })
+      })
+    })
+  }
+
+  static timerList(deviceId: string): Promise<any> {
+    return timerList(deviceId)
+  }
+
+  static addTimer(deviceId: string, value: any, callback?: (res: any) => void): void {
+    addTimer(deviceId, value, callback)
+  }
+
+  static editTimer(deviceId: string, value: any, callback?: (res: any) => void): void {
+    editTimer(deviceId, value, callback)
+  }
+
+  static deleteTimer(deviceId: string, value: any, callback?: (res: any) => void): void {
+    deleteTimer(deviceId, value, callback)
+  }
+
+  static setDp<T>(deviceId: string, key: string, value: any): Promise<NativeResult<T>> {
+    return setDp<T>(deviceId, key, value)
+  }
+
+  static setDps<T>(deviceId: string, dps: any): Promise<NativeResult<T>> {
+    return setDps<T>(deviceId, dps)
+  }
+
+  static deleteDevice(deviceId: string, isReset: boolean): Promise<NativeResult<any>> {
+    return deleteDevice(deviceId, isReset)
+  }
+
+  static renameDevice(deviceId: string, name: string): Promise<NativeResult<any>> {
+    return rename(deviceId, name)
+  }
+
+  static toDeviceSettingsPage(deviceId: string): void {
+    toDeviceSettingsPage(deviceId)
+  }
+
+  static putJson(deviceId: string, featureType: string, json: string): Promise<Result<any>> {
+    return new Promise<Result<any>>(resolve => {
+      devicePanel.putJson(deviceId, featureType, json, nativeRes => {
+        resolve({
+          success: nativeRes.result,
+          data: nativeRes.data,
+          msg: nativeRes.msg,
         })
-    }
-
-    static getJson(deviceId: string, featureType: string): Promise<Result<any>> {
-        return new Promise<Result<any>>(resolve => {
-            devicePanel.getJson(deviceId, featureType, nativeRes => {
-                resolve({
-                    success: nativeRes.result,
-                    data: nativeRes.data,
-                    msg: nativeRes.msg,
-                })
-            })
+      })
+    })
+  }
+
+  static getJson(deviceId: string, featureType: string): Promise<Result<any>> {
+    return new Promise<Result<any>>(resolve => {
+      devicePanel.getJson(deviceId, featureType, nativeRes => {
+        resolve({
+          success: nativeRes.result,
+          data: nativeRes.data,
+          msg: nativeRes.msg,
         })
+      })
+    })
+  }
+
+  static async groupControl(tyGroupId: number, dps: string, config: string): Promise<Result<any>> {
+    const nativeResult = await devicePanel.groupControl(tyGroupId, dps, config)
+    return {
+      success: nativeResult.result,
+      msg: nativeResult.msg,
+      data: nativeResult.data,
     }
-
-    static async groupControl(tyGroupId: number, dps: string, config: string): Promise<Result<any>> {
-        const nativeResult = await devicePanel.groupControl(tyGroupId, dps, config)
-        return {
-            success: nativeResult.result,
-            msg: nativeResult.msg,
-            data: nativeResult.data
-        }
+  }
+
+  static async getGroupDevices(tyGroupId: number): Promise<Result<DeviceInfo[]>> {
+    const nativeResult = await devicePanel.getGroupDevices(tyGroupId)
+    return {
+      success: nativeResult.result,
+      msg: nativeResult.msg,
+      data: nativeResult.data && JSON.parse(nativeResult.data),
     }
+  }
 }
 
 // 打开下载文件
 export const openDownloadFile = (filePath: string) => {
-    return new Promise((_reject) => {
-        devicePanel.openDownloadFile(filePath)
-    })
+  return new Promise((_reject) => {
+    devicePanel.openDownloadFile(filePath)
+  })
 }
 
 export const queryDpIds = (dpIds: string, deviceId: string) => {
-    return new Promise((resolve, _reject) => {
-        devicePanel.getInitiativeQueryDpsInfoWithDpsArray(dpIds, deviceId, res => {
-            resolve(res)
-        })
+  return new Promise((resolve, _reject) => {
+    devicePanel.getInitiativeQueryDpsInfoWithDpsArray(dpIds, deviceId, res => {
+      resolve(res)
     })
+  })
 }
 
 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
+  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
+  return Platform.OS === 'android' ? devicePanel.getTimeZone() || '' : Intl.DateTimeFormat().resolvedOptions().timeZone
 }

package/src/api/nativeEventEmitter.ts

@@ -1,75 +1,75 @@
 import {EmitterSubscription, NativeEventEmitter, NativeModules} from 'react-native'
 import {
-    DeviceInfo,
-    NativeProps,
-    setGroupNativeProps,
-    setNativeProps,
-    UAGroupInfo,
+  DeviceInfo,
+  NativeProps,
+  setGroupNativeProps,
+  setNativeProps,
+  UAGroupInfo,
 } from '../models/modules/NativePropsSlice'
-import { actions } from '@models'
+import {actions} from '@models'
 
 const nativeModule = NativeModules.LDVDeviceEventEmitter
 const nativeEventEmitter = new NativeEventEmitter(nativeModule)
 
-let deviceDPListener: EmitterSubscription|null
-let groupFeatureListener: EmitterSubscription|null
+let deviceDPListener: EmitterSubscription | null
+let groupFeatureListener: EmitterSubscription | null
 
 interface GroupFeatureEvent {
-    tyGroupId: number
-    config: string
+  tyGroupId: number
+  config: string
 }
 
 interface DeviceEvent {
-    devId: string
-    dps: any
-    name: string
-    pId: string
+  devId: string
+  dps: any
+  name: string
+  pId: string
 }
 
 export const addListener = (store) => {
-    deviceDPListener = nativeEventEmitter.addListener('TYDataUpdate', (event: DeviceEvent) => {
-        // device info
-        if (event.dps && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
-            console.log('长链接刷新DP数据', event.devId, event.dps)
-            const nativeProps: NativeProps = {
-                familyName: '',
-                deviceInfo: {
-                    devId: event.devId,
-                    pId: event.pId,
-                    dps: JSON.parse(event.dps)
-                },
-                uaGroupInfo: {} as UAGroupInfo,
-            }
-            store.dispatch(setNativeProps(nativeProps))
-        }
-        // 兼容ios修改设备名称
-        if (!!event.name && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
-            store.dispatch(actions.common.devInfoChange({ ...store.getState().devInfo, name: event.name }))
-        }
-    })
+  deviceDPListener = nativeEventEmitter.addListener('TYDataUpdate', (event: DeviceEvent) => {
+    // device info
+    if (event.dps && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
+      console.log('长链接刷新DP数据', event.devId, event.dps)
+      const nativeProps: NativeProps = {
+        familyName: '',
+        deviceInfo: {
+          devId: event.devId,
+          pId: event.pId,
+          dps: JSON.parse(event.dps),
+        },
+        uaGroupInfo: {} as UAGroupInfo,
+      }
+      store.dispatch(setNativeProps(nativeProps))
+    }
+    // 兼容ios修改设备名称
+    if (!!event.name && event.devId && event.devId === store.getState().ldvModules.deviceInfo.devId) {
+      store.dispatch(actions.common.devInfoChange({...store.getState().devInfo, name: event.name}))
+    }
+  })
 
-    groupFeatureListener = nativeEventEmitter.addListener('UAGroupFeatureUpdate', (event: GroupFeatureEvent) => {
-        if (event.tyGroupId === store.getState().ldvModules.uaGroupInfo.tyGroupId) {
-            console.log('长链接刷新Group数据', event)
-            const nativeProps: NativeProps = {
-                familyName: '',
-                deviceInfo: {} as DeviceInfo,
-                uaGroupInfo: {
-                    tyGroupId: event.tyGroupId,
-                    pId: '',
-                    config: JSON.parse(event.config),
-                    dps: {}
-                },
-            }
-            store.dispatch(setGroupNativeProps(nativeProps))
-        }
-    })
+  groupFeatureListener = nativeEventEmitter.addListener('UAGroupFeatureUpdate', (event: GroupFeatureEvent) => {
+    if (event.tyGroupId === store.getState().ldvModules.uaGroupInfo.tyGroupId) {
+      console.log('长链接刷新Group数据', event)
+      const nativeProps: NativeProps = {
+        familyName: '',
+        deviceInfo: {} as DeviceInfo,
+        uaGroupInfo: {
+          tyGroupId: event.tyGroupId,
+          pId: '',
+          config: JSON.parse(event.config),
+          dps: {},
+        },
+      }
+      store.dispatch(setGroupNativeProps(nativeProps))
+    }
+  })
 }
 
 export const removeListener = () => {
-    deviceDPListener && deviceDPListener.remove()
-    deviceDPListener = null
+  deviceDPListener && deviceDPListener.remove()
+  deviceDPListener = null
 
-    groupFeatureListener && groupFeatureListener.remove()
-    groupFeatureListener = null
+  groupFeatureListener && groupFeatureListener.remove()
+  groupFeatureListener = null
 }