@ledvance/base 1.1.20 → 1.1.22

package/package.json

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

package/src/components/ColorTempAdjustView.tsx

@@ -6,6 +6,7 @@ import LdvPresetView from './ldvPresetView'
 import LdvSlider from './ldvSlider'
 import {Utils} from 'tuya-panel-kit'
 import I18n from '../i18n/index'
+import {cctToColor} from '../utils/cctUtils'
 
 const {convertX: cx} = Utils.RatioUtils
 
@@ -28,7 +29,7 @@ const ColorTempAdjustView = (props: ColorTempAdjustViewProps) => {
               <LdvColorSlider
                   type={'temperature'}
                   title={I18n.getLang('light_sources_tile_main_lighting_shade')}
-                  thumbColor={'white'}
+                  thumbColor={cctToColor(props.colorTemp)}
                   value={props.colorTemp}
                   onValueChange={props.onCCTChange}
                   onSlidingComplete={props.onCCTChangeComplete}/>

package/src/components/FanAdjustView.tsx

@@ -124,7 +124,7 @@ const FanAdjustView = (props: FanAdjustViewProps) => {
               setEnable={props.disinfectChange}
               color={''}
               colorAlpha={1}
-              title={'1'}/>
+              title={I18n.getLang('ceiling_fan_tile_uvc_fan_disinfect')}/>
           <Spacer height={cx(16)}/>
       </>}
     </Card>

package/src/components/LinearGradientLine.tsx

@@ -43,21 +43,20 @@ const LinearGradientLine = (props: LinearGradientLineProps) => {
       state.stops[`${pc}%`] = color
       pc += p
     })
-    console.log('LinearGradientLine colors', JSON.stringify(state.stops))
   }, [props.colors])
 
   return (
-    <View style={[{width, height, overflow: 'hidden'}, props.style]}>
-      <LinearGradient
+    <View style={[{ width, height, overflow: 'hidden' }, props.style]}>
+      {JSON.stringify(state.stops) !== '{}' && <LinearGradient
         gradientId="Gradient"
-        style={{width, height}}
+        style={{ width, height }}
         x1={state.x1}
         y1={state.y1}
         x2={state.x2}
         y2={state.y2}
         stops={state.stops}>
-        <Rect width={width} height={height}/>
-      </LinearGradient>
+        <Rect width={width} height={height} />
+      </LinearGradient>}
     </View>
   )
 }

package/src/components/Page.tsx

@@ -1,5 +1,5 @@
-import React, { PropsWithChildren, useCallback } from 'react'
-import { View, ViewProps } from 'react-native'
+import React, { PropsWithChildren, useCallback, useEffect } from 'react'
+import { BackHandler, View, ViewProps } from 'react-native'
 import LDVTopBar from './ldvTopBar'
 import { useNavigation } from '@react-navigation/native'
 import LdvTopName from './ldvTopName'
@@ -46,18 +46,31 @@ const Page = (props: PageProps) => {
   },
     [props.backDialogTitle, props.backDialogContent, disabled],
   )
+
+  useEffect(() => {
+    if (!!props.showBackDialog) {
+        BackHandler.addEventListener('hardwareBackPress', onBack)
+        return () => {
+            BackHandler.removeEventListener('hardwareBackPress', onBack)
+        }
+    }
+}, [props.showBackDialog, disabled])
+
   return (
     <>
-      <View style={[{ flex: 1 }, props.style]}>
+      <View style={[{ flex: 1, position: 'relative' }, props.style]}>
         <LDVTopBar
           title={props.backText}
-          onBackPress={props.onBackClick || (() => {
-            navigation.goBack()
-          })}
+          onBackPress={
+            !!props.onBackClick ? props.onBackClick :
+                !!props.showBackDialog ? onBack : (() => {
+                    navigation.goBack()
+                })
+          }
           rightButtonIcon={props.rightButtonIcon}
           onRightButtonPress={props.rightButtonIconClick}
         />
-        {props.headlineText &&
+        {(!!props.headlineText) &&
           <LdvTopName
             title={props.headlineText}
             rightIcon={props.headlineIcon}

package/src/models/modules/NativePropsSlice.tsx

@@ -12,7 +12,7 @@ export interface NativeProps {
   familyName: string
   deviceInfo: DeviceInfo
   uaGroupInfo: UAGroupInfo
-  timeSchedule?: symbol
+  timeSchedule?: boolean
   energieverbrauch?: object
 }
 
@@ -42,7 +42,7 @@ const initialState: NativeProps = {
     dps: {},
     config: {},
   },
-  timeSchedule: Symbol(),
+  timeSchedule: false,
   energieverbrauch: {},
 }
 
@@ -51,6 +51,10 @@ const productList = [
   'rcqe1i17x0vrvws7',
 ]
 
+const fanProductList = [
+  "urcqn70htlshvigb"
+]
+
 const nativePropsSlice = createSlice({
   name: 'ldvModules',
   initialState: initialState,
@@ -247,6 +251,12 @@ export function useGroupConfigFeature<GC, GCPT extends { [K in keyof GC]: GC[K]
   return [groupConfig[key] as GCPT, setGroupConfigFeature]
 }
 
+export const useFanMaxSpeed = () =>{
+  const {productId} = useDeviceInfo()
+  const maxSpeed = fanProductList.includes(productId) ? 20 : 3
+  return maxSpeed
+}
+
 export const ldvModules = nativePropsSlice.reducer
 
 export const {

package/src/res/index.ts

@@ -7,16 +7,39 @@ export default {
   ldv_timer_empty: 'timer_empty',
   ldv_right_arrow: 'arrow',
   ldv_list_select: 'list_select',
+  switch_1: 'switch_1',
+  switch_2: 'switch_2',
+  switch_3: 'switch_3',
+  switch_4: 'switch_usb',
+  ic_cancel: 'ic_cancel',
+  ic_more: 'ic_more',
+  device_panel_timer_add: require('./materialiconsOutlinedArrowsNavAddBox.png'),
+  device_panel_schedule_alert: 'device_panel_schedule_alert',
+  device_panel_schedule_add: 'device_panel_schedule_add',
+  ic_arrows_nav_clear: require('./materialiconsFilledCancel.png'),
+  ic_info: 'ic_info',
+  ic_warning_amber: require('./materialiconsOutlinedArrowsNavWarningAmber.png'),
   ic_check: 'ic_check',
-  ic_uncheck: 'ic_uncheck',
+  ic_uncheck: require('./componentsIOsButtonsButtonAdd.png'),
+  rn_ic_download: 'rn_ic_download',
+  scheduleEmpty: require('./illustrationsHomeRoutines.png'),
+  summary_icon1: require('./iconsMaterialOutlinedCalendarCalendarToday.png'),
+  summary_icon2: require('./iconsMaterialOutlinedTimeAccessTime.png'),
+  summary_icon3: require('./iconsMaterialOutlinedEditorInventory.png'),
+  energy_consumption_right: require('./iconsMaterialOutlinedArrowsNavArrowForwardIos.png'),
+  energy_consumption_chart: require('./iconsMaterialOutlinedOtherBarChart.png'),
+  energy_consumption_cash: require('./cash.png'),
+  energy_consumption_greenery: require('./iconsMaterialOutlinedOtherEnergySavingsLeaf.png'),
+  app_music_check: require('./iconsMaterialOutlinedArrowsNavCheck.png'),
+  co2Icon: require('./iconsMaterialOutlinedCommunicationInfo.png'),
+  download_icon: require('./iconsMaterialOutlinedEditorFileDownload.png'),
+  energy_consumption_empty: require('./illustrationsFeaturesLogs.png'),
   rhythm_icon1: 'rhythm_icon1',
   rhythm_icon2: 'rhythm_icon2',
   rhythm_icon3: 'rhythm_icon3',
   rhythm_icon4: 'rhythm_icon4',
   color_temperature_wheel: 'color_temperature_wheel',
   color_wheel: 'color_wheel',
-  ic_more: 'ic_more',
-  ic_cancel: 'ic_cancel',
   scene_goodnight: 'scene_goodnight',
   scene_reading: 'scene_reading',
   scene_work: 'scene_work',
@@ -27,13 +50,6 @@ export default {
   add: 'add',
   delete: 'delete',
   icon_edit_scene: 'icon_edit_scene',
-  device_panel_timer_add: require('./materialiconsOutlinedArrowsNavAddBox.png'),
-  device_panel_schedule_add: 'device_panel_schedule_add',
-  device_panel_schedule_alert: 'device_panel_schedule_alert',
-  ic_arrows_nav_clear: require('./materialiconsFilledCancel.png'),
-  ic_info: 'ic_info',
-  ic_warning_amber: 'ic_warning_amber',
-  rn_ic_download: 'rn_ic_download',
   light_on: require('./light_on.png'),
   light_off: require('./light_off.png'),
 }

package/src/utils/Support.ts

@@ -1,3 +1,4 @@
+
 // 判断是否是plug
 export const isPlug = (dpCodes: Record<string, string>) => {
   return !!dpCodes.switch_1
@@ -62,6 +63,17 @@ export const isTWLamp = (dpCodes: Record<string, string>) => {
   )
 }
 
+// 支持调节: 色温+ 温度
+export const isFanLamp = (dpCodes: Record<string, string>) => {
+  return !!(
+    !dpCodes.mix_rgbcw &&
+    !dpCodes.colour_data &&
+    dpCodes.temp_value &&
+    dpCodes.bright_value && 
+    dpCodes.fan_speed
+  )
+}
+
 // 支持调节：单一色温亮度
 export const isDIMLamp = (dpCodes: Record<string, string>) => {
   return !!(
@@ -82,4 +94,16 @@ export const isGARDOT = (dpCodes: Record<string, string>) => {
     dpCodes.countdown &&
     dpCodes.control_data
   )
+}
+
+export const isSupportColor = (dpCodes: Record<string, string>) => {
+  return !!(dpCodes.colour_data)
+}
+
+export const isSupportTemperature = (dpCodes: Record<string, string>) => {
+  return !!(dpCodes.temp_value)
+}
+
+export const isSupportBrightness = (dpCodes: Record<string, string>) => {
+  return !!(dpCodes.bright_value)
 }

package/src/utils/index.d.ts

@@ -23,3 +23,4 @@ export declare const getHSVByHex: (string: any) => {
     v: number;
 };
 export declare function mapFloatToRange(value: number, min: number, max: number): number;
+export declare function mapValueToRatio(value: number, min: number, max: number): number;

package/src/utils/index.ts

@@ -170,3 +170,7 @@ export function mapFloatToRange(value: number, min: number, max: number): number
   // 计算插值后的值
   return min + value * (max - min)
 }
+
+export function mapValueToRatio(value: number, min: number, max: number): number {
+  return ((value || 0) - min) / (max - min)
+}