@ledvance/ui-biz-bundle 1.1.144 → 1.1.145

package/package.json

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

package/src/navigation/Routers.ts

@@ -30,6 +30,7 @@ export const ui_biz_routerKey = {
   'ui_biz_flag_page': 'ui_biz_flag_page',
   'ui_biz_flag_page_edit': 'ui_biz_flag_page_edit',
   'ui_biz_time_schedule_new': 'ui_biz_time_schedule_new',
+  'ui_biz_time_schedule_add_new': 'ui_biz_time_schedule_add_new',
   'ui_biz_time_schedule_edit_new': 'ui_biz_time_schedule_edit_new',
   'ui_biz_fixed_time_new': 'ui_biz_fixed_time_new',
   'ui_biz_fixed_time_edit_new': 'ui_biz_fixed_time_edit_new',

package/src/newModules/biorhythm/BiorhythmActions.ts

@@ -359,7 +359,7 @@ function obj2Dp(obj: BiorhythmBean): string {
 function vo2Dto(biorhythmBean: BiorhythmBean): RemoteBiorhythmBean {
   return {
     enable: biorhythmBean.enable,
-    repeatPeriod: biorhythmBean.weeks,
+    repeatPeriod: biorhythmBean.weeks.slice(0, 7),
     gradientWay: BiorhythmGradientTypeMap[biorhythmBean.gradient],
     rhythmPlan: biorhythmBean.planList.map(plan => {
       const hour = Math.trunc(plan.time / 60).toString().padStart(2, '0')

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -75,7 +75,7 @@ const getDpResultByYear = async (devId: string, addEleDpCode: string, dateStr: s
           key: `${monthFormat(month)} ${year}`,
           value: (Number(curMonth[month]) || 0).toFixed(2),
           headlineText: `${year}${month}`,
-          chartTitle: `${monthFormatShort(month)}\n${year}`
+          chartTitle: `${monthFormatShort(month)}`
         }
       })
     }
@@ -99,7 +99,7 @@ const getDpResultByYearMonth = async (devId: string, addEleDpCode: string, dateS
 
       // 格式化为 '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 +107,7 @@ const getDpResultByYearMonth = async (devId: string, addEleDpCode: string, dateS
         key,
         value: Number(dayList[time] || 0).toFixed(2),
         headlineText: formattedDate,
-        chartTitle: `${Number(key?.split('/')[0])}\n${loopsText[dayOfWeek]}`
+        chartTitle: `${Number(key?.split('.')[0])} ${loopsText[dayOfWeek]}`
       }
     })
   }

package/src/newModules/energyConsumption/EnergyConsumptionChart.tsx

@@ -31,6 +31,7 @@ const { withTheme } = Utils.ThemeUtils
 export interface EnergyConsumptionChartProps {
   addEleDpCode: string
   powerDpCode: string
+  backTitle: string
   headlineText: string
   chartData: OverviewItem[],
   over365Days?: boolean
@@ -45,7 +46,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
   const isFocused = useIsFocused()
 
   const params = useRoute().params as EnergyConsumptionChartProps
-  const { price, unit, date, addEleDpCode, powerDpCode, over365Days, over7Days } = params
+  const { backTitle, price, unit, date, addEleDpCode, powerDpCode, over365Days, over7Days } = params
 
   useInterval(() => {
       if (isFocused) {
@@ -179,7 +180,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])
@@ -214,7 +215,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
 
   return (
     <Page
-      backText={I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}
+      backText={backTitle}
       showGreenery={false}
       loading={state.loading}
       greeneryIcon={res.energy_consumption_greenery}

package/src/newModules/energyConsumption/EnergyConsumptionDetail.tsx

@@ -27,6 +27,7 @@ const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
 export interface EnergyConsumptionDetailProps {
+  backTitle: string
   addEleDpCode: string
   powerDpCode: string
   curMonth: OverviewItem
@@ -87,7 +88,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]})`
@@ -95,7 +96,7 @@ const EnergyConsumptionDetail = (props: {theme?: ThemeType}) => {
           key,
           value: Number(dayList[time] || 0).toFixed(2),
           headlineText: formattedDate,
-          chartTitle: `${Number(key?.split('/')[0])}\n${loopsText[dayOfWeek]}`
+          chartTitle: `${Number(key?.split('.')[0])} ${loopsText[dayOfWeek]}`
         }
       })
 
@@ -104,7 +105,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) {
@@ -189,7 +190,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={() => {
@@ -277,6 +278,7 @@ const EnergyConsumptionDetail = (props: {theme?: ThemeType}) => {
               headlineText={I18n.getLang('consumption_data_monthly_overview_field2_headline_text')}
               headlineClick={() => {
                 navigation.navigate(ui_biz_routerKey.ui_biz_energy_consumption_chart, {
+                  backTitle: params.backTitle,
                   headlineText: params.curMonth.key,
                   chartData: state.overviewList,
                   over365Days: state.over365Days,
@@ -292,6 +294,7 @@ const EnergyConsumptionDetail = (props: {theme?: ThemeType}) => {
                 const res = await getHourList(item)
                 state.loading = false
                 navigation.navigate(ui_biz_routerKey.ui_biz_energy_consumption_chart, {
+                  backTitle: params.backTitle,
                   headlineText: item.key,
                   chartData: res,
                   over7Days: state.over7Days,

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -188,7 +188,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
@@ -222,6 +222,10 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
     return titleMapping[value ? 0 : 1]
   }
 
+  const backTitle = useMemo(() => {
+    return I18n.getLang(isGeneration ? 'sockets_headline_power' : 'consumption_data_annual_bar_chart_system_back_text')
+  }, [isGeneration])
+
   const styles = StyleSheet.create({
     showTip: {
       marginHorizontal: cx(24)
@@ -318,8 +322,8 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
   return (
     <Page
       style={{ position: 'relative' }}
-      backText={I18n.getLang(isGeneration ? 'sockets_headline_power' : 'consumption_data_annual_bar_chart_system_back_text')}
-      headlineText={I18n.getLang(isGeneration ? 'sockets_headline_power' : 'consumption_data_annual_bar_chart_system_back_text')}
+      backText={backTitle}
+      headlineText={backTitle}
       headlineIcon={state.overviewList.length ? res.download_icon : undefined}
       onHeadlineIconClick={() => {
         const values = state.overviewList.map(item => [item.key, item.value, (Number(state.price) * Number(item.value)).toFixed(2)])
@@ -358,6 +362,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
                 return
               }
               navigation.navigate(ui_biz_routerKey.ui_biz_energy_consumption_chart, {
+                backTitle,
                 headlineText: chartHeadline,
                 chartData: state.overviewList,
                 price: state.price,
@@ -504,6 +509,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
               headlineText={I18n.getLang('consumption_data_field4_headline_text')}
               headlineClick={() => {
                 navigation.navigate(ui_biz_routerKey.ui_biz_energy_consumption_chart, {
+                  backTitle,
                   headlineText: chartHeadline,
                   chartData: state.overviewList,
                   price: state.price,
@@ -515,6 +521,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
               }}
               overviewItemClick={(item) => {
                 navigation.navigate(ui_biz_routerKey.ui_biz_energy_consumption_detail, {
+                  backTitle,
                   addEleDpCode: params.addEleDpCode,
                   powerDpCode: params.powerDpCode,
                   curMonth: item,

package/src/newModules/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/newModules/energyConsumption/component/NewBarChart.tsx

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

package/src/newModules/energyConsumption/component/PowerLineChart.tsx

@@ -26,6 +26,7 @@ const PowerLineChart = (props: PowerLineChartProps) => {
       show: true,
       triggerOn: 'mousemove|click',
       trigger: 'axis',
+      position: ['30%', '50%']
     },
     grid: {
       right: 0

package/src/newModules/timeSchedule/Router.ts

@@ -1,7 +1,8 @@
-import {NavigationRoute} from "tuya-panel-kit";
-import NewTimeSchedulePage from "./TimeSchedulePage";
-import NewTimeScheduleEditPage from "./TimeScheduleDetailPage";
-import {ui_biz_routerKey} from "../../navigation/Routers";
+import { NavigationRoute } from 'tuya-panel-kit'
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import NewTimeScheduleAddPage from './TimeScheduleAddPage'
+import NewTimeScheduleEditPage from './TimeScheduleDetailPage'
+import NewTimeSchedulePage from './TimeSchedulePage'
 
 const NewTimeSchedulePageRouters: NavigationRoute[] = [
   {
@@ -12,6 +13,14 @@ const NewTimeSchedulePageRouters: NavigationRoute[] = [
       showOfflineView: false,
     },
   },
+  {
+    name: ui_biz_routerKey.ui_biz_time_schedule_add_new,
+    component: NewTimeScheduleAddPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    },
+  },
   {
     name: ui_biz_routerKey.ui_biz_time_schedule_edit_new,
     component: NewTimeScheduleEditPage,

package/src/newModules/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.ui_biz_time_schedule_edit_new, {
+      ...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/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -1,52 +1,54 @@
-import React, {useCallback, useEffect, useMemo} from 'react';
-import {FlatList, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View,} from 'react-native';
-import {useNavigation} from '@react-navigation/core';
-import Page from '@ledvance/base/src/components/Page';
-import I18n from '@ledvance/base/src/i18n';
-import TextField from '@ledvance/base/src/components/TextField';
-import {cloneDeep, isEqual} from 'lodash';
-import {useReactive} from 'ahooks';
-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 { ComponentConfig, DeviceType, Timer, TimerActions, TimeScheduleDetailState,} from './Interface';
-import res from '@ledvance/base/src/res';
-import {useDeviceId, useMoods, useSystemTimeFormate,} from '@ledvance/base/src/models/modules/NativePropsSlice';
-import {TimeSchedulePageParams} from './TimeSchedulePage';
-import {Result} from '@ledvance/base/src/models/modules/Result';
-import DeleteButton from '@ledvance/base/src/components/DeleteButton';
-import InfoText from '@ledvance/base/src/components/InfoText';
-import SegmentControl from '@ledvance/base/src/components/segmentControl';
-import {useParams} from '@ledvance/base/src/hooks/Hooks';
-import ManualSettings from './components/ManuaSettings';
+import DeleteButton from '@ledvance/base/src/components/DeleteButton'
+import DiySceneItem from '@ledvance/base/src/components/DiySceneItem'
+import InfoText from '@ledvance/base/src/components/InfoText'
+import Page from '@ledvance/base/src/components/Page'
+import SegmentControl from '@ledvance/base/src/components/segmentControl'
+import Spacer from '@ledvance/base/src/components/Spacer'
+import Summary from '@ledvance/base/src/components/Summary'
+import Tag from '@ledvance/base/src/components/Tag'
+import TextField from '@ledvance/base/src/components/TextField'
+import LdvWeekView from '@ledvance/base/src/components/weekSelect'
+import ThemeType from '@ledvance/base/src/config/themeType'
+import { useParams } from '@ledvance/base/src/hooks/Hooks'
+import I18n from '@ledvance/base/src/i18n'
+import { useDeviceId, useMoods, useSystemTimeFormate, } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { Result } from '@ledvance/base/src/models/modules/Result'
+import res from '@ledvance/base/src/res'
+import { convertTo12HourFormat, loopText, showDialog } from '@ledvance/base/src/utils/common'
+import { ApplyForItem, DiySceneInfo } from '@ledvance/base/src/utils/interface'
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import { useNavigation } from '@react-navigation/core'
+import { useReactive } from 'ahooks'
+import { cloneDeep, isEqual } from 'lodash'
+import React, { useCallback, useEffect, useMemo } from 'react'
+import { FlatList, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View, } from 'react-native'
+import { SwitchButton, TimerPicker, Utils } from 'tuya-panel-kit'
+import { MoodInfo, MoodUIInfo } from '../mood/Interface'
+import { getRemoteMoodList } from '../mood/MoodActions'
+import MoodItem from '../mood/MoodItem'
+import ManualSettings from './components/ManuaSettings'
+import { ComponentConfig, DeviceType, Timer, TimerActions, TimeScheduleDetailState, } from './Interface'
 import {
   defDeviceData,
   defFanLightDeviceData,
   defMixDeviceData,
   defMoodStripDeviceData,
-  defStripDeviceData,
+  defOsramFanLightDeviceData,
   defShutterDeviceData,
-  defOsramFanLightDeviceData
-} from './TimeScheduleActions';
-import MoodItem from '../mood/MoodItem';
-import {getRemoteMoodList} from '../mood/MoodActions';
-import {MoodInfo, MoodUIInfo} from '../mood/Interface';
-import Summary from '@ledvance/base/src/components/Summary'
-import ThemeType from '@ledvance/base/src/config/themeType'
-import Tag from "@ledvance/base/src/components/Tag";
-import DiySceneItem from '@ledvance/base/src/components/DiySceneItem';
-import {ApplyForItem, DiySceneInfo} from "@ledvance/base/src/utils/interface";
+  defStripDeviceData
+} from './TimeScheduleActions'
+import { TimeSchedulePageParams } from './TimeSchedulePage'
 
 const { convertX: cx } = Utils.RatioUtils;
 const { toFixedString } = Utils.NumberUtils;
 const { withTheme } = Utils.ThemeUtils
 
-interface TimeScheduleDetailPageParams extends TimeSchedulePageParams {
+export interface TimeScheduleDetailPageParams extends TimeSchedulePageParams {
   mode: 'add' | 'update';
   timeSchedule: Timer;
   modDeleteTimeSchedule: (mode: TimerActions, timeSchedule: Timer) => Promise<Result<any>>;
   refreshFn: () => void;
+  suggestValue?: boolean
 }
 
 const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
@@ -81,7 +83,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)
@@ -123,6 +125,12 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
       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)) {
@@ -360,7 +368,7 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
         });
         state.loading = false;
         if (res.success) {
-          navigation.goBack();
+          navigation.navigate(ui_biz_routerKey.ui_biz_time_schedule_new)
         }
       }}
       backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

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