@ledvance/base 1.2.2 → 1.2.4

package/.temp/uaDevInfo.txt

@@ -0,0 +1,51 @@
+    @ColumnInfo(name = "device_id")
+    val deviceId: String,
+    @ColumnInfo(name = "device_name")
+    val deviceName: String,
+    @ColumnInfo(name = "cat_id")
+    val catId: String,
+    @ColumnInfo(name = "channel_no")
+    val channelNo: Int,
+    @ColumnInfo(name = "device_category")
+    val deviceCategory: String,
+    @ColumnInfo(name = "device_image")
+    val deviceImage: String,
+    @ColumnInfo(name = "tuya_device_id")
+    val tuyaDeviceId: String,
+    // deviceType 对应 ProductInfo 的 productId
+    @ColumnInfo(name = "device_type")
+    val deviceType: String,
+    @ColumnInfo(name = "offline_time")
+    val offlineTime: String,
+    @ColumnInfo(name = "rn_package")
+    val rnPackage: String?,
+    @ColumnInfo(name = "status")
+    val status: Int,
+    @ColumnInfo(name = "create_time")
+    val createTime: String,
+    @ColumnInfo(name = "version")
+    val version: String,
+    @ColumnInfo(name = "user_id")
+    val userId: String,
+    @ColumnInfo(name = "family_id")
+    val familyId: Long,
+    @ColumnInfo(name = "room_id")
+    val roomId: Long,
+    @ColumnInfo(name = "room_name")
+    val roomName: String,
+    @ColumnInfo(name = "is_shared")
+    val isShared: Int,
+    @ColumnInfo(name = "local_index")
+    val localIndex: String,
+    @ColumnInfo(name = "resource_category")
+    val resourceCategory: String,
+    @ColumnInfo(name = "resource_id")
+    val resourceId: String,
+    @ColumnInfo(name = "resource_identifier")
+    val resourceIdentifier: String,
+    @ColumnInfo(name = "resource_type")
+    val resourceType: Int,
+    @ColumnInfo(name = "index")
+    val index: Int = 0,
+    @ColumnInfo(name = "switch_state")
+    val switchState: Boolean = true

package/package.json

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

package/src/api/native.d.ts

@@ -54,6 +54,7 @@ export declare class NativeApi {
     static toDeviceSettingsPage(deviceId: string, isGroup?: boolean): void;
     static toRoutinesPage(params: {
         backTitle: string;
+        deviceId: string;
     }): void;
     static putJson(deviceId: string, featureType: string, json: string): Promise<Result<any>>;
     static getJson(deviceId: string, featureType: string): Promise<Result<any>>;

package/src/components/Stepper.d.ts

@@ -8,6 +8,7 @@ export interface StepperProps {
     editable?: boolean;
     selectionColor?: string;
     isRealTime?: boolean;
+    isBeyond?: boolean;
     onValueChange?: ((value: number) => void);
     disabled?: boolean;
     style?: StyleProp<ViewStyle>;

package/src/i18n/strings.d.ts

@@ -473,6 +473,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -1016,6 +1017,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -1559,6 +1561,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -2102,6 +2105,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -2645,6 +2649,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -3188,6 +3193,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -3731,6 +3737,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -4274,6 +4281,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -4817,6 +4825,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -5360,6 +5369,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -5903,6 +5913,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -6446,6 +6457,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -6989,6 +7001,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -7532,6 +7545,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -8075,6 +8089,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -8618,6 +8633,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -9161,6 +9177,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -9704,6 +9721,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -10247,6 +10265,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -10790,6 +10809,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -11333,6 +11353,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -11876,6 +11897,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -12419,6 +12441,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -12962,6 +12985,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -13505,6 +13529,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -14048,6 +14073,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -14591,6 +14617,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -15134,6 +15161,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;
@@ -15677,6 +15705,7 @@ declare const _default: {
         string_lights_modes_blink_text: string;
         string_lights_modes_chase_text: string;
         string_lights_modes_dazzle_text: string;
+        devicemusic_devicemic_description_text: string;
         strip_lights_modes_magic_rebound_text: string;
         strip_lights_modes_magic_meteor: string;
         string_lights_set_bulbs_title: string;

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

@@ -1,6 +1,7 @@
 import { Dispatch } from 'react';
 import { DpsResult, Result } from './Result';
 import { DevInfo, DpValue } from 'tuya-panel-kit';
+import { PropertyValueTypes } from '../../utils/TypeUtils';
 export interface NativeProps {
     familyName: string;
     role: 0 | 1 | 2 | 3;
@@ -8,6 +9,7 @@ export interface NativeProps {
     uaGroupInfo: UAGroupInfo;
     timeSchedule?: boolean;
     energieverbrauch?: object;
+    moods: any[];
 }
 export interface DeviceInfo {
     devId: string;
@@ -37,6 +39,7 @@ interface DpState {
 }
 declare const useDeviceInfo: () => DevInfo<DpState>;
 declare const useTimeSchedule: () => [v: boolean | undefined, f: any];
+declare const useMoods: () => [any[], (v: any[]) => void];
 declare const useEnergieverbrauch: () => (object | undefined)[];
 export declare const useEngergyGeneration: () => boolean;
 export declare function useUAGroupInfo(): UAGroupInfo;
@@ -47,11 +50,10 @@ export declare function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Pro
  * @param key
  * @param dpKey
  */
-export declare function useGroupConfigFeature<GC, GCPT extends {
-    [K in keyof GC]: GC[K];
-}[keyof GC]>(key: keyof GC, dpKey?: string): [GCPT | undefined, (value: GCPT, dpValue: any, extraDps?: any, extraConfig?: any) => Promise<Result<any>>];
+export declare function useGroupConfigFeature<GC, GCPT extends PropertyValueTypes<GC>>(key: keyof GC, dpKey?: string): [GCPT | undefined, (value: GCPT, dpValue: any, extraDps?: any, extraConfig?: any) => Promise<Result<any>>];
+export declare function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(featureKey: keyof GC, defValue: T, valueMapToDpValue?: (v: T) => any, getExtraDps?: (v: T) => any, getExtraConfig?: (v: T) => any): [T, (value: T) => 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>;
 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 { asyncSetDps, simpleSetDps, simpleSetDp, useDeviceId, useDeviceInfo, useDp, useScaledDp, useDps, useFamilyName, useRole, useTimeSchedule, useEnergieverbrauch, };
+export { asyncSetDps, simpleSetDps, simpleSetDp, useDeviceId, useDeviceInfo, useDp, useScaledDp, useDps, useFamilyName, useRole, useTimeSchedule, useMoods, useEnergieverbrauch, };

package/src/models/modules/NativePropsSlice.tsx

@@ -7,6 +7,7 @@ import { NativeApi } from '../../api/native'
 import { useDispatch } from 'react-redux'
 import { GlobalParams } from '../GlobalParams'
 import { isNumber, snakeCase } from 'lodash'
+import { PropertyValueTypes } from '../../utils/TypeUtils'
 
 export interface NativeProps {
   familyName: string
@@ -47,7 +48,7 @@ const initialState: NativeProps = {
   },
   timeSchedule: false,
   energieverbrauch: {},
-  moods: []
+  moods: [],
 }
 
 // energy generation
@@ -104,7 +105,7 @@ const nativePropsSlice = createSlice({
     },
     setMoods(state, action: PayloadAction<any>) {
       state.moods = action.payload
-    }
+    },
   },
 })
 
@@ -206,7 +207,7 @@ const useTimeSchedule = (): [v: boolean | undefined, f: any] => {
   return [dps, setTimeScheduleFn]
 }
 
-const useMoods = (): [any[], (v:any[]) => void] =>{
+const useMoods = (): [any[], (v: any[]) => void] => {
   const dps = useSelector(store => store.ldvModules.moods)
   const dispatch = useDispatch()
   const setTimeScheduleFn = (value: any[]) => {
@@ -256,7 +257,7 @@ export function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Promise<Res
  * @param key
  * @param dpKey
  */
-export function useGroupConfigFeature<GC, GCPT extends { [K in keyof GC]: GC[K] }[keyof GC]>
+export function useGroupConfigFeature<GC, GCPT extends PropertyValueTypes<GC>>
 (key: keyof GC, dpKey?: string): [GCPT | undefined, (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, extraConfig?: any) => {
@@ -275,6 +276,23 @@ export function useGroupConfigFeature<GC, GCPT extends { [K in keyof GC]: GC[K]
   return [groupConfig[key] as (GCPT | undefined), setGroupConfigFeature]
 }
 
+export function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(
+  featureKey: keyof GC,
+  defValue: T,
+  valueMapToDpValue?: (v: T) => any,
+  getExtraDps?: (v: T) => any,
+  getExtraConfig?: (v: T) => any,
+): [T, (value: T) => Promise<Result<any>>] {
+  const [featureHook, setFH] = useGroupConfigFeature<GC, T>(featureKey)
+  const setFeatureHook = useCallback(async (value: T) => {
+    const dpValue = valueMapToDpValue ? valueMapToDpValue(value) : value
+    const extraDps = getExtraDps ? getExtraDps(value) : undefined
+    const extraConfig = getExtraConfig ? getExtraConfig(value) : undefined
+    return await setFH(value, dpValue, extraDps, extraConfig)
+  }, [setFH])
+  return [featureHook || defValue, setFeatureHook]
+}
+
 export const useFanMaxSpeed = () => {
   const { productId } = useDeviceInfo()
   return fanProductList.includes(productId) ? 20 : 3

package/src/utils/TypeUtils.d.ts

@@ -0,0 +1,3 @@
+export declare type PropertyValueTypes<T> = {
+    [K in keyof T]: T[K];
+}[keyof T];

package/src/utils/TypeUtils.ts

@@ -0,0 +1 @@
+export type PropertyValueTypes<T> = { [K in keyof T]: T[K] }[keyof T]