@ledvance/base 1.1.91 → 1.1.93

package/package.json

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

package/src/api/native.ts

@@ -1,6 +1,6 @@
 import {NativeModules, Platform} from 'react-native'
 import {NativeResult, Result} from '../models/modules/Result'
-
+import { TYSdk } from 'tuya-panel-kit'
 interface LDVDevicePanelManager {
   back: () => void
   control: (params: any, callback: (result: any) => void) => void
@@ -363,3 +363,25 @@ export const getMicrophoneAccess: () => Promise<boolean> = () => {
       })
   })
 }
+
+export const getTuyaCloudData = (devId: string): Promise<Record<string, any>> => {
+  return new Promise((resolve, reject) => {
+    TYSdk.native.apiRNRequest(
+      {
+        a: 's.m.dev.property.get',
+        postData: {
+          devId: devId,
+          bizType: 0,
+        },
+        v: '2.0'
+      },
+      (d: string) => {
+        const data = typeof d === 'string' ? JSON.parse(d) : d;
+        resolve(data);
+      },
+      (err: string) => {
+        reject(err);
+      }
+    )
+  })
+}

package/src/components/DrawToolView.tsx

@@ -53,6 +53,9 @@ interface DrawToolViewProps extends PropsWithChildren<ViewProps> {
   hideLedNum?: boolean
   ledNum?: number
   setLedNum: (num: number) => void
+  hidLampAdjustView?: boolean
+  hideDisableLight?: boolean
+  hideColorize?: boolean
 }
 
 const DrawToolView = (props: DrawToolViewProps) => {
@@ -88,7 +91,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
     }
     return '#ffffff'
   }, [props.isColorMode, props.h, props.s])
-
+  
   return (
     <Card style={{ marginHorizontal: cx(24) }}>
       <LdvSwitch
@@ -97,109 +100,117 @@ const DrawToolView = (props: DrawToolViewProps) => {
         colorAlpha={1}
         enable={!!props.switchLed}
         showSwitch={!!props.showEnable}
-        setEnable={props.setEnable}/>
+        setEnable={props.setEnable} />
       {(props.showEnable && props.switchLed || !props.showEnable) && <>
-          <View style={styles.container}>
-              <View style={styles.adjustButtons}>
-                  <TouchableOpacity
-                      onPress={() => {
-                        props.setAdjustType(1)
-                      }}>
-                      <Image
-                          style={[styles.adjustButton, { tintColor: props.adjustType === 1 ? '#f60' : '#666' }]}
-                          source={res.ic_paint_bucket}/>
-                  </TouchableOpacity>
-                  <TouchableOpacity
-                      onPress={() => {
-                        props.setAdjustType(3)
-                      }}>
-                      <Image
-                          style={[styles.adjustButton, { tintColor: props.adjustType === 3 ? '#f60' : '#666' }]}
-                          source={res.ic_disabled_light}/>
-                  </TouchableOpacity>
-                  <TouchableOpacity
-                      onPress={() => {
-                        props.setAdjustType(2)
-                      }}>
-                      <Image
-                          style={[styles.adjustButton, { tintColor: props.adjustType === 2 ? '#f60' : '#666' }]}
-                          source={res.ic_colorize}/>
-                  </TouchableOpacity>
-                {!props.hideLedNum && <TouchableOpacity
-                    onPress={() => {
-                      state.visible = true
-                    }}
-                    style={[styles.adjustButton, {
-                      alignItems: 'center',
-                      justifyContent: 'center',
-                      backgroundColor: '#f60',
-                      borderRadius: cx(5),
-                    }]}>
-                    <Text style={{ color: '#fff', fontSize: cx(18), fontWeight: 'bold' }}>{props.ledNum || 5}</Text>
-                </TouchableOpacity>}
-              </View>
-              <StripLightView
-                  style={{ height, flex: 1 }}
-                  nodes={props.nodes}
-                  fixCount={props.fixCount || 5}
-                  stripStyle={props.stripStyle || 'WITH_BEAD'}
-                  touchingMode={props.touchingMode || 'TOUCH'}
-                  width={state.width}
-                  onLayout={onLayout}/>
+        <View style={styles.container}>
+          <View style={styles.adjustButtons}>
+            <TouchableOpacity
+              onPress={() => {
+                props.setAdjustType(1)
+              }}>
+              <Image
+                style={[styles.adjustButton, { tintColor: props.adjustType === 1 ? '#f60' : '#666' }]}
+                source={res.ic_paint_bucket} />
+            </TouchableOpacity>
+            {!props.hideDisableLight && <TouchableOpacity
+              onPress={() => {
+                props.setAdjustType(3)
+              }}>
+              <Image
+                style={[styles.adjustButton, { tintColor: props.adjustType === 3 ? '#f60' : '#666' }]}
+                source={res.ic_disabled_light} />
+            </TouchableOpacity>}
+            {!props.hideColorize && <TouchableOpacity
+              onPress={() => {
+                props.setAdjustType(2)
+              }}>
+              <Image
+                style={[styles.adjustButton, { tintColor: props.adjustType === 2 ? '#f60' : '#666' }]}
+                source={res.ic_colorize} />
+            </TouchableOpacity>}
+            {!props.hideLedNum && <TouchableOpacity
+              onPress={() => {
+                state.visible = true
+              }}
+              style={[styles.adjustButton, {
+                alignItems: 'center',
+                justifyContent: 'center',
+                backgroundColor: '#f60',
+                borderRadius: cx(5),
+              }]}>
+              <Text style={{ color: '#fff', fontSize: cx(18), fontWeight: 'bold' }}>{props.ledNum || 5}</Text>
+            </TouchableOpacity>}
           </View>
-          <LdvSwitch
-              title={I18n.getLang('add_new_dynamic_mood_lights_field_headline2_text')}
-              color={getBlockColor()}
-              colorAlpha={1}
-              enable={false}
-              showSwitch={false}
-              setEnable={() => {
-              }}/>
-          <LampAdjustView
-              isSupportColor={!!props.isSupportColor}
-              isSupportTemperature={!!props.isSupportTemperature}
-              isSupportBrightness={!!props.isSupportBrightness}
-              isColorMode={!!props.isColorMode}
-              reserveSV={true}
-              setIsColorMode={props.setIsColorMode}
-              h={props.h} s={props.s} v={props.v}
-              onHSVChange={props.onHSVChange}
-              onHSVChangeComplete={props.onHSVChangeComplete}
-              colorTemp={props.temperature}
-              brightness={props.brightness}
-              onCCTChange={props.onCCTChange}
-              onCCTChangeComplete={props.onCCTChangeComplete}
-              onBrightnessChange={props.onBrightnessChange}
-              onBrightnessChangeComplete={props.onBrightnessChangeComplete}/>
+          <StripLightView
+            style={{ height, flex: 1 }}
+            nodes={props.nodes}
+            fixCount={props.fixCount || 5}
+            stripStyle={props.stripStyle || 'WITH_BEAD'}
+            touchingMode={props.touchingMode || 'TOUCH'}
+            width={state.width}
+            onLayout={onLayout} />
+        </View>
+        <LdvSwitch
+          title={I18n.getLang('add_new_dynamic_mood_lights_field_headline2_text')}
+          color={getBlockColor()}
+          colorAlpha={1}
+          enable={false}
+          showSwitch={false}
+          setEnable={() => {
+          }} />
+        {!props.hidLampAdjustView && <LampAdjustView
+          isSupportColor={!!props.isSupportColor}
+          isSupportTemperature={!!props.isSupportTemperature}
+          isSupportBrightness={!!props.isSupportBrightness}
+          isColorMode={!!props.isColorMode}
+          reserveSV={true}
+          setIsColorMode={props.setIsColorMode}
+          h={props.h} s={props.s} v={props.v}
+          onHSVChange={props.onHSVChange}
+          onHSVChangeComplete={props.onHSVChangeComplete}
+          colorTemp={props.temperature}
+          brightness={props.brightness}
+          onCCTChange={props.onCCTChange}
+          onCCTChangeComplete={props.onCCTChangeComplete}
+          onBrightnessChange={props.onBrightnessChange}
+          onBrightnessChangeComplete={props.onBrightnessChangeComplete} />}
         {!props.hideLedNum && <Modal
-            visible={state.visible}
-            onMaskPress={() => {
-              state.visible = false
-            }}
-            alignContainer="center"
-            style={{ width: '100%', height: cx(100) }}>
-            <Card style={{ marginHorizontal: cx(24), marginTop: cx(50), alignItems: 'center' }}>
-                <Spacer/>
-                <Stepper
-                    min={5}
-                    max={48}
-                    stepValue={1}
-                    editable={true}
-                    value={state.ledNum}
-                    onValueChange={(v) => {
-                      state.ledNum = v
-                    }}/>
-                <Spacer/>
-                <DeleteButton
-                    text={I18n.getLang('auto_scan_system_wifi_confirm')}
-                    style={{ width: cx(150), height: cx(40), backgroundColor: '#f60' }}
-                    textStyle={{ fontSize: cx(14) }}
-                    onPress={() => {
-                      props.setLedNum(state.ledNum)
-                      state.visible = false
-                    }}/>
-                <Spacer/>
-            </Card>
+          visible={state.visible}
+          onMaskPress={() => {
+            state.visible = false
+          }}
+          alignContainer="center"
+          style={{ width: '100%', height: cx(150) }}>
+          <Card
+            containerStyle={{ marginHorizontal: cx(16), alignItems: 'center' }}
+            style={{ marginHorizontal: cx(16), marginTop: cx(50) }}>
+            <Spacer />
+            <Text style={{ color: '#000', fontSize: cx(14) }}>Please set the number of bulbs according to the actual number of bulbs in the lamp string</Text>
+            <Spacer height={cx(10)}/>
+            <Text style={{color: '#999'}}>Supports a maximum of 48 and a minumum of 5</Text>
+            <Spacer />
+            <Stepper
+              min={5}
+              max={48}
+              stepValue={1}
+              editable={true}
+              value={state.ledNum}
+              isRealTime={true}
+              onValueChange={(v) => {
+                state.ledNum = v
+              }} />
+            <Spacer />
+            <DeleteButton
+              text={I18n.getLang('auto_scan_system_wifi_confirm')}
+              style={{ width: cx(150), height: cx(40), backgroundColor: (state.ledNum < 5 || state.ledNum > 48) ? '#666' : '#f60' }}
+              textStyle={{ fontSize: cx(14) }}
+              onPress={() => {
+                if(state.ledNum < 5 || state.ledNum > 48) return
+                props.setLedNum(state.ledNum)
+                state.visible = false
+              }} />
+            <Spacer />
+          </Card>
         </Modal>}
         {props.children}
       </>}

package/src/components/Stepper.tsx

@@ -16,6 +16,7 @@ export interface StepperProps {
   max?: number // 99
   editable?: boolean
   selectionColor?: string
+  isRealTime?: boolean
   onValueChange?: ((value: number) => void)
   disabled?: boolean
   style?: StyleProp<ViewStyle>
@@ -44,10 +45,17 @@ const Stepper = (props: StepperProps) => {
     if(newValue[0] === '.' || 
     (newValue.length === 2 && newValue[0] === '0' && newValue[1] !== '.') || 
     newValue.split('').filter(item => item === '.').length > 1 ||
-    Number(newValue) > state.max || Number(newValue) < state.min || 
+    // Number(newValue) > state.max || Number(newValue) < state.min || 
     (idx !== -1 && newValue.length > idx + 2)){
       return
     }
+    if(props.isRealTime){
+      if (typeof v === 'string' && !v.length) {
+        props.onValueChange && props.onValueChange(0)
+      }else{
+        props.onValueChange && props.onValueChange(Number(exchangeNumber(v)))
+      }
+    }
     state.value = v
   }, [])
 

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)
 }
 

package/.temp/uaDevInfo.txt

@@ -1,51 +0,0 @@
-    @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