@ledvance/group-ui-biz-bundle 1.0.48 → 1.0.50

package/package.json

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

package/src/modules/biorhythm/BiorhythmActions.ts

@@ -68,7 +68,7 @@ export function dp2Obj(dp: string): BiorhythmBean {
     // 分钟
     const minute = hex2Int(hex.slice(0, 2)).toString().padStart(2, '0')
     hex = hex.slice(2)
-    const time = hour * 60 + minute
+    const time = Number(hour) * 60 + Number(minute)
     // 色调 (色相)
     hex2Int(hex.slice(0, 4))
     hex = hex.slice(4)

package/src/modules/biorhythm/BiorhythmDetailPage.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react'
+import React, { useCallback, useMemo } from 'react'
 import { Image, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import { useNavigation } from '@react-navigation/native'
 import { TimerPicker, Utils } from 'tuya-panel-kit'
@@ -29,6 +29,7 @@ export interface BiorhythmEditPageParams {
   onPlanEdited: (isAdd: boolean, plan: Plan) => void
   onPlanDelete: (id: number) => void
   minimumEnable: (plan: Plan) => boolean
+  nameRepeat: (plan: Plan) => boolean
   iconIdList?: any
   isMixLight: boolean
   isSupportTemperature: boolean
@@ -46,16 +47,15 @@ const BiorhythmEditPage = () => {
     onPlanEdited,
     onPlanDelete,
     minimumEnable,
+    nameRepeat,
     iconIdList,
     isMixLight,
     isSupportTemperature,
     isSupportBrightness,
     showDeleteBtn
   } = params
-  const [hour, minute] = planData.startTime.split(':')
+
   const state = useReactive({
-    hour: Number(hour),
-    minute: Number(minute),
     iconIdList,
     planData: cloneDeep(planData),
     backStatus: false,
@@ -92,15 +92,27 @@ const BiorhythmEditPage = () => {
     return imgIcon
   }
 
+  const nameRepeatFlag = useMemo(() =>{
+    return nameRepeat(state.planData)
+  }, [state.planData.name])
+
+  const checkBiorhythmDataChanged = useMemo(() =>{
+    return isEqual(state.planData, planData)
+  }, [JSON.stringify(state.planData), planData])
+
+  const canSaveMoodData = useMemo(() =>{
+    return state.planData.name.length > 0 && state.planData.name.length < 33 && !nameRepeatFlag && !checkBiorhythmDataChanged && !minimumTipEnable()
+  }, [nameRepeatFlag, state.planData.name, checkBiorhythmDataChanged])
+
   return (
     <Page
       backText={I18n.getLang('add_new_trigger_time_system_back_text')}
       headlineText={I18n.getLang(isAdd ? 'add_new_trigger_time_headline_text' : 'edit_trigger_time_headline_text')}
       backDialogTitle={I18n.getLang('manage_user_unsaved_changes_dialog_headline')}
       backDialogContent={I18n.getLang('cancel_dialog_leave_unsaved_bio_rhythm_note')}
-      showBackDialog={saveEnable() && !minimumTipEnable()}
-      rightButtonIcon={(saveEnable() && !minimumTipEnable()) ? res.ic_check : res.ic_uncheck}
-      rightButtonIconClick={onTopBarRightBtnClick}
+      showBackDialog={!checkBiorhythmDataChanged}
+      rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck}
+      rightButtonIconClick={canSaveMoodData ? onTopBarRightBtnClick : undefined}
     >
       <ScrollView>
         <View
@@ -120,20 +132,19 @@ const BiorhythmEditPage = () => {
             }} />
 
           <Spacer />
-          <TimerPicker 
+          <TimerPicker
             itemTextColor='#aeadb5'
-            style={{paddingVertical: cx(0), marginVertical: cx(0)}}
+            style={{ paddingVertical: cx(0), marginVertical: cx(0) }}
             is12Hours={!is24Hour}
             singlePicker={true}
-            startTime={state.hour * 60 + state.minute}
             amText={I18n.getLang('manage_user_calendar_label_am')}
             pmText={I18n.getLang('manage_user_calendar_label_pm')}
-            symbol=''
-            onTimerChange={(startTime) => {
-              state.hour = Math.trunc(startTime / 60)
-              state.minute = startTime % 60
-              state.planData.startTime = `${state.hour.toString().padStart(2, '0')}:${state.minute.toString().padStart(2, '0')}`
-            }}/>
+            startTime={state.planData.time}
+            symbol={''}
+            onTimerChange={(time) => {
+              state.planData.time = time
+            }}
+          />
           {minimumTipEnable() && <View style={{ flexDirection: 'row', marginVertical: cx(5) }}>
             <Image style={{ width: cx(16), height: cx(16), tintColor: '#000' }} source={res.ic_info} />
             <Text

package/src/modules/biorhythm/BiorhythmPage.tsx

@@ -17,6 +17,7 @@ import pIdList from './pIdList'
 import {
   useDeviceInfo,
   useGroupDevices,
+  useSystemTimeFormate,
 } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import I18n from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
@@ -26,7 +27,7 @@ import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
 import { setDataSource } from '@ledvance/base/src/components/weekSelect'
 import { BiorhythmEditPageParams } from './BiorhythmDetailPage'
 import { useBiorhythm } from './BiorhythmActions'
-import { showDialog as showCommonDialog, showDialog } from '@ledvance/base/src/utils/common'
+import { convertMinutesTo12HourFormat, showDialog as showCommonDialog, showDialog } from '@ledvance/base/src/utils/common'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import Page from '@ledvance/base/src/components/Page'
 import Spacer from '@ledvance/base/src/components/Spacer'
@@ -58,6 +59,7 @@ const BiorhythmPage = () => {
   const [biorhythm, setBiorhythm] = useBiorhythm()
   const deviceInfo = useDeviceInfo()
   const [groupDevices] = useGroupDevices()
+  const is24Hour = useSystemTimeFormate()
   const { productId } = deviceInfo
   const devicesJudge = pIdList.some(val => val === productId)
 
@@ -76,7 +78,7 @@ const BiorhythmPage = () => {
   const onPlanEdited = useCallback((isAdd: boolean, newPlan: Plan) => {
     if (isAdd) {
       state.planList.push(newPlan)
-      state.planList = sortBy(state.planList, p => p.startTime)
+      state.planList = sortBy(state.planList, p => p.time)
     } else {
       state.planList = state.planList.map(plan => (plan.id === newPlan.id ? newPlan : plan))
     }
@@ -116,7 +118,7 @@ const BiorhythmPage = () => {
 
   const minimumEnable = useCallback((plan: Plan) => {
     let enable = false
-    state.planList.filter(p => p.index !== plan.id).forEach(item => {
+    state.planList.filter(p => p.id !== plan.id).forEach(item => {
       const diff = Math.abs(plan.time - item.time)
       if (diff < 15) enable = true
     })
@@ -235,6 +237,10 @@ const BiorhythmPage = () => {
     return availableChart[randomIndex]
   }
 
+  const nameRepeat = useCallback((plan: Plan) => {
+    return !!state.planList.filter(p => p.id !== plan.id).find(p => p.name === plan.name)
+  }, [state.planList])
+
   return (
     <Page
       backText={deviceInfo.name}
@@ -365,7 +371,7 @@ const BiorhythmPage = () => {
                 state.planList = state.planList.map(plan => {
                   return {
                     ...plan,
-                    time: plan.index === id ? time : plan.time,
+                    time: plan.id === id ? time : plan.time,
                   }
                 })
                 state.flag = Symbol()
@@ -426,6 +432,7 @@ const BiorhythmPage = () => {
                         isAdd: true,
                         onPlanEdited,
                         onPlanDelete,
+                        nameRepeat,
                         minimumEnable,
                         iconIdList: state.planList?.map(item => {
                           return item.iconId
@@ -481,6 +488,7 @@ const BiorhythmPage = () => {
                           isAdd: false,
                           onPlanEdited,
                           onPlanDelete,
+                          nameRepeat,
                           minimumEnable,
                           iconIdList: state.planList?.map(item => {
                             return item.iconId
@@ -518,7 +526,7 @@ const BiorhythmPage = () => {
                                 fontFamily: 'helvetica_neue_lt_std_roman',
                               }}
                             >
-                              {item.startTime}
+                              {convertMinutesTo12HourFormat(item.time, is24Hour)}
                             </Text>
                           </View>
                           <Switch
@@ -603,7 +611,7 @@ const BiorhythmPage = () => {
                   width: '100%',
                   height: '100%',
                   position: 'absolute',
-                  top: cx(45),
+                  top: 0,
                   zIndex: 999,
                 }}
               />
@@ -637,8 +645,8 @@ const BiorhythmPage = () => {
           confirmText={I18n.getLang('auto_scan_system_wifi_confirm')}
           onConfirm={(item: BiorhythmGradientType) => {
             state.gradient = item
-            state.flag = Symbol()
             showGradientTypeSelectModal(false)
+            state.flag = Symbol()
           }}
         />
       </>