@ledvance/ui-biz-bundle 1.0.53 → 1.0.54

package/package.json

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

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -16,7 +16,7 @@ import { useDeviceId } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import res from '@ledvance/base/src/res'
 import { useReactive } from 'ahooks'
 import { dpItem, TimeSchedulePageRouteParams } from './TimeSchedulePage'
-import { cloneDeep, differenceBy, isEqual } from 'lodash'
+import { cloneDeep, differenceBy, isEqual, isNumber } from 'lodash'
 import DeviceState from './DeviceState'
 import { getHexByHSV, getHSVByHex } from '@ledvance/base/src/utils'
 import { Buffer } from 'buffer'
@@ -87,7 +87,7 @@ const TimeScheduleEditPage = () => {
       state.hour = scheduleItem.time.split(':')[0]
       state.minute = scheduleItem.time.split(':')[1]
       state.name = scheduleItem.aliasName
-      state.isNotification = scheduleItem.isAppPush
+      state.isNotification = !!scheduleItem.isAppPush
       state.loop = scheduleItem.loops.split('').map((mItem: string) => parseInt(mItem))
       state.selectedSkill = dps.reduce((pre, cur) => {
         if (scheduleItem.dps[cur.dpId] !== undefined) {
@@ -106,8 +106,6 @@ const TimeScheduleEditPage = () => {
         }
         state.isManual = lightData.isManual
         state.actionScene = lightData.actionScene
-
-        console.log('singleActions', JSON.stringify(state.singleActions))
         return
       }
 
@@ -175,7 +173,14 @@ const TimeScheduleEditPage = () => {
   }
 
   const saveEnable = () => {
-    return state.name.length > 0 && state.name.length <= 32 && !!state.selectedSkill.length
+    return !state.loading && state.selectedSkill.length && state.name.length && state.name.length <= 32 &&
+      [
+        !isEqual(scheduleItem?.aliasName, state.name),
+        !isEqual(scheduleItem?.time, [state.hour, state.minute].join(':')),
+        !isEqual(scheduleItem?.loops, state.loop.join('')),
+        !isEqual(!!scheduleItem?.isAppPush, state.isNotification),
+        !isEqual(scheduleItem?.dps, getSendDps()),
+      ].some(e => e)
   }
 
   const saveAction = () => {
@@ -229,6 +234,14 @@ const TimeScheduleEditPage = () => {
   }
 
   const getSendDps = () => {
+    if (props.lightData2dps) {
+      return props.lightData2dps({
+        singleActions: state.singleActions,
+        mixActions: state.mixActions,
+        actionScene: isNumber(state.actionScene?.id) ? state.actionScene : undefined,
+        isManual: state.isManual,
+      })
+    }
     if (state.isManual) {
       if (props.isDIMLamp) {
         return {
@@ -349,13 +362,7 @@ const TimeScheduleEditPage = () => {
   }
 
   const getAllDps = () => {
-    const incommingValue = props.lightData2dps ? props.lightData2dps({
-      singleActions: state.singleActions,
-      mixActions: state.mixActions,
-      actionScene: state.actionScene,
-      isManual: state.isManual,
-    }) : ''
-    const dpsValue = incommingValue || getSendDps()
+    const dpsValue = getSendDps()
     if (state.isManual && !props.isMixRGBWLamp) {
       let v = {}
       state.selectedSkill.forEach(skill => {
@@ -371,7 +378,7 @@ const TimeScheduleEditPage = () => {
   }
 
   const setSendDps = useCallback((actions, type) => {
-    console.log('setSendDps', actions, type)
+    console.log('setSendDps --->', actions, type)
     state[type] = actions
   }, [])
 
@@ -431,17 +438,9 @@ const TimeScheduleEditPage = () => {
   return (
     <Page
       backText={I18n.getLang('motion_detection_add_time_schedule_system_back_text')}
-      onBackClick={navigation.goBack}
       rightButtonIcon={saveEnable() ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={() => saveAction()}
-      rightButtonDisabled={
-        state.loading ||
-        (scheduleItem?.aliasName === state.name &&
-          JSON.stringify(scheduleItem?.time) === JSON.stringify([state.hour, state.minute].join(':')) &&
-          JSON.stringify(scheduleItem?.loops) === JSON.stringify(state.loop.join('')) &&
-          scheduleItem?.isAppPush === state.isNotification &&
-          isEqual(scheduleItem?.dps, getSendDps()))
-      }
+      rightButtonDisabled={!saveEnable()}
       showBackDialog={true}
       backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}
       backDialogContent={I18n.getLang('cancel_dialog_leave_unsaved_timeschedule_note')}>
@@ -459,8 +458,7 @@ const TimeScheduleEditPage = () => {
               state.name = t
             }}
             showError={state.name.length > 32}
-            errorText={I18n.getLang('add_new_dynamic_mood_alert_text')}
-          />
+            errorText={I18n.getLang('add_new_dynamic_mood_alert_text')}/>
           {/* pick */}
           <LdvPickerView
             style={styles.picker}
@@ -468,14 +466,12 @@ const TimeScheduleEditPage = () => {
             minute={state.minute}
             setHour={v => (state.hour = v)}
             setMinute={v => (state.minute = v)}
-            unit={['h', 'min']}
-          />
+            unit={['h', 'min']}/>
           {/* week */}
           <LdvWeekView
             value={state.loop}
             style={styles.zeroMarginHorizontal}
-            onSelect={selectWeekAction}
-          />
+            onSelect={selectWeekAction}/>
           <Text style={styles.loopText}>{loopText(state.loop)}</Text>
           {/* Apply for */}
           <View>
@@ -496,13 +492,11 @@ const TimeScheduleEditPage = () => {
                     marginHorizontal: cx(8),
                     marginTop: cx(8),
                     borderRadius: 4,
-                  }}
-                >
+                  }}>
                   <FlatList
                     data={state.selectedSkill}
                     renderItem={item => renderItem(item)}
-                    keyExtractor={(item) => item.dpId + 'selected'}
-                  />
+                    keyExtractor={(item) => item.dpId + 'selected'}/>
                 </View>}
             </View>
             {state.skillList.map((item) => {
@@ -542,8 +536,7 @@ const TimeScheduleEditPage = () => {
             isFanLamp={props.isFanLamp}
             isSupportMode={props.isSupportMode}
             isSupportBrightness={props.isSupportBrightness}
-            isSupportTemperature={props.isSupportTemperature}
-          />
+            isSupportTemperature={props.isSupportTemperature}/>
           {!hasSelected() && <View style={{ flexDirection: 'row', alignItems: 'center' }}>
               <Image style={{ width: cx(16), height: cx(16), tintColor: '#FF9500' }} source={res.ic_warning_amber}/>
               <Text style={{
@@ -559,8 +552,7 @@ const TimeScheduleEditPage = () => {
               value={state.isNotification}
               onValueChange={value => {
                 state.isNotification = value
-              }}
-            />
+              }}/>
           </View>
           {/* Summary */}
           <View>
@@ -610,24 +602,26 @@ const TimeScheduleEditPage = () => {
               <View style={{marginLeft: cx(16)}}>
                 {!!state.selectedSkill.length && <>
                   {(!!state.selectedSkill.filter(skill => skill.enable).length) && <>
-                      <Text style={{marginLeft: cx(5)}}>{I18n.getLang('feature_summary_action_txt_1')}</Text>
+                      <Text style={{ marginLeft: cx(5) }}>{I18n.getLang('feature_summary_action_txt_1')}</Text>
                       <View style={{ flexDirection: 'row' }}>{
                         state.selectedSkill.filter(skill => skill.enable).map(item => (
-                          <View style={[styles.summaryRight, {marginLeft: cx(5), marginBottom: cx(5)}]} key={item.dpId}>
+                          <View style={[styles.summaryRight, { marginLeft: cx(5), marginBottom: cx(5) }]}
+                                key={item.dpId}>
                             <Text style={[styles.rightItem]}
-                                >{item.label}</Text>
+                            >{item.label}</Text>
                           </View>
                         ))
                       }</View>
                   </>}
 
                   {(!!state.selectedSkill.filter(skill => !skill.enable).length) && <>
-                      <Text style={{marginLeft: cx(5)}}>{I18n.getLang('feature_summary_action_txt_2')}</Text>
+                      <Text style={{ marginLeft: cx(5) }}>{I18n.getLang('feature_summary_action_txt_2')}</Text>
                       <View style={{ flexDirection: 'row' }}>{
                         state.selectedSkill.filter(skill => !skill.enable).map(item => (
-                          <View style={[styles.summaryRight, {marginLeft: cx(5), marginBottom: cx(5)}]} key={item.dpId}>
+                          <View style={[styles.summaryRight, { marginLeft: cx(5), marginBottom: cx(5) }]}
+                                key={item.dpId}>
                             <Text style={[styles.rightItem]}
-                                >{item.label}</Text>
+                            >{item.label}</Text>
                           </View>
                         ))
                       }</View>

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -51,8 +51,6 @@ const TimeSchedulePage = () => {
   const navigation = useNavigation()
   const props = useRoute().params as TimeSchedulePageRouteParams
 
-  console.log('TimeSchedulePage params', props)
-
   const { dps } = props
   const state = useReactive({
     timeScheduleList: [] as any[],
@@ -78,7 +76,6 @@ const TimeSchedulePage = () => {
       const checkedTags = Object.keys(state.filterTags).filter(tag => state.filterTags[tag])
       state.filterScheduleList = state.timeScheduleList.filter(item => checkedTags.every(tag => item.dps[tag] !== undefined))
     }
-    console.log('过滤后ScheduleList', state.filterScheduleList)
   }, [state.filterTags])
 
   const navigateToEdit = useCallback((mode: 'add' | 'edit', scheduleItem?: any) => {
@@ -107,8 +104,6 @@ const TimeSchedulePage = () => {
       })
       state.timeScheduleList = originList
       state.filterScheduleList = originList
-      console.log('获取TimerScheduleList', res)
-      console.log('获取TimerScheduleList', originList)
       setTimeSchedule(getScheduleRunning())
     }
   }
@@ -182,8 +177,7 @@ const TimeSchedulePage = () => {
         onPress={(item) => navigateToEdit('edit', item)}
         onLongPress={(item) => {
           deleteDialog(item).then()
-        }}
-      />
+        }}/>
     )
   }
 
@@ -238,7 +232,7 @@ const TimeSchedulePage = () => {
               data={state.filterScheduleList}
               keyExtractor={(item: any) => item.id}
               renderItem={renderItem}
-              ListFooterComponent={() => (<Spacer />)}
+              ListFooterComponent={() => (<Spacer/>)}
             />
             :
             <View style={styles.emptyListCon}>