@ledvance/base 1.1.7 → 1.1.9

package/package.json

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

package/src/api/native.d.ts

@@ -16,6 +16,7 @@ export declare class NativeApi {
     static toDeviceSettingsPage(deviceId: string): void;
     static putJson(deviceId: string, featureType: string, json: string): Promise<Result<any>>;
     static getJson(deviceId: string, featureType: string): Promise<Result<string>>;
+    static groupControl(dps: string, config: string): Promise<Result<any>>;
 }
 export declare const openDownloadFile: (filePath: string) => Promise<unknown>;
 export declare const queryDpIds: (dpIds: string, deviceId: string) => Promise<unknown>;

package/src/api/native.ts

@@ -1,5 +1,5 @@
-import { NativeModules, Platform } from 'react-native'
-import { NativeResult, Result } from '../models/modules/Result'
+import {NativeModules, Platform} from 'react-native'
+import {NativeResult, Result} from '../models/modules/Result'
 
 interface LDVDevicePanelManager {
     back: () => void
@@ -15,7 +15,7 @@ interface LDVDevicePanelManager {
     openDownloadFile: (filePath: string) => void
     formatNumber: (num: number, fixed: number) => string
     getTimeZone: () => string
-
+    groupControl: (dps: string, config: string) => Promise<NativeResult<any>>
 }
 
 const devicePanel: LDVDevicePanelManager = NativeModules.LDVDevicePanelManager
@@ -213,8 +213,16 @@ export class NativeApi {
             })
         })
     }
-}
 
+    static async groupControl(dps: string, config: string): Promise<Result<any>> {
+        const nativeResult = await devicePanel.groupControl(dps, config)
+        return {
+            success: nativeResult.result,
+            msg: nativeResult.msg,
+            data: nativeResult.data
+        }
+    }
+}
 
 // 打开下载文件
 export const openDownloadFile = (filePath: string) => {

package/src/models/modules/NativePropsSlice.d.ts

@@ -34,7 +34,16 @@ declare const useTimeSchedule: () => [v: symbol | undefined, f: any];
 declare const useEnergieverbrauch: () => (object | undefined)[];
 export declare const useEngergyGeneration: () => boolean;
 export declare function useUAGroupInfo(): UAGroupInfo;
-export declare function useGroupConfig<T>(): T;
+export declare function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Promise<Result<any>>];
+/**
+ * @template GC GroupConfig
+ * @template GCPT GroupConfigPropertyType
+ * @param key
+ * @param extraDps
+ */
+export declare function useGroupConfigFeature<GC, GCPT extends {
+    [K in keyof GC]: GC[K];
+}[keyof GC]>(key: keyof GC, extraDps?: any): [GCPT, (value: GCPT) => Promise<Result<any>>];
 export declare const ldvModules: import("@reduxjs/toolkit").Reducer<NativeProps, import("@reduxjs/toolkit").AnyAction>;
 export declare const setNativeProps: import("@reduxjs/toolkit").ActionCreatorWithPayload<NativeProps, string>, setGroupNativeProps: import("@reduxjs/toolkit").ActionCreatorWithPayload<NativeProps, string>, setDps: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setTimeSchedule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setEnergieverbrauch: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
 export { simpleSetDps, simpleSetDp, useDeviceId, useDeviceInfo, useDp, useDps, useFamilyName, useTimeSchedule, useEnergieverbrauch, };

package/src/models/modules/NativePropsSlice.tsx

@@ -5,6 +5,8 @@ import {DpsResult, Result} from './Result'
 import {DevInfo, DpValue} from 'tuya-panel-kit'
 import {NativeApi} from '../../api/native'
 import {useDispatch} from 'react-redux'
+import {GlobalParams} from '../GlobalParams'
+import {camelCase} from 'lodash'
 
 export interface NativeProps {
     familyName: string
@@ -74,6 +76,9 @@ const nativePropsSlice = createSlice({
             state.uaGroupInfo.dps = {...state.uaGroupInfo.dps, ...action.payload.uaGroupInfo.dps}
             state.uaGroupInfo.config = action.payload.uaGroupInfo.config
         },
+        setGroupConfig: (state, action: PayloadAction<any>) => {
+            state.uaGroupInfo.config = action.payload
+        },
         setDps(state, action: PayloadAction<any>) {
             const dpKeys = Object.keys(action.payload)
             dpKeys.forEach(dp => {
@@ -193,8 +198,44 @@ export function useUAGroupInfo(): UAGroupInfo {
     return useSelector(state => state.ldvModules.uaGroupInfo)
 }
 
-export function useGroupConfig<T>(): T {
-    return useUAGroupInfo().config as T
+export function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Promise<Result<any>>] {
+    const config = useUAGroupInfo().config as T
+    const dispatch = useDispatch()
+    const {setGroupConfig} = nativePropsSlice.actions
+    const setConfig = useCallback(async (dps: any, newConfig: T) => {
+        // 发送控制命令
+        const res = await NativeApi.groupControl(JSON.stringify(dps), JSON.stringify(newConfig))
+        if (res.success) {
+            // 只在结果成功时才改变 redux 数据
+            dispatch(setGroupConfig(newConfig))
+        }
+        return res
+    }, [])
+    return [config, setConfig]
+}
+
+/**
+ * @template GC GroupConfig
+ * @template GCPT GroupConfigPropertyType
+ * @param key
+ * @param extraDps
+ */
+export function useGroupConfigFeature<GC, GCPT extends { [K in keyof GC]: GC[K] }[keyof GC]>
+(key: keyof GC, extraDps: any = {}): [GCPT, (value: GCPT) => Promise<Result<any>>] {
+    const [groupConfig, setGroupConfig] = useGroupConfig<GC>()
+    const setGroupConfigFeature = async (value: GCPT) => {
+        return await setGroupConfig(
+          {
+              [GlobalParams.dpSchemaMap[camelCase(key as string)].dp]: value,
+              ...extraDps,
+          },
+          {
+              ...groupConfig,
+              [key]: value,
+          },
+        )
+    }
+    return [groupConfig[key] as GCPT, setGroupConfigFeature]
 }
 
 export const ldvModules = nativePropsSlice.reducer