@ledvance/group-ui-biz-bundle 1.0.133 → 1.0.135

package/package.json

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

package/src/modules/energyConsumption/EnergyConsumptionActions.ts

@@ -85,7 +85,7 @@ const getDpResultByYear = async (devIdGroup: string[], addEleDpCode: string, dat
       key: `${monthFormat(month)} ${year}`,
       value: (Number(mergedData[month]) || 0).toFixed(2),
       headlineText: `${year}${month}`,
-      chartTitle: `${monthFormatShort(month)}\n${year}`
+      chartTitle: `${monthFormatShort(month)}`
     }
   })
 }
@@ -119,7 +119,7 @@ const getDpResultByYearMonth = async (deviceIdGroup: string[], addEleDpCode: str
 
     // 格式化为 'YYYY/MM/DD' 格式
     const formattedDate = `${year}/${month}/${day}`
-    const dateStr = `${day}/${month}/${year}`
+    const dateStr = `${day}.${month}.${year}`
     const dateObj = dayjs(formattedDate, "YYYY/MM/DD");
     const dayOfWeek = dateObj.day() % 7;
     const key = `${dateStr} (${loopsText[dayOfWeek]})`
@@ -127,7 +127,7 @@ const getDpResultByYearMonth = async (deviceIdGroup: string[], addEleDpCode: str
       key,
       value: Number(mergedData[time] || 0).toFixed(2),
       headlineText: formattedDate,
-      chartTitle: `${Number(key?.split('/')[0])}\n${loopsText[dayOfWeek]}`
+      chartTitle: `${Number(key?.split('.')[0])} ${loopsText[dayOfWeek]}`
     }
   })
 }

package/src/modules/energyConsumption/EnergyConsumptionChart.tsx

@@ -25,6 +25,7 @@ const { withTheme } = Utils.ThemeUtils
 
 export interface EnergyConsumptionChartProps {
   addEleDpCode: string
+  backTitle: string
   headlineText: string
   chartData: OverviewItem[],
   over365Days?: boolean
@@ -37,7 +38,7 @@ export interface EnergyConsumptionChartProps {
 
 const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
   const params = useRoute().params as EnergyConsumptionChartProps
-  const { price, unit, date, addEleDpCode, deviceIdGroup, over365Days, over7Days } = params;
+  const { backTitle, price, unit, date, addEleDpCode, deviceIdGroup, over365Days, over7Days } = params;
 
   const styles = StyleSheet.create({
     listEmptyView: {
@@ -132,7 +133,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
         state.headlineText = `${monthFormat(month)} ${year}`;
         break
       case DateType.Day:
-        state.headlineText = `${day}/${month}/${year} (${loopsText[dayOfWeek]})`;
+        state.headlineText = `${day}.${month}.${year} (${loopsText[dayOfWeek]})`;
         break
     }
   }, [state.dateType, state.headlineText]);
@@ -149,7 +150,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
 
   return (
     <Page
-      backText={I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}
+      backText={backTitle}
       showGreenery={false}
       greeneryIcon={res.energy_consumption_greenery}
       loading={state.loading}

package/src/modules/energyConsumption/EnergyConsumptionDetail.tsx

@@ -27,6 +27,7 @@ const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
 export interface EnergyConsumptionDetailProps {
+  backTitle: string
   addEleDpCode: string
   curMonth: OverviewItem
   price: string
@@ -99,7 +100,7 @@ const EnergyConsumptionDetail = (props: { theme?: ThemeType }) => {
 
       // 格式化为 'YYYY/MM/DD' 格式
       const formattedDate = `${year}/${month}/${day}`
-      const dateStr = `${day}/${month}/${year}`
+      const dateStr = `${day}.${month}.${year}`
       const dateObj = dayjs(formattedDate, "YYYY/MM/DD");
       const dayOfWeek = dateObj.day() % 7;
       const key = `${dateStr} (${loopsText[dayOfWeek]})`
@@ -107,7 +108,7 @@ const EnergyConsumptionDetail = (props: { theme?: ThemeType }) => {
         key,
         value: mergedData[time].toFixed(2),
         headlineText: formattedDate,
-        chartTitle: `${Number(key?.split('/')[0])}\n${loopsText[dayOfWeek]}`
+        chartTitle: `${Number(key?.split('.')[0])} ${loopsText[dayOfWeek]}`
       }
     })
 
@@ -115,7 +116,7 @@ const EnergyConsumptionDetail = (props: { theme?: ThemeType }) => {
   }
 
   const getHourList = async (item: OverviewItem) => {
-    const value = item?.key?.split(' ')[0]?.split('/')
+    const value = item?.key?.split(' ')[0]?.split('.')
     const date = `${value[2]}${value[1]}${value[0]}`
     state.over7Days = overDays(date, 7)
     if (state.over7Days) {
@@ -213,7 +214,7 @@ const EnergyConsumptionDetail = (props: { theme?: ThemeType }) => {
 
   return (
     <Page
-      backText={I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}
+      backText={params.backTitle}
       headlineText={params.curMonth.key}
       headlineIcon={state.overviewList.length ? res.download_icon : undefined}
       onHeadlineIconClick={() => {
@@ -301,6 +302,7 @@ const EnergyConsumptionDetail = (props: { theme?: ThemeType }) => {
             headlineText={I18n.getLang('consumption_data_monthly_overview_field2_headline_text')}
             headlineClick={() => {
               navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption_chart, {
+                backTitle: params.backTitle,
                 headlineText: params.curMonth.key,
                 chartData: state.overviewList,
                 over365Days: state.over365Days,
@@ -316,6 +318,7 @@ const EnergyConsumptionDetail = (props: { theme?: ThemeType }) => {
               const res = await getHourList(item)
               state.loading = false
               navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption_chart, {
+                backTitle: params.backTitle,
                 headlineText: item.key,
                 chartData: res,
                 over7Days: state.over7Days,

package/src/modules/energyConsumption/EnergyConsumptionPage.tsx

@@ -187,7 +187,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
           key: `${monthFormat(month)} ${year}`,
           value: (Number(curMonth[month]) || 0).toFixed(2),
           headlineText: `${year}${month}`,
-          chartTitle: `${monthFormatShort(month)}\n${year}`,
+          chartTitle: `${monthFormatShort(month)}`,
         };
       });
       return monthData;
@@ -205,6 +205,10 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
     state.unit = data.unit;
   };
 
+  const backTitle = useMemo(() => {
+    return params.backText || I18n.getLang('sockets_ce')
+  }, [])
+
   const styles = StyleSheet.create({
     showTip: {
       marginHorizontal: cx(24),
@@ -287,7 +291,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
   return (
     <Page
       style={{ position: 'relative' }}
-      backText={params.backText || I18n.getLang('sockets_ce')}
+      backText={backTitle}
       headlineText={I18n.getLang(
         state.isSolarMode
           ? 'sockets_headline_power'
@@ -350,6 +354,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
             style={styles.cardContainer}
             onPress={() => {
               navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption_chart, {
+                backTitle,
                 headlineText: chartHeadline,
                 chartData: state.isSolarMode ? state.solarOverviewList : state.wifiOverviewList,
                 price: state.price,
@@ -485,6 +490,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
             headlineText={I18n.getLang('consumption_data_field4_headline_text')}
             headlineClick={() => {
               navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption_chart, {
+                backTitle,
                 headlineText: chartHeadline,
                 chartData: state.isSolarMode ? state.solarOverviewList : state.wifiOverviewList,
                 price: state.price,
@@ -496,6 +502,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
             }}
             overviewItemClick={(item) => {
               navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption_detail, {
+                backTitle,
                 addEleDpCode: params.addEleDpCode,
                 curMonth: item,
                 price: state.price,

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

@@ -101,7 +101,7 @@ export default withTheme(function DateSelectedItem(props: DateSelectedItemProps)
                 state.date = `${datejs.month() + 1}/${datejs.year()}`;
                 break
             case DateType.Day:
-                state.date = `${datejs.date()}/${datejs.month() + 1}/${datejs.year()}`;
+                state.date = `${datejs.date()}.${datejs.month() + 1}.${datejs.year()}`;
         }
         state.modalMode = getModalMode(dateType);
     }, [dateType, date]);

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

@@ -74,7 +74,9 @@ const BarChartWithTouch = (props: BarChartProps) => {
         interval: 'auto',
         rotate: 45,
         align: 'right',
-        verticalAlign: 'top'
+        verticalAlign: 'top',
+        showMinLabel: true,
+        showMaxLabel: true,
       }
     },
     yAxis: [{

package/src/modules/switchInching/SwitchInching.tsx

@@ -167,7 +167,7 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
                 const newSwitchInchingItem = {
                   ...state.switchInchingItem,
                   enable: v,
-                  time
+                  time: time < 2 ? 2 : time
                 }
                 updateState({ switchInchingItem: newSwitchInchingItem })
                 await saveInchingConfig(newSwitchInchingItem)
@@ -192,6 +192,7 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
             ]}
             setHour={m => updateTime(m, undefined)}
             setMinute={s => updateTime(undefined, s)}
+            minMinute={timeRef.current.minute === '00' ? 2 : 0}
             maxHour={61}
           />
         </View>

package/src/modules/timeSchedule/Router.ts

@@ -1,13 +1,22 @@
-import {NavigationRoute} from "tuya-panel-kit";
-import TimeSchedulePage from "./TimeSchedulePage";
-import TimeScheduleDetailPage from "./TimeScheduleDetailPage";
-import {ui_biz_routerKey} from "../../navigation/Routers";
+import { NavigationRoute } from 'tuya-panel-kit'
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import TimeScheduleAddPage from './TimeScheduleAddPage'
+import TimeScheduleDetailPage from './TimeScheduleDetailPage'
+import TimeSchedulePage from './TimeSchedulePage'
 
 const TimeSchedulePageRouters: NavigationRoute[] = [
   {
     name: ui_biz_routerKey.group_ui_biz_time_schedule,
     component: TimeSchedulePage,
-    options:{
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+  {
+    name: ui_biz_routerKey.group_ui_biz_time_schedule_add,
+    component: TimeScheduleAddPage,
+    options: {
       hideTopbar: true,
       showOfflineView: false,
     }
@@ -15,7 +24,7 @@ const TimeSchedulePageRouters: NavigationRoute[] = [
   {
     name: ui_biz_routerKey.group_ui_biz_time_schedule_edit,
     component: TimeScheduleDetailPage,
-    options:{
+    options: {
       hideTopbar: true,
       showOfflineView: false,
     }

package/src/modules/timeSchedule/TimeScheduleActions.ts

@@ -4,6 +4,7 @@ import {flatMapDeep} from "lodash";
 import {ColorList} from '@ledvance/base/src/components/StripAdjustView';
 import {parseJSON} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import {AdjustType} from "@ledvance/base/src/utils/interface";
+import { TimeScheduleDetailPageParams } from './TimeScheduleDetailPage'
 
 export const defDeviceData = {
   h: 0,
@@ -45,8 +46,10 @@ export const defMoodStripDeviceData = {
   adjustType: AdjustType.COLOUR
 }
 
-export const defShutterDeviceData = {
-  percentControl: 100
+export const defShutterDeviceData = (props: TimeScheduleDetailPageParams) => {
+  return {
+    percentControl: (props.suggestValue !== undefined && !props.suggestValue) ? 0 : 100
+  }
 }
 
 export const defOsramFanLightDeviceData = {

package/src/modules/timeSchedule/TimeScheduleAddPage.tsx

@@ -0,0 +1,71 @@
+import Card from '@ledvance/base/src/components/Card'
+import Page from '@ledvance/base/src/components/Page'
+import Spacer from '@ledvance/base/src/components/Spacer'
+import ThemeType from '@ledvance/base/src/config/themeType'
+import { useParams } from '@ledvance/base/src/hooks/Hooks'
+import I18n from '@ledvance/base/src/i18n'
+import { useNavigation } from '@react-navigation/native'
+import { useReactive } from 'ahooks'
+import React, { useCallback } from 'react'
+import { StyleSheet, Text, View } from 'react-native'
+import { Utils } from 'tuya-panel-kit'
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import { TimeScheduleDetailPageParams } from './TimeScheduleDetailPage'
+
+const { convertX: cx } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
+
+interface TimeScheduleAddProps {
+  theme?: ThemeType
+}
+
+const TimeScheduleAddPage = (props: TimeScheduleAddProps) => {
+  const params = useParams<TimeScheduleDetailPageParams>()
+  const navigation = useNavigation()
+  const state = useReactive({
+    loading: false,
+  })
+
+  const nextPage = useCallback((suggestValue?: boolean) => {
+    navigation.navigate(ui_biz_routerKey.group_ui_biz_time_schedule_edit, {
+      ...params,
+      suggestValue
+    })
+  }, [])
+
+  const styles = StyleSheet.create({
+    card: {
+      marginHorizontal: cx(24),
+      padding: cx(16)
+    },
+    text: {
+      color: props.theme?.global.fontColor,
+      fontSize: cx(16),
+    }
+  })
+
+  return (
+    <Page
+      backText={I18n.getLang('motion_detection_add_time_schedule_system_back_text')}
+      headlineText={I18n.getLang('motion_detection_add_time_schedule_headline_text')}
+      loading={state.loading}
+    >
+      <View>
+        <Spacer/>
+        <Card style={styles.card} onPress={() => nextPage()}>
+          <Text style={styles.text}>{I18n.getLang('timeschedule_own')}</Text>
+        </Card>
+        <Spacer/>
+        <Card style={styles.card} onPress={() => nextPage(true)}>
+          <Text style={styles.text}>{I18n.getLang('timeschedule_on')}</Text>
+        </Card>
+        <Spacer/>
+        <Card style={styles.card} onPress={() => nextPage(false)}>
+          <Text style={styles.text}>{I18n.getLang('timeschedule_off')}</Text>
+        </Card>
+      </View>
+    </Page>
+  )
+}
+
+export default withTheme(TimeScheduleAddPage)

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -18,6 +18,7 @@ import { SwitchButton, TimerPicker, Utils } from 'tuya-panel-kit';
 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 { ui_biz_routerKey } from '../../navigation/Routers'
 import {
   ComponentConfig,
   DeviceType,
@@ -50,11 +51,12 @@ import DiySceneItem from '@ledvance/base/src/components/DiySceneItem';
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 const { toFixedString } = Utils.NumberUtils;
-interface TimeScheduleDetailPageParams extends TimeSchedulePageParams {
+export interface TimeScheduleDetailPageParams extends TimeSchedulePageParams {
   mode: 'add' | 'edit';
   timeSchedule: Timer;
   modDeleteTimeSchedule: (mode: 'add' | 'edit' | 'del', timeSchedule: Timer, ids: string) => Promise<Result<any>>
   refreshFn: () => void;
+  suggestValue?: boolean
 }
 
 const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
@@ -89,7 +91,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
 
   useEffect(() => {
     const { applyForDisabled, timeSchedule, applyForList, mode } = params;
-    const cannotChoose = applyForDisabled || applyForList.length === 1;
+    const cannotChoose = applyForDisabled || applyForList.length === 1 || params.suggestValue !== undefined;
     const cloneApplyList =
       mode === 'add'
         ? cloneDeep(applyForList)
@@ -130,6 +132,13 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
       state.isManual = isManual;
       state.mood = mood;
     }
+
+    if (params.suggestValue !== undefined) {
+      state.selectedSkill.forEach(it => {
+        it.enable = !!params.suggestValue
+      })
+    }
+
     state.initSelectedSkill = cloneDeep(state.selectedSkill)
     if (!(Array.isArray(moods) && moods.length)) {
       state.timerId = setTimeout(() => {
@@ -351,7 +360,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
         state.loading = false;
         if (res.success) {
           params.refreshFn()
-          navigation.goBack();
+          navigation.navigate(ui_biz_routerKey.group_ui_biz_time_schedule)
         }
       }}
       backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}
@@ -692,7 +701,7 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
     [DeviceType.MixLight]: defMixDeviceData,
     [DeviceType.FanLight]: defFanLightDeviceData,
     [DeviceType.MoodStrip]: defMoodStripDeviceData,
-    [DeviceType.Shutter]: defShutterDeviceData,
+    [DeviceType.Shutter]: defShutterDeviceData(props),
     [DeviceType.OsramFanLight]: defOsramFanLightDeviceData,
     [DeviceType.LightSource]: defDeviceData,
   };

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -93,7 +93,7 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
   }
 
   const navigateToEdit = useCallback((mode: 'add' | 'edit', timeSchedule?: Timer) => {
-    const path = ui_biz_routerKey.group_ui_biz_time_schedule_edit;
+    const path = mode === 'add' ? ui_biz_routerKey.group_ui_biz_time_schedule_add : ui_biz_routerKey.group_ui_biz_time_schedule_edit;
     navigation.navigate(path, {
       mode,
       name: path,

package/src/navigation/Routers.ts

@@ -1,6 +1,7 @@
 export const ui_biz_routerKey = {
   'group_ui_biz_timer': 'group_ui_biz_timer',
   'group_ui_biz_time_schedule': 'group_ui_biz_time_schedule',
+  'group_ui_biz_time_schedule_add': 'group_ui_biz_time_schedule_add',
   'group_ui_biz_time_schedule_edit': 'group_ui_biz_time_schedule_edit',
   'group_ui_biz_mood': 'group_ui_biz_mood',
   'group_ui_biz_mood_add': 'group_ui_biz_mood_add',