@ledvance/ui-biz-bundle 1.0.57 → 1.0.59

package/package.json

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

package/src/modules/biorhythm/BiorhythmEditPage.tsx

@@ -250,6 +250,7 @@ const BiorhythmEditPage = () => {
               <ColorTempAdjustView
                 colorTemp={state.colorTemperature}
                 brightness={Number(state.brightness.toFixed())}
+                minBrightness={0}
                 onCCTChange={newValue => {
                   state.colorTemperature = newValue
                   state.action[0].startValue = `${colorTemperatureValue(newValue)}`

package/src/modules/biorhythm/BiorhythmPage.tsx

@@ -29,7 +29,7 @@ import {useRoute} from '@react-navigation/core'
 import {BiorhythmEditPageParams} from './BiorhythmEditPage'
 import {useBiorhythm, userOperation} from './BiorhythmActions'
 import {useSleepPlan, useWakeUpPlan} from '../sleepWakeup/SleepWakeUpActions'
-
+import { showDialog as showCommonDialog } from '@ledvance/base/src/utils/common'
 const cx = Utils.RatioUtils.convertX
 const width = Utils.RatioUtils.width
 
@@ -123,12 +123,10 @@ const BiorhythmPage = () => {
     })
     console.log('设置生物节律数据', state)
     await userOperation(deviceId, false)
+    const res = await setBiorhythm(deviceId, {...state, planList})
     state.loading = false
-    const res = await setBiorhythm(deviceId, {...state, enable: !state.enable, planList})
     console.log('设置生物节律res', res)
     if (res.success) {
-      state.enable = !state.enable
-      state.showMaskModal = state.enable
       console.log('设置生物节律 OK')
     }
   }, [])
@@ -400,6 +398,7 @@ const BiorhythmPage = () => {
               onValueChange={async enable => {
                 if (enable && (sleepWakeUpStatus || enableTimeScheduleStatus)) return showDialog(enable)
                 state.loading = true
+                state.enable = enable
                 state.flag = Symbol()
               }}
             />
@@ -506,7 +505,7 @@ const BiorhythmPage = () => {
             }}
             replaceStatus={devicesJudge}
             gradient={state.gradient === BiorhythmGradientType.DirectGradient}
-            isSupportTemperature={params.isSupportTemperature}/>
+            isSupportTemperature={!params.isSupportTemperature}/>
           <View
             style={{
               flexDirection: 'row',
@@ -710,12 +709,19 @@ const BiorhythmPage = () => {
                     <TouchableOpacity
                       style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}
                       onPress={() => {
-                        const defBiorhythmUIState = getDefBiorhythmUIState()
-                        state.enable = defBiorhythmUIState.enable
-                        state.gradient = defBiorhythmUIState.gradient
-                        state.repeatPeriod = defBiorhythmUIState.repeatPeriod
-                        state.planList = defBiorhythmUIState.planList
-                        state.flag = Symbol()
+                        showCommonDialog({
+                          method: 'confirm',
+                          title: I18n.getLang('bio_ryhthm_reset_description_text'),
+                          onConfirm: (_, {close}) =>{
+                            const defBiorhythmUIState = getDefBiorhythmUIState()
+                            state.enable = defBiorhythmUIState.enable
+                            state.gradient = defBiorhythmUIState.gradient
+                            state.repeatPeriod = defBiorhythmUIState.repeatPeriod
+                            state.planList = defBiorhythmUIState.planList
+                            state.flag = Symbol()
+                            close()
+                          }
+                        })
                       }}>
                       <Text
                         style={{

package/src/modules/timeSchedule/SingleLightView.tsx

@@ -140,6 +140,7 @@ export default function SingleLightView(props: SingleLightViewProps) {
                   h={state.actions.h}
                   s={state.actions.s}
                   v={state.actions.v}
+                  reserveSV={true}
                   onHSVChange={setHSVState}
                   onHSVChangeComplete={setColourStateAction}
                   colorTemp={state.actions.temperature}

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -40,6 +40,8 @@ export interface LightData {
   isManual: boolean
 }
 
+const MAXNUM = 30
+
 export interface TimeSchedulePageRouteParams extends JudgeTimeScheduleProps {
   dps: dpItem[],
   lightData2dps?: (data: LightData) => any
@@ -185,6 +187,10 @@ const TimeSchedulePage = () => {
     return Object.values(state.filterTags).length > 1 && state.timeScheduleList.length > 0
   }, [state.filterTags, state.timeScheduleList])
 
+  const showMaxNumTip = useCallback(() =>{
+    return state.timeScheduleList.length >= MAXNUM
+  }, [state.timeScheduleList.length])
+
   const showScheduleList = useCallback(() => {
     return !!state.filterScheduleList.length
   }, [state.filterScheduleList])
@@ -203,7 +209,7 @@ const TimeSchedulePage = () => {
       backText={deviceInfo.name}
       onBackClick={navigation.goBack}
       headlineText={I18n.getLang('timeschedule_overview_headline_text')}
-      headlineIcon={res.device_panel_schedule_add}
+      headlineIcon={!showMaxNumTip() ? res.device_panel_schedule_add : undefined}
       onHeadlineIconClick={() => {
         navigateToEdit('add')
       }}
@@ -214,7 +220,11 @@ const TimeSchedulePage = () => {
             color: '#000',
             marginLeft: cx(24),
           }}>{I18n.getLang('timeschedule_overview_description_text')}</Text>
-          <Spacer/>
+          <Spacer height={cx(10)}/>
+          {showMaxNumTip() && <View style={{marginHorizontal: cx(24), flexDirection: 'row', alignItems: 'center'}}>
+            <Image style={{ width: cx(16), height: cx(16), tintColor: '#ff9500' }} source={res.ic_warning_amber} />
+            <Text>{I18n.getLang('motion_detection_time_schedule_notifications_warning_text')}</Text>
+          </View>}
           {showTags() && <View style={styles.categoryList}>
             {Object.keys(state.filterTags).map(tag => {
               return <Tag