@ledvance/ui-biz-bundle 1.1.131 → 1.1.133

package/package.json

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

package/src/hooks/DeviceDpStateHooks.ts

@@ -112,7 +112,8 @@ export const useConflictTask = (conflictDps: ConflictDps, isPlug?: boolean): [(v
       const biorhythmTask = {
         startTime: 0,
         endTime: 1440,
-        weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0)
+        weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0),
+        channel: 1
       }
       if (isConflictTask(conflictItem, biorhythmTask)){
         newState[conflictDps.biorhythmDpCode] = {

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -272,7 +272,8 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
               startTime: 0,
               endTime: 1440,
               weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0),
-              enable: biorhythm.enable
+              enable: biorhythm.enable,
+              channel: 1
             }
             if (enable && checkConflict(biorhythmTask)) {
               return showCommonDialog({

package/src/newModules/diyScene/DiySceneEditorPage.tsx

@@ -224,7 +224,7 @@ const DiySceneEditorPage = (props: { theme?: ThemeType }) => {
             maxLength={33}
             showError={state.sceneInfo.name.length > 32 || nameRepeat}
             tipColor={nameRepeat ? props.theme?.global.error : undefined}
-            tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
+            tipIcon={nameRepeat ? { uri: res.ic_text_field_input_error } : undefined}
             errorText={I18n.getLang(
               nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text'
             )}
@@ -233,19 +233,16 @@ const DiySceneEditorPage = (props: { theme?: ThemeType }) => {
             state.sceneInfo.type === 'DIY' && <Card style={styles.nodeCard}>
                   <View style={styles.nodeOperation}>
                     {state.sceneInfo.nodes.length < 8 && <TouchableOpacity onPress={() => {
-                      console.log('onPress add node')
                       const color = {h: state.h, s: state.s * 10, v: 1000}
                       state.sceneInfo.nodes.push({top: color, bottom: color});
                     }}>
-                        <Image source={{uri: res.ic_plus}} style={{tintColor: props.theme?.icon.primary}} />
+                        <Image source={{uri: res.ic_plus}} style={{width: cx(25), height: cx(25), tintColor: props.theme?.icon.primary}} />
                     </TouchableOpacity>}
                     { state.sceneInfo.nodes.length > 2 && <TouchableOpacity onPress={() => {
-                      console.log('onPress delete node')
                       state.sceneInfo.nodes.splice(state.currentNode, 1)
                       state.currentNode = state.currentNode === state.sceneInfo.nodes.length ? 0 : state.currentNode
-                      console.log('nextNode', state.currentNode)
                     }}>
-                        <Image source={{uri: res.ic_mood_del}} style={{marginLeft: cx(5),tintColor: props.theme?.icon.primary}} />
+                        <Image source={{uri: res.ic_mood_del}} style={{width: cx(25), height: cx(25), marginLeft: cx(5),tintColor: props.theme?.icon.primary}} />
                     </TouchableOpacity>}
                   </View>
                   <View style={styles.nodeList}>
@@ -321,6 +318,7 @@ const DiySceneEditorPage = (props: { theme?: ThemeType }) => {
                         state.sceneInfo.speed = v
                       }}
                       subTitleStr={`${(state.sceneInfo.speed || 1)}/100`}/>
+                  <Spacer />
               </Card>
           }
 

package/src/newModules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -123,7 +123,8 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
       const currentSleepWakeUp = {
         ...sleepWakeUp,
         startTime: getStartTime(sleepWakeUp),
-        endTime: getEndTime(sleepWakeUp)
+        endTime: getEndTime(sleepWakeUp),
+        channel: 1
       }
       const newSleepList = cloneSleepPlan.map((item, idx) => {
         const itself = isSleep ? (mode === 'add' ? (idx === cloneSleepPlan.length - 1) : sleepWakeUp.id === item.id) : isSleep

package/src/newModules/timeSchedule/components/ScheduleCard.tsx

@@ -6,7 +6,7 @@ import { convertTo12HourFormat, loopText } from '@ledvance/base/src/utils/common
 import { ApplyForItem, Timer } from "../Interface";
 import { useSystemTimeFormate } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import ThemeType from '@ledvance/base/src/config/themeType'
-
+import Spacer from "@ledvance/base/src/components/Spacer";
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 
@@ -117,7 +117,7 @@ const ScheduleCard = (props: ScheduleCardProps) => {
           />
         </View>
       </View>
-      {showTag && <View style={styles.typeContainer}>
+      {showTag ? <View style={styles.typeContainer}>
         {showTags.map(tag => (
           <View style={styles.tag} key={tag.dp}>
             <Text style={styles.tagTitle}>
@@ -125,10 +125,10 @@ const ScheduleCard = (props: ScheduleCardProps) => {
             </Text>
           </View>
         ))}
-      </View>}
+      </View> : <Spacer height={cx(16)} />}
     </Card>
   )
 
 }
 
-export default withTheme(ScheduleCard)
+export default withTheme(ScheduleCard) as React.ComponentType<ScheduleCardProps>