@ledvance/group-ui-biz-bundle 1.0.130 → 1.0.132

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/group-ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.0.130",
+  "version": "1.0.132",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/energyConsumption/EnergyConsumptionCard.tsx

@@ -0,0 +1,249 @@
+import { DeviceInfo, NativeApi, queryDpIds } from '@ledvance/base/src/api/native'
+import Card from '@ledvance/base/src/components/Card'
+import Spacer from '@ledvance/base/src/components/Spacer'
+import ThemeType from '@ledvance/base/src/config/themeType'
+import I18n from '@ledvance/base/src/i18n'
+import { useGroupDevices, useUAGroupInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { xLog } from '@ledvance/base/src/utils'
+import { localeNumber } from '@ledvance/base/src/utils/common'
+import { useIsFocused, useNavigation } from '@react-navigation/native'
+import { useReactive, useUpdateEffect } from 'ahooks'
+import React, { useEffect, useMemo, useRef } from 'react'
+import { Image, StyleSheet, Text, View } from 'react-native'
+import { Utils } from 'tuya-panel-kit'
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import { getEnergyGenerationValue, } from './EnergyConsumptionActions'
+import { EnergyConsumptionPageProps } from './EnergyConsumptionPage'
+import Res from './res'
+
+const { convertX: cx } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
+
+export interface EnergyConsumptionProp {
+  theme?: ThemeType
+  electricDpCode: string
+  powerDpCode: string
+  addEleDpCode: string
+}
+
+const SolarPlugPid = 'rcqe1i17x0vrvws7'
+
+const EnergyConsumptionCard = (props: EnergyConsumptionProp) => {
+  const navigation = useNavigation()
+  const isFocused = useIsFocused()
+  const uaGroupInfo = useUAGroupInfo()
+  const [groupDevices] = useGroupDevices()
+  const updateEnergy: any = useRef()
+
+  const state = useReactive({
+    solarPowerSum: 0,
+    solarCurrentSum: 0,
+    wifiPowerSum: 0,
+    wifiCurrentSum: 0,
+    totalPowerSum: 0,
+    totalCurrentSum: 0,
+    loading: false,
+    generationCache: {}
+  })
+
+  useEffect(() => {
+    if (groupDevices && groupDevices.length) {
+      getEnergyConsumption(groupDevices).then()
+    }
+  }, [groupDevices])
+
+  const isOnlyGeneration = useMemo(() => groupDevices.every(device => state.generationCache[device.tuyaDeviceId]), [groupDevices, JSON.stringify(state.generationCache)])
+  const hasGeneration = useMemo(() => groupDevices.some(device => state.generationCache[device.tuyaDeviceId]), [groupDevices, JSON.stringify(state.generationCache)])
+
+  useEffect(() => {
+    if (isFocused) {
+      updateEnergy.current = setInterval(() => {
+        xLog('setInterval========')
+        groupDevices.forEach(item => {
+          const jsonData = JSON.stringify([props.electricDpCode, props.powerDpCode])
+          queryDpIds(jsonData, item.tuyaDeviceId).then()
+        })
+        NativeApi.getGroupDevices(uaGroupInfo.tyGroupId).then(res => {
+          if (res.success && res.data) {
+            getEnergyConsumption(res.data).then()
+          }
+        })
+      }, 10000)
+    }
+
+    return () => clearInterval(updateEnergy.current)
+  }, [isFocused, groupDevices.length])
+
+  const isGenerationFromCache = async (tyPid: string, deviceId: string) => {
+    const cache = state.generationCache[deviceId]
+    if (cache !== undefined) {
+      return cache
+    }
+    const data = await getEnergyGenerationValue(deviceId)
+    const generationMode = data?.generationMode || false
+    const isGeneration = (tyPid === SolarPlugPid) !== generationMode
+    state.generationCache[deviceId] = isGeneration
+    return isGeneration
+  }
+
+  const getEnergyConsumption = async (groupDevices: DeviceInfo[]) => {
+    let power = 0
+    let current = 0
+    let solarPower = 0
+    let solarCurrent = 0
+    const powerDp = props.powerDpCode
+    const currentDp = props.electricDpCode
+
+    for (const device of groupDevices) {
+      if (device.dps) {
+        const isSolarDevice = await isGenerationFromCache(device.tyPid, device.tuyaDeviceId)
+        const dps = JSON.parse(device.dps)
+        if (isSolarDevice) {
+          solarPower += dps[powerDp] ?? 0
+          solarCurrent += dps[currentDp] ?? 0
+        } else {
+          power += dps[powerDp] ?? 0
+          current += dps[currentDp] ?? 0
+        }
+      }
+    }
+    state.wifiCurrentSum = current
+    state.wifiPowerSum = power / 10
+    state.solarCurrentSum = solarCurrent
+    state.solarPowerSum = solarPower / 10
+  }
+
+  useUpdateEffect(() => {
+    if (hasGeneration) {
+      if (isOnlyGeneration) {
+        state.totalCurrentSum = state.solarCurrentSum
+        state.totalPowerSum = state.solarPowerSum
+      } else {
+        state.totalCurrentSum = state.wifiCurrentSum - state.solarCurrentSum
+        state.totalPowerSum = state.wifiPowerSum - state.solarPowerSum
+      }
+    } else {
+      state.totalCurrentSum = state.wifiCurrentSum
+      state.totalPowerSum = state.wifiPowerSum
+    }
+  }, [state.solarCurrentSum, state.solarPowerSum, state.wifiCurrentSum, state.wifiPowerSum, isOnlyGeneration, hasGeneration])
+
+  const energyText = useMemo(() => {
+    return I18n.getLang(isOnlyGeneration ? 'sockets_headline_power' : !hasGeneration ? 'sockets_ce' : 'group_energytotal')
+  }, [hasGeneration, isOnlyGeneration])
+
+  const unitDivision = (str: string) => {
+    if (!str) {
+      return ['', '']
+    }
+    const strIndex = str.indexOf('(') || str.indexOf('（')
+    const unit = str.substring(strIndex)
+    const name = str.split(unit)[0]
+    return [name, unit]
+  }
+
+  const styles = StyleSheet.create({
+    consumedEnergyCard: {
+      marginHorizontal: cx(24),
+    },
+    consumedEnergyHeadline: {
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+      alignItems: 'center',
+      marginHorizontal: cx(16),
+    },
+    consumedEnergyCardTitle: {
+      color: props.theme?.global.fontColor,
+      fontSize: cx(16),
+      // fontFamily: 'helvetica_neue_lt_std_bd',
+      fontWeight: 'bold',
+    },
+    consumedEnergyContent: {
+      flexDirection: 'row',
+    },
+    consumedEnergyItem: {
+      flex: 1,
+      alignItems: 'center',
+    },
+    consumedEnergyItemValue: {
+      color: props.theme?.global.secondBrand,
+      fontSize: cx(24),
+      // fontFamily: 'helvetica_neue_lt_std_bd',
+      fontWeight: 'bold',
+    },
+    consumedEnergyItemUnit: {
+      color: props.theme?.global.secondFontColor,
+      fontSize: cx(14),
+      fontFamily: 'helvetica_neue_lt_std_roman',
+      textAlign: 'center'
+    },
+    subContent: {
+      flex: 1,
+      alignItems: 'center',
+      marginBottom: cx(9)
+    },
+    valueText: {
+      fontSize: cx(24),
+      fontWeight: 'bold',
+      color: props.theme?.global.secondBrand,
+    },
+    titleText: {
+      fontFamily: 'helvetica_neue_lt_std_roman',
+      fontSize: cx(14),
+      color: props.theme?.global.secondFontColor,
+      textAlign: 'center',
+    },
+    unitText: {
+      fontFamily: 'helvetica_neue_lt_std_roman',
+      fontSize: cx(14),
+      color: props.theme?.global.secondFontColor,
+    },
+  })
+
+  const ConsumedEnergyItem = (props: { value: number, unit: string }) => {
+    return (
+      <View style={styles.subContent}>
+        <Text style={styles.valueText}>{(props.value) || 0}</Text>
+        <Spacer height={cx(4)}/>
+        <Text style={styles.titleText}>
+          {unitDivision(props.unit)[0]}
+        </Text>
+        <Text style={styles.titleText}>
+          {unitDivision(props.unit)[1]}
+        </Text>
+      </View>
+    )
+  }
+
+  return <Card
+    style={styles.consumedEnergyCard}
+    onPress={() => navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption, {
+      solarCurrentSum: state.solarCurrentSum,
+      solarPowerSum: state.solarPowerSum,
+      wifiCurrentSum: state.wifiCurrentSum,
+      wifiPowerSum: state.wifiPowerSum,
+      solarPlugGroup: groupDevices.filter(device => state.generationCache[device.tuyaDeviceId]).map(d => d.tuyaDeviceId),
+      wifiPlugGroup: groupDevices.filter(device => !state.generationCache[device.tuyaDeviceId]).map(d => d.tuyaDeviceId),
+      addEleDpCode: props.addEleDpCode,
+      backText: energyText
+    } as EnergyConsumptionPageProps)}>
+    <Spacer height={cx(16)}/>
+    <View style={styles.consumedEnergyHeadline}>
+      <Text
+        style={styles.consumedEnergyCardTitle}>{energyText}</Text>
+      <Image source={Res.energyChart} style={{ width: cx(24), height: cx(24), tintColor: props.theme?.icon.normal }}/>
+    </View>
+    <Spacer height={cx(18)}/>
+    <View style={styles.consumedEnergyContent}>
+      <ConsumedEnergyItem
+        value={localeNumber(state.totalPowerSum)}
+        unit={I18n.getLang('consumption_data_field2_value_text1')}/>
+      <ConsumedEnergyItem
+        value={localeNumber(state.totalCurrentSum)}
+        unit={I18n.getLang('consumption_data_field2_value_text2')}/>
+    </View>
+    <Spacer height={cx(17)}/>
+  </Card>
+}
+
+export default withTheme(EnergyConsumptionCard)

package/src/modules/energyConsumption/EnergyConsumptionPage.tsx

@@ -346,7 +346,20 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
             <Spacer height={cx(10)} />
           </Card>
           <Spacer />
-          <Card style={styles.cardContainer}>
+          <Card
+            style={styles.cardContainer}
+            onPress={() => {
+              navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption_chart, {
+                headlineText: chartHeadline,
+                chartData: state.isSolarMode ? state.solarOverviewList : state.wifiOverviewList,
+                price: state.price,
+                unit: state.unit,
+                addEleDpCode: params.addEleDpCode,
+                date: (new Date()).getFullYear().toString(),
+                deviceIdGroup: state.isSolarMode ? params.solarPlugGroup : params.wifiPlugGroup,
+              } as EnergyConsumptionChartProps)
+            }}
+          >
             <Text style={styles.cardTitle}>
               {I18n.getLang('consumption_data_field2_headline_text')}
             </Text>

package/src/modules/energyConsumption/component/NewBarChart.tsx

@@ -1,180 +1,182 @@
-import React, {useMemo, useRef} from 'react';
-import {View} from 'react-native';
-import ECharts from '@ledvance/react-native-echarts-pro';
-import I18n from "@ledvance/base/src/i18n";
-import ThemeType from "@ledvance/base/src/config/themeType";
-import {Utils} from "tuya-panel-kit";
-import {OverviewItem} from "../EnergyConsumptionPage";
+import ThemeType from '@ledvance/base/src/config/themeType'
+import I18n from '@ledvance/base/src/i18n'
+import ECharts from '@ledvance/react-native-echarts-pro'
+import React, { useMemo, useRef } from 'react'
+import { View } from 'react-native'
+import { Utils } from 'tuya-panel-kit'
+import { OverviewItem } from '../EnergyConsumptionPage'
 
-const {withTheme} = Utils.ThemeUtils
-const cx = Utils.RatioUtils.convertX;
+const { withTheme } = Utils.ThemeUtils
+const cx = Utils.RatioUtils.convertX
 
 interface BarChartProps {
-    theme?: ThemeType
-    data: OverviewItem[],
-    price: number,
-    unit: string,
-    height: number
+  theme?: ThemeType
+  data: OverviewItem[],
+  price: number,
+  unit: string,
+  height: number
 }
 
 const BarChartWithTouch = (props: BarChartProps) => {
-    const echarts = useRef();
-    const {data, height, price, unit, theme} = props;
-    const dataX = data?.map(item => {
-        return item.chartTitle;
-    });
-    const dataKwhY = data?.map(item => {
-        return Number(item.value);
-    });
-    const dataPriceY = data?.map(item => {
-        return ((isNaN(Number(item.value)) ? 0 : Number(item.value)) * price).toFixed(2);
-    });
-    const maxValue = useMemo(() => {
-        let max = Math.max(...dataKwhY)
-        if (max < 0.1) {
-            max += 0.02
-            max = max - (max % 0.02)
-        } else if (max < 1) {
-            max += 0.2
-            max = max - (max % 0.2)
-        } else if (max < 10) {
-            max = Math.ceil(max) + 2
-            max = max - (max % 2)
-        }
-        return max
-    }, [dataKwhY]);
-    const gridRight = useMemo(() => {
-        const max = Math.max(...dataPriceY.map(it => Number(it)))
-        return max > 999 ? '15%' : '10%'
-    }, [dataPriceY])
-    const option = {
-        tooltip: {
-            show: true,
-            triggerOn: 'click',
-            trigger: 'axis',
+  const echarts = useRef()
+  const { data, height, price, unit, theme } = props
+  const dataX = data?.map(item => {
+    return item.chartTitle
+  })
+  const dataKwhY = data?.map(item => {
+    return Number(item.value)
+  })
+  const dataPriceY = data?.map(item => {
+    return ((isNaN(Number(item.value)) ? 0 : Number(item.value)) * price).toFixed(2)
+  })
+  const maxValue = useMemo(() => {
+    let max = Math.max(...dataKwhY)
+    if (max < 0.1) {
+      max += 0.02
+      max = max - (max % 0.02)
+    } else if (max < 1) {
+      max += 0.2
+      max = max - (max % 0.2)
+    } else if (max < 10) {
+      max = Math.ceil(max) + 2
+      max = max - (max % 2)
+    }
+    return max
+  }, [dataKwhY])
+  const gridRight = useMemo(() => {
+    const max = Math.max(...dataPriceY.map(it => Number(it)))
+    return max > 999 ? '15%' : '10%'
+  }, [dataPriceY])
+  const option = {
+    tooltip: {
+      show: true,
+      triggerOn: 'click',
+      trigger: 'axis',
+    },
+    legend: {
+      show: true,
+      data: ['kWh', unit],
+      textStyle: {
+        color: theme?.global.fontColor,
+      }
+    },
+    grid: {
+      right: gridRight,
+    },
+    xAxis: {
+      data: dataX,
+      axisTick: {
+        show: false,
+      },
+      axisLabel: {
+        show: true,
+        color: props.theme?.global.secondFontColor,
+        interval: 'auto',
+        rotate: 45,
+        align: 'right',
+        verticalAlign: 'top'
+      }
+    },
+    yAxis: [{
+      type: 'value',
+      name: I18n.getLang('consumption_data_annual_bar_chart_text'),
+      max: Math.max(maxValue, 0.02),
+      min: 0,
+      position: 'left',
+      axisLabel: {
+        formatter: function (value) {
+          const kwh = parseFloat(value)
+          let toFixed = 2
+          if (kwh >= 100) {
+            toFixed = 0
+          } else if (kwh >= 10) {
+            toFixed = 1
+          }
+          return kwh.toFixed(toFixed)
         },
-        legend: {
-            show: true,
-            data: ['kWh', unit],
-            textStyle: {
-                color: theme?.global.fontColor,
-            }
+        color: props.theme?.global.secondFontColor,
+      },
+      nameTextStyle: {
+        fontSize: 14,
+        align: 'left',
+        padding: [0, 0, 0, cx(-30)],
+        color: props.theme?.global.secondFontColor,
+      },
+    }, {
+      type: 'value',
+      name: I18n.formatValue('format_unit', unit),
+      position: 'right',
+      alignTicks: true,
+      max: Math.ceil(price ? maxValue * price * 1.4 : 0),
+      min: 0,
+      minInterval: 1,
+      axisLabel: {
+        formatter: function (value) {
+          const price = parseFloat(value)
+          let toFixed = 2
+          if (price >= 100) {
+            toFixed = 0
+          } else if (price >= 10) {
+            toFixed = 1
+          }
+          return price.toFixed(toFixed)
         },
-        grid: {
-            right: gridRight,
+        color: props.theme?.global.secondFontColor,
+      },
+      nameTextStyle: {
+        fontSize: 14,
+        align: 'right',
+        padding: [0, cx(-30), 0, 0],
+        color: props.theme?.global.secondFontColor,
+      },
+    }],
+    series: [
+      {
+        name: 'kWh',
+        type: 'bar',
+        data: dataKwhY,
+        itemStyle: {
+          emphasis: {
+            color: '#FFC2A9', // Color when bar is clicked
+          },
+          color: '#FFC2A9',
+          borderRadius: 2,
         },
-        xAxis: {
-            data: dataX,
-            axisTick: {
-                show: false,
-            },
-            axisLabel: {
-                show: true,
-                color: props.theme?.global.secondFontColor,
-                interval: 0,
-            }
+        barMaxWidth: 10,
+        select: {
+          itemStyle: {
+            borderColor: '#FFC2A9',
+          }
         },
-        yAxis: [{
-            type: 'value',
-            name: I18n.getLang('consumption_data_annual_bar_chart_text'),
-            max: Math.max(maxValue, 0.02),
-            min: 0,
-            position: 'left',
-            axisLabel: {
-                formatter: function (value) {
-                    const kwh=parseFloat(value);
-                    let toFixed = 2;
-                    if (kwh >= 100) {
-                        toFixed = 0;
-                    } else if (kwh >= 10) {
-                        toFixed = 1;
-                    }
-                    return kwh.toFixed(toFixed);
-                },
-                color:props.theme?.global.secondFontColor,
-            },
-            nameTextStyle: {
-                fontSize: 14,
-                align:'left',
-                padding: [0, 0, 0, cx(-30)],
-                color: props.theme?.global.secondFontColor,
-            },
-        }, {
-            type: 'value',
-            name: I18n.formatValue('format_unit', unit),
-            position: 'right',
-            alignTicks: true,
-            max: Math.ceil(price ? maxValue * price * 1.4 : 0),
-            min: 0,
-            minInterval: 1,
-            axisLabel: {
-                formatter: function (value) {
-                    const price=parseFloat(value);
-                    let toFixed = 2;
-                    if (price >= 100) {
-                        toFixed = 0;
-                    } else if (price >= 10) {
-                        toFixed = 1;
-                    }
-                    return price.toFixed(toFixed);
-                },
-                color:props.theme?.global.secondFontColor,
-            },
-            nameTextStyle: {
-                fontSize: 14,
-                align:'right',
-                padding: [0, cx(-30), 0, 0],
-                color: props.theme?.global.secondFontColor,
-            },
-        }],
-        series: [
-            {
-                name: 'kWh',
-                type: 'bar',
-                data: dataKwhY,
-                itemStyle: {
-                    emphasis: {
-                        color: '#FFC2A9', // Color when bar is clicked
-                    },
-                    color: '#FFC2A9',
-                    borderRadius: 2,
-                },
-                barMaxWidth: 10,
-                select: {
-                    itemStyle: {
-                        borderColor: '#FFC2A9',
-                    }
-                },
-                selectedMode: 'single',
-            },
-            {
-                name: unit,
-                type: 'line',
-                data: dataPriceY,
-                yAxisIndex: 1,
-                smooth: true,
-                showSymbol: false,
-                color: '#F49431',
-                selectedMode: "single",
-            }
-        ],
-        dataZoom: {
-            start: 0,
-            type: "inside",
-            maxValueSpan: 5,
-            zoomLock: true,
-        },
-        customMapData: {}
-    };
-    return (
-      <View style={{flex: 1}}>
-          <ECharts
-            option={option}
-            ref={echarts}
-            height={height}
-          />
-      </View>
-    );
-};
+        selectedMode: 'single',
+      },
+      {
+        name: unit,
+        type: 'line',
+        data: dataPriceY,
+        yAxisIndex: 1,
+        smooth: true,
+        showSymbol: false,
+        color: '#F49431',
+        selectedMode: 'single',
+      }
+    ],
+    dataZoom: {
+      start: 0,
+      type: 'inside',
+      zoomLock: true,
+    },
+    customMapData: {}
+  }
+  return (
+    <View style={{ flex: 1 }}>
+      <ECharts
+        option={option}
+        ref={echarts}
+        height={height}
+      />
+    </View>
+  )
+}
 
 export default withTheme(BarChartWithTouch)

package/src/modules/energyConsumption/res/index.ts

@@ -0,0 +1,3 @@
+export default {
+  energyChart: require('./energy-chart.png')
+}

package/src/modules/fixedTimeForPlug/FixedTimeForPlugDetailPage.tsx

@@ -17,7 +17,7 @@ import Spacer from "@ledvance/base/src/components/Spacer";
 import Summary from "./Summary";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import DeleteButton from "@ledvance/base/src/components/DeleteButton";
-import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
+import LdvPickerView from "@ledvance/base/src/components/LdvPickerView";
 import ThemeType from '@ledvance/base/src/config/themeType'
 
 const {parseTimer} = Utils.TimeUtils

package/src/modules/fixedTimingForLight/FixedTimingForLightDetailPage.tsx

@@ -20,7 +20,7 @@ import Card from "@ledvance/base/src/components/Card";
 import LdvSwitch from "@ledvance/base/src/components/ldvSwitch";
 import LampAdjustView from "@ledvance/base/src/components/LampAdjustView";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
-import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
+import LdvPickerView from "@ledvance/base/src/components/LdvPickerView";
 import ThemeType from '@ledvance/base/src/config/themeType'
 
 const {parseTimer} = Utils.TimeUtils

package/src/modules/mood/RecommendMoodItem.tsx

@@ -30,7 +30,7 @@ export default function RecommendMoodItem(props: RecommendMoodItemProps) {
                 value={''}
                 style={styles.content}
                 titleStyle={styles.title}
-                iconStyle={{
+                arrowStyle={{
                     color: '#000',
                     size: cx(16),
                 }} />

package/src/modules/mood_new/RecommendMoodItem.tsx

@@ -63,7 +63,7 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
         value={''}
         style={styles.content}
         titleStyle={styles.title}
-        iconStyle={{
+        arrowStyle={{
           color: props.theme?.global.fontColor,
           size: cx(16),
         }}

package/src/modules/sleepWakeUp/SleepWakeUpDetailPage.tsx

@@ -7,7 +7,7 @@ import res from '@ledvance/base/src/res';
 import { TimerPicker, Utils } from 'tuya-panel-kit';
 import { useReactive, useUpdateEffect } from 'ahooks';
 import TextField from '@ledvance/base/src/components/TextField';
-import LdvPickerView from '@ledvance/base/src/components/ldvPickerView';
+import LdvPickerView from '@ledvance/base/src/components/LdvPickerView';
 import LdvWeekView from '@ledvance/base/src/components/weekSelect';
 import {
   convertMinutesTo12HourFormat,

package/src/modules/switchInching/SwitchInching.tsx

@@ -4,7 +4,7 @@ import Page from "@ledvance/base/src/components/Page";
 import {useUAGroupInfo} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {useNavigation} from '@react-navigation/native'
 import {SwitchButton, Utils} from "tuya-panel-kit";
-import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
+import LdvPickerView from "@ledvance/base/src/components/LdvPickerView";
 import I18n from '@ledvance/base/src/i18n'
 import {defSwitchInching, SwitchInchingItem, SwitchInchingPageParams, useSwitchInching} from "./SwitchInchingAction";
 import ThemeType from '@ledvance/base/src/config/themeType'

package/src/modules/timeSchedule/Interface.ts

@@ -1,5 +1,5 @@
 import I18n from "@ledvance/base/src/i18n";
-import { AdjustType, DiySceneInfo } from "@ledvance/base/src/utils/interface";
+import { AdjustType, ApplyForItem, DiySceneInfo } from "@ledvance/base/src/utils/interface";
 import { MoodInfo, MoodUIInfo } from "../mood_new/Interface";
 
 export interface IAddSingleTime {
@@ -62,16 +62,6 @@ export interface HSV {
   v: number;
 }
 
-export type Category = 'light' | 'socket' | 'fan' | 'mainLight' | 'secondaryLight'
-
-export interface ApplyForItem {
-  name?: string
-  key: string;
-  dp: string;
-  type: Category;
-  enable: boolean;
-}
-
 interface judgmentSupport {
   isSupportColor: boolean;
   isSupportBrightness: boolean;
@@ -102,6 +92,7 @@ export enum DeviceType {
   FanLight = 'fanLight',
   MoodStrip = 'moodStrip',
   Shutter = 'shutter',
+  OsramFanLight = 'osramFanLight',
 }
 // export type DeviceType = 'LightSource' | 'CeilingLight' | 'StringLight' | 'StripLight' | 'MixLight';
 
@@ -144,6 +135,11 @@ export interface ShutterData extends DeviceData {
   percentControl: number
 }
 
+export interface OsramFanLightData extends DeviceData {
+  fanMode: 'fresh' | 'nature'
+  fanSpeed: number
+}
+
 export type ComponentConfig =
   | { type: DeviceType.LightSource; deviceData: DeviceData }
   | { type: DeviceType.MixLight; deviceData: MixLightData }
@@ -152,6 +148,8 @@ export type ComponentConfig =
   | { type: DeviceType.FanLight; deviceData: FanLightData }
   | { type: DeviceType.MoodStrip; deviceData: MoodStripData}
   | { type: DeviceType.Shutter; deviceData: ShutterData}
+  | { type: DeviceType.OsramFanLight; deviceData: OsramFanLightData}
+
 export interface TimeScheduleDetailState {
   timeSchedule: Timer;
   dps: Record<string, any>;

package/src/modules/timeSchedule/TimeScheduleActions.ts

@@ -47,7 +47,13 @@ export const defMoodStripDeviceData = {
 
 export const defShutterDeviceData = {
   percentControl: 100
-};
+}
+
+export const defOsramFanLightDeviceData = {
+  ...defDeviceData,
+  fanSpeed: 1,
+  fanMode: 'fresh',
+}
 
 export const addTimeSchedule = async (props: IAddSingleTime) => {
   try {

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -19,7 +19,6 @@ import Spacer from '@ledvance/base/src/components/Spacer';
 import LdvWeekView from '@ledvance/base/src/components/weekSelect';
 import { convertTo12HourFormat, loopText, showDialog } from '@ledvance/base/src/utils/common';
 import {
-  ApplyForItem,
   ComponentConfig,
   DeviceType,
   TimeScheduleDetailState,
@@ -37,7 +36,7 @@ import DeleteButton from '@ledvance/base/src/components/DeleteButton';
 import SegmentControl from '@ledvance/base/src/components/segmentControl';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import ManualSettings from './components/ManuaSettings';
-import { defDeviceData, defMixDeviceData, defStripDeviceData, defFanLightDeviceData, defMoodStripDeviceData, defShutterDeviceData } from './TimeScheduleActions';
+import { defDeviceData, defMixDeviceData, defStripDeviceData, defFanLightDeviceData, defMoodStripDeviceData, defShutterDeviceData, defOsramFanLightDeviceData } from './TimeScheduleActions';
 import MoodItem from '../mood_new/MoodItem';
 import Summary from './components/Summary'
 import { getRemoteMoodList } from '../mood_new/MoodActions'
@@ -45,7 +44,7 @@ import { MoodInfo, MoodUIInfo } from '../mood_new/Interface';
 import InfoText from '@ledvance/base/src/components/InfoText';
 import ThemeType from '@ledvance/base/src/config/themeType'
 import Tag from '@ledvance/base/src/components/Tag';
-import { DiySceneInfo } from '@ledvance/base/src/utils/interface';
+import { ApplyForItem, DiySceneInfo } from '@ledvance/base/src/utils/interface';
 import DiySceneItem from '@ledvance/base/src/components/DiySceneItem';
 
 const { convertX: cx } = Utils.RatioUtils;
@@ -679,7 +678,8 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
     isFanLight: DeviceType.FanLight,
     isCeilingLight: DeviceType.CeilingLight,
     isMoodStrip: DeviceType.MoodStrip,
-    isShutter: DeviceType.Shutter
+    isShutter: DeviceType.Shutter,
+    isOsramFanLight: DeviceType.OsramFanLight,
   };
 
   const deviceType = Object.entries(deviceTypeMap)
@@ -693,6 +693,7 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
     [DeviceType.FanLight]: defFanLightDeviceData,
     [DeviceType.MoodStrip]: defMoodStripDeviceData,
     [DeviceType.Shutter]: defShutterDeviceData,
+    [DeviceType.OsramFanLight]: defOsramFanLightDeviceData,
     [DeviceType.LightSource]: defDeviceData,
   };
 

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -37,6 +37,7 @@ export interface TimeSchedulePageParams {
   isUVCFan?: boolean;
   isMoodStrip?: boolean
   isShutter?: boolean
+  isOsramFan?: boolean
   applyForList: ApplyForItem[];
   applyForDisabled?: boolean; // 是否可以选择apply for
   manualDataDp2Obj: (dps: Record<string, any>) => DeviceStateType;

package/src/modules/timeSchedule/components/ManuaSettings.tsx

@@ -8,6 +8,7 @@ import {
   directOptions,
   modeOptions,
   ShutterData,
+  OsramFanLightData,
 } from '../Interface';
 import { View } from 'react-native';
 import Card from '@ledvance/base/src/components/Card';
@@ -28,6 +29,8 @@ import { cctToColor } from '@ledvance/base/src/utils/cctUtils';
 import {hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils';
 import { AdjustType, ApplyForItem } from '@ledvance/base/src/utils/interface';
 import LdvSlider from '@ledvance/base/src/components/ldvSlider';
+import OsramFanAdjustView from '@ledvance/base/src/components/OsramFanAdjustView'
+
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 
@@ -112,7 +115,7 @@ function ManualSettings(props: ManualSettingProps) {
                   state.applyFlag = Symbol()
                 }}
               />
-              {item.enable && (item.type !== 'socket' && item.type !== 'fan') && (
+              {item.enable && !['socket', 'fan', 'osramFan'].includes(item.type) && (
                 <LampAdjustView
                   isSupportColor={props.isSupportColor}
                   isSupportBrightness={props.isSupportBrightness}
@@ -206,6 +209,30 @@ function ManualSettings(props: ManualSettingProps) {
                 />
               )}
 
+              {item.enable && item.type === 'osramFan' && (
+                <OsramFanAdjustView
+                  hideFanSwitch={true}
+                  fanSwitch={item.enable}
+                  setFanSwitch={() => {}}
+                  fanSpeed={(state.deviceData as OsramFanLightData).fanSpeed}
+                  setFanSpeed={(v: number) => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      fanSpeed: v
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                  fanMode={(state.deviceData as OsramFanLightData).fanMode}
+                  setFanMode={(v: 'fresh' | 'nature') => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      fanMode: v
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                />
+              )}
+
               <ApplyForDeviceList
                 devices={cloneDeep(groupDevices)}
               />

package/src/modules/timer/TimerAction.ts

@@ -22,6 +22,7 @@ export interface TimerTask {
   stringOnMin: I18nKey
   stringOffMin: I18nKey
   cloudKey: 'lightingInfo' | 'socketInfo' | 'fanInfo' | 'plugCountDownInfo'
+  displayToDpValue?: (value: number) => number
 }
 
 export enum TaskStatus {
@@ -65,6 +66,7 @@ export function useTimerTasks(timerSettableDps: TimerSettableDp[], devIdGroup: s
       stringOnMin: timerSettableDp.stringOnMin,
       stringOffMin: timerSettableDp.stringOffMin,
       cloudKey: timerSettableDp.cloudKey,
+      displayToDpValue: timerSettableDp.displayToDpValue,
     }))
   }, [JSON.stringify(timerSettableDps)])
 
@@ -75,7 +77,7 @@ export function useTimerTasks(timerSettableDps: TimerSettableDp[], devIdGroup: s
     timerTasks => {
       const dps = {}
       timerTasks.forEach(task => {
-        dps[task.dp.code] = task.duration
+        dps[task.dp.code] = task.displayToDpValue ? task.displayToDpValue(task.duration) : task.duration
         const featureKey = timerSettableDps.find(timerSettableDp => timerSettableDp.dp.code === task.dp.code)?.cloudKey
         devIdGroup.forEach(devId => {
           NativeApi.putJson(devId, task.cloudKey ?? featureKey, JSON.stringify({ [getKey('Status', task.dp.code)]: !!task.duration, [getKey('StartTime', task.dp.code)]: dayjs(task.startTime * 1000).format('YYYY-MM-DD HH:mm:ss'), progressAllNumber: task.duration }))
@@ -176,6 +178,7 @@ export interface TimerSettableDp {
   stringOnMin: I18nKey
   stringOffMin: I18nKey
   cloudKey: 'lightingInfo' | 'socketInfo' | 'fanInfo' | 'plugCountDownInfo'
+  displayToDpValue?: (value: number) => number
 }
 
 export interface TimerPageParams {

package/src/modules/timer/TimerPage.tsx

@@ -4,7 +4,7 @@ import I18n from '@ledvance/base/src/i18n'
 import Page from '@ledvance/base/src/components/Page'
 import {Utils} from 'tuya-panel-kit'
 import {useUAGroupInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
-import LdvPickerView from '@ledvance/base/src/components/ldvPickerView'
+import LdvPickerView from '@ledvance/base/src/components/LdvPickerView'
 import {useReactive} from 'ahooks'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'

package/tsconfig.json

@@ -1,51 +1,76 @@
 {
-    "compilerOptions": {
-        /* Basic Options */
-        "target": "ES2017",
-        /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
-        "module": "commonjs",
-        /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-        "jsx": "react",
-        /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+  "compilerOptions": {
+    /* Basic Options */
+    "target": "ES2017",
+    "lib": ["es2017"],
+    /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+    "module": "commonjs",
+    /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    "jsx": "react",
+    /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
 
-        /* Strict Type-Checking Options */
-        /* "strict": true                         /* Enable all strict type-checking options. */
-        "noImplicitAny": false,
-        /* Raise error on expressions and declarations with an implied 'any' type. */
-        "strictNullChecks": true,
-        /* Enable strict null checks. */
+    /* Strict Type-Checking Options */
+    /* "strict": true                         /* Enable all strict type-checking options. */
+    "noImplicitAny": false,
+    /* Raise error on expressions and declarations with an implied 'any' type. */
+    "strictNullChecks": true,
+    /* Enable strict null checks. */
 
-        /* Additional Checks */
-        "noUnusedLocals": true,
-        /* Report errors on unused locals. */
-        "noUnusedParameters": true,
-        /* Report errors on unused parameters. */
+    /* Additional Checks */
+    "noUnusedLocals": true,
+    /* Report errors on unused locals. */
+    "noUnusedParameters": true,
+    /* Report errors on unused parameters. */
 
-        /* .d.ts config */
-        "declaration": true,
-        "emitDeclarationOnly": true,
-
-        /* Module Resolution Options */
-        "moduleResolution": "node",
-        /* Specify module resolution strategy: 'node' (Node.js) or 'classic'  */
-        "types": ["react", "react-native"],
-        /* Type declaration files to be included in compilation. */
-        "typeRoots": ["@types/*.d.ts"],
-        "allowSyntheticDefaultImports": true,
-        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-        "esModuleInterop": true,
-        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-        "baseUrl": "./src",
-        "paths": {
-            "@api": ["./api"],
-            "@components": ["./components"],
-            "@config": ["./config"],
-            "@i18n": ["./i18n"],
-            "@models": ["./models"],
-            "@res": ["./res"],
-            "@utils": ["./utils"]
-        }
-    },
-    "include": ["src/**/*.ts","src/**/*.tsx"],
-    "exclude": ["node_modules",".yalc"]
+    /* .d.ts config */
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    /* Module Resolution Options */
+    "moduleResolution": "node",
+    /* Specify module resolution strategy: 'node' (Node.js) or 'classic'  */
+    "types": [
+      "react",
+      "react-native"
+    ],
+    /* Type declaration files to be included in compilation. */
+    "typeRoots": [
+      "@types/*.d.ts"
+    ],
+    "allowSyntheticDefaultImports": true,
+    /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true,
+    /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "baseUrl": "./src",
+    "paths": {
+      "@api": [
+        "./api"
+      ],
+      "@components": [
+        "./components"
+      ],
+      "@config": [
+        "./config"
+      ],
+      "@i18n": [
+        "./i18n"
+      ],
+      "@models": [
+        "./models"
+      ],
+      "@res": [
+        "./res"
+      ],
+      "@utils": [
+        "./utils"
+      ]
+    }
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules",
+    ".yalc"
+  ]
 }