@ledvance/base 1.1.90 → 1.1.92

package/package.json

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

package/src/components/StripLightView.tsx

@@ -1,5 +1,5 @@
 import { requireNativeComponent, ViewProps } from 'react-native'
-import React from 'react-redux/node_modules/@types/react'
+import React from 'react'
 
 const NativeStripLightView = requireNativeComponent('StripLightView')
 

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

@@ -49,7 +49,7 @@ export declare function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Pro
  */
 export declare function useGroupConfigFeature<GC, GCPT extends {
     [K in keyof GC]: GC[K];
-}[keyof GC]>(key: keyof GC, dpKey?: string): [GCPT, (value: GCPT, dpValue: any, extraDps?: any) => Promise<Result<any>>];
+}[keyof GC]>(key: keyof GC, dpKey?: string): [GCPT, (value: GCPT, dpValue: any, extraDps?: any, extraConfig?: any) => Promise<Result<any>>];
 export declare const useFanMaxSpeed: () => 3 | 20;
 export declare const isUVCFanDevice: () => boolean;
 export declare const ldvModules: import("@reduxjs/toolkit").Reducer<NativeProps, import("@reduxjs/toolkit").AnyAction>;

package/src/models/modules/NativePropsSlice.tsx

@@ -1,12 +1,12 @@
-import {createSlice, PayloadAction} from '@reduxjs/toolkit'
-import {useSelector} from '../index'
-import {Dispatch, useCallback} from 'react'
-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 {isNumber, snakeCase} from 'lodash'
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { useSelector } from '../index'
+import { Dispatch, useCallback } from 'react'
+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 { isNumber, snakeCase } from 'lodash'
 
 export interface NativeProps {
   familyName: string
@@ -72,7 +72,7 @@ const nativePropsSlice = createSlice({
       if (!!action.payload.deviceInfo.pId) {
         state.deviceInfo.pId = action.payload.deviceInfo.pId
       }
-      state.deviceInfo.dps = {...state.deviceInfo.dps, ...action.payload.deviceInfo.dps}
+      state.deviceInfo.dps = { ...state.deviceInfo.dps, ...action.payload.deviceInfo.dps }
     },
     setGroupNativeProps: (state, action: PayloadAction<NativeProps>) => {
       state.uaGroupInfo.tyGroupId = action.payload.uaGroupInfo.tyGroupId
@@ -82,7 +82,7 @@ const nativePropsSlice = createSlice({
       if (!!action.payload.uaGroupInfo.pId) {
         state.uaGroupInfo.pId = action.payload.uaGroupInfo.pId
       }
-      state.uaGroupInfo.dps = {...state.uaGroupInfo.dps, ...action.payload.uaGroupInfo.dps}
+      state.uaGroupInfo.dps = { ...state.uaGroupInfo.dps, ...action.payload.uaGroupInfo.dps }
       state.uaGroupInfo.config = action.payload.uaGroupInfo.config
     },
     setGroupConfig: (state, action: PayloadAction<any>) => {
@@ -124,12 +124,12 @@ function simpleSetDps<T>(dispatch: Dispatch<any>): (deviceId: string, dps: any)
       const res = await NativeApi.setDps(deviceId, dps)
       if (res.result) {
         return {
-          result: {success: true},
+          result: { success: true },
           dps: dps,
         }
       }
       return {
-        result: {success: false, msg: res.msg},
+        result: { success: false, msg: res.msg },
       }
     })
   }
@@ -138,7 +138,7 @@ function simpleSetDps<T>(dispatch: Dispatch<any>): (deviceId: string, dps: any)
 function simpleSetDp<T>(dispatch: Dispatch<any>): (deviceId: string, dp: string, value: any) => Promise<Result<T>> {
   return (deviceId, dp, value) => {
     const fun = simpleSetDps<T>(dispatch)
-    return fun(deviceId, {[dp]: value})
+    return fun(deviceId, { [dp]: value })
   }
 }
 
@@ -211,7 +211,7 @@ const useEnergieverbrauch = () => {
 }
 
 export const useEngergyGeneration = () => {
-  const {productId} = useDeviceInfo()
+  const { productId } = useDeviceInfo()
   return productList.some(val => val === productId)
 }
 
@@ -223,7 +223,7 @@ export function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Promise<Res
   const tyGroupId = useUAGroupInfo().tyGroupId
   const config = useUAGroupInfo().config as T
   const dispatch = useDispatch()
-  const {setGroupConfig} = nativePropsSlice.actions
+  const { setGroupConfig } = nativePropsSlice.actions
   const setConfig = useCallback(async (dps: any, newConfig: T) => {
     // 发送控制命令
     const res = await NativeApi.groupControl(tyGroupId, JSON.stringify(dps), JSON.stringify(newConfig))
@@ -243,9 +243,9 @@ export function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Promise<Res
  * @param dpKey
  */
 export function useGroupConfigFeature<GC, GCPT extends { [K in keyof GC]: GC[K] }[keyof GC]>
-(key: keyof GC, dpKey?: string): [GCPT, (value: GCPT, dpValue: any, extraDps?: any) => Promise<Result<any>>] {
+(key: keyof GC, dpKey?: string): [GCPT, (value: GCPT, dpValue: any, extraDps?: any, extraConfig?: any) => Promise<Result<any>>] {
   const [groupConfig, setGroupConfig] = useGroupConfig<GC>()
-  const setGroupConfigFeature = async (value: GCPT, dpValue: any, extraDps?: any) => {
+  const setGroupConfigFeature = async (value: GCPT, dpValue: any, extraDps?: any, extraConfig?: any) => {
     return await setGroupConfig(
       {
         [!!dpKey ? dpKey : GlobalParams.dpSchemaMap[snakeCase(key as string)].dp]: dpValue,
@@ -253,6 +253,7 @@ export function useGroupConfigFeature<GC, GCPT extends { [K in keyof GC]: GC[K]
       },
       {
         ...groupConfig,
+        ...(extraConfig || {}),
         [key]: value,
       },
     )
@@ -261,12 +262,12 @@ export function useGroupConfigFeature<GC, GCPT extends { [K in keyof GC]: GC[K]
 }
 
 export const useFanMaxSpeed = () => {
-  const {productId} = useDeviceInfo()
+  const { productId } = useDeviceInfo()
   return fanProductList.includes(productId) ? 20 : 3
 }
 
-export const isUVCFanDevice = () =>{
-  const {productId} = useDeviceInfo()
+export const isUVCFanDevice = () => {
+  const { productId } = useDeviceInfo()
   return fanProductList.includes(productId)
 }