@ledvance/group-ui-biz-bundle 1.0.155 → 1.0.157

package/package.json

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

package/src/modules/biorhythm/BiorhythmPage.tsx

@@ -255,6 +255,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                 defaultValue: `${uaGroupInfo.name}`,
                 cancelText: I18n.getLang('auto_scan_system_cancel'),
                 confirmText: I18n.getLang('auto_scan_system_wifi_confirm'),
+                maxLength: 32,
                 inputWrapperStyle: {backgroundColor: props.theme?.textInput.background, borderRadius: cx(10)},
                 autoFocus: true,
                 onConfirm: (data, { close }) => {
@@ -626,7 +627,6 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                     <ApplyForDeviceList
                       devices={cloneDeep(groupDevices)}
                     />
-                    <Spacer height={cx(5)} />
                     <InfoText
                       icon={res.ic_info}
                       text={I18n.getLang('group_feature_biological_rhythm_applyfor_information')}

package/src/modules/fixedTimeForPlug/FixedTimeForPlugDetailPage.tsx

@@ -38,7 +38,7 @@ const newFixedTimeItem = (): FixedTimeItem => {
     channel: 0,
     weeks: [0, 0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
-    endTime: startTime + 60,
+    endTime: startTime + 30, //Fix https://ledvance.atlassian.net/browse/SUH-12973
     settingTime: new Date().getTime(),
     onTime: 1,
     offTime: 1

package/src/modules/fixedTimingForLight/FixedTimingForLightDetailPage.tsx

@@ -41,7 +41,7 @@ const newFixedTimingItem = (): FixedTimingItem => {
     channel: 0,
     weeks: [0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
-    endTime: startTime + 60,
+    endTime: startTime + 30, //Fix https://ledvance.atlassian.net/browse/SUH-12973
     settingTime: new Date().getTime(),
     openTime: 1,
     closeTime: 1,

package/src/modules/flags/FlagInfo.tsx

@@ -644,6 +644,18 @@ export const defFlagList: FlagUiInfo[] = [
     ...defFlagConfig,
     colors: [{"h":207,"s":100,"v":81}, {"h":0,"s":0,"v":100}, {"h":109,"s":76,"v":69}],
   },
+    {
+    id: 154,
+    name: I18n.getLang('country_IQ'),
+    ...defFlagConfig,
+    colors: [{"h":353,"s":92,"v":81}, {"h":0,"s":0,"v":100}, {"h":0,"s":0,"v":0}, {"h":150,"s":100,"v":48}],
+  },
+    {
+    id: 153,
+    name: I18n.getLang('country_CD'),
+    ...defFlagConfig,
+    colors: [{ h: 200, s: 100, v: 79 }, { h: 49, s: 100, v: 100 }, { h: 356, s: 79, v: 94 },],
+  },
 ]
 
 export const def2Pids = ['k588eygmfkdzmpzm']

package/src/modules/randomTimingForLight/RandomTimingForLightDetailPage.tsx

@@ -40,7 +40,7 @@ const newRandomTimingItem = (): RandomTimingItem => {
     channel: 0,
     weeks: [0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
-    endTime: startTime + 60,
+    endTime: startTime + 30, //Fix https://ledvance.atlassian.net/browse/SUH-12973
     settingTime: new Date().getTime(),
     color: {
       hue: 0,

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -11,7 +11,7 @@ import InfoText from '@ledvance/base/src/components/InfoText';
 import DeleteButton from '@ledvance/base/src/components/DeleteButton';
 import {useReactive, useUpdateEffect} from 'ahooks';
 import {addTimeSchedule, getTimeSchedule, modDelTimeSchedule, modifyTimeSchedule} from "./TimeScheduleActions";
-import {DeviceStateType, Timer} from './Interface';
+import { DeviceStateType, DeviceType, Timer } from './Interface'
 import {useParams} from '@ledvance/base/src/hooks/Hooks';
 import ScheduleCard from './components/ScheduleCard';
 import {ui_biz_routerKey} from "../../navigation/Routers";
@@ -118,6 +118,45 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
     }
   }
 
+  const calculateTagStatus: (item: Timer) => ApplyForItem[] = useCallback((item: Timer) => {
+    return params.applyForList.map(tag => {
+      const deviceData = params.manualDataDp2Obj(item.dps).deviceData
+      if (params.isMixLight && deviceData.type === DeviceType.MixLight) {
+        return {
+          ...tag,
+          enable:
+            tag.type === 'mainLight'
+              ? deviceData.deviceData.whiteLightSwitch
+              : deviceData.deviceData.colorLightSwitch,
+        };
+      }
+      if (item.dps.hasOwnProperty(tag.dp)) {
+        return {
+          ...tag,
+          enable: item.dps[tag.dp],
+        };
+      }
+      return tag;
+    }).filter(tag => params.applyForDisabled || item.dps.hasOwnProperty(tag.dp))
+      .map(tag => {
+        const {isManual} = params.manualDataDp2Obj(item.dps)
+        let tagName: string;
+        if (isManual) {
+          if (tag.enable) {
+            tagName = `${tag.key} : ${I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_1' : 'routine_push_msg_on')}`
+          } else {
+            tagName = `${tag.key} : ${I18n.getLang(params.isShutter ? 'curtain_summary_action_txt_2' : 'watchapp_entitystate_off')}`
+          }
+        } else {
+          tagName = `${tag.key} : ${I18n.getLang('mood_overview_headline_text')}`
+        }
+        return {
+          ...tag,
+          key: tagName,
+        };
+      });
+  }, [])
+
   const styles = StyleSheet.create({
     overviewDescription: {
       color: props.theme?.global.fontColor,
@@ -173,6 +212,7 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
             renderItem={({ item }) => (
               <ScheduleCard
                 item={item}
+                calculateTagStatus={() => calculateTagStatus(item)}
                 onEnableChange={async enable => {
                   state.loading = true;
                   await modDeleteTimeSchedule('del', {

package/src/modules/timeSchedule/components/ManuaSettings.tsx

@@ -238,7 +238,6 @@ function ManualSettings(props: ManualSettingProps) {
               <ApplyForDeviceList
                 devices={cloneDeep(groupDevices)}
               />
-              <Spacer height={cx(16)} />
             </Card>
             <Spacer />
           </View>
@@ -314,7 +313,6 @@ function ManualSettings(props: ManualSettingProps) {
               <ApplyForDeviceList
                 devices={cloneDeep(groupDevices)}
               />
-              <Spacer height={cx(16)} />
             </Card>
             <Spacer />
           </View>
@@ -398,7 +396,6 @@ function ManualSettings(props: ManualSettingProps) {
           <ApplyForDeviceList
             devices={cloneDeep(groupDevices)}
           />
-          <Spacer height={cx(16)} />
         </Card>
         <Spacer />
       </View>
@@ -504,7 +501,6 @@ function ManualSettings(props: ManualSettingProps) {
               <ApplyForDeviceList
                 devices={cloneDeep(groupDevices)}
               />
-              <Spacer height={cx(16)} />
             </Card>
             <Spacer />
           </View>
@@ -537,7 +533,6 @@ function ManualSettings(props: ManualSettingProps) {
         <ApplyForDeviceList
           devices={cloneDeep(groupDevices)}
         />
-        <Spacer height={cx(16)} />
       </Card>
     )
   }, [state.deviceData, state.applyForList, props.theme?.type])

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

@@ -1,4 +1,5 @@
-import React from "react";
+import { ApplyForItem } from '@ledvance/base/src/utils/interface'
+import React, { useMemo } from 'react'
 import { ViewStyle, View, Text, StyleSheet } from "react-native";
 import Card from "@ledvance/base/src/components/Card";
 import { SwitchButton, Utils } from 'tuya-panel-kit';
@@ -14,14 +15,16 @@ interface ScheduleCardProps {
   theme?: ThemeType
   item: Timer
   style?: ViewStyle
+  calculateTagStatus: () => ApplyForItem[]
   onEnableChange: (enable: boolean) => void
   onPress: () => void
   onLongPress: () => void
 }
 
 const ScheduleCard = (props: ScheduleCardProps) => {
-  const { item, style, onEnableChange, onPress, onLongPress } = props;
+  const { item, style, calculateTagStatus, onEnableChange, onPress, onLongPress } = props;
   const is24HourClock = useSystemTimeFormate()
+  const tags = useMemo(() => calculateTagStatus(), [item.dps])
 
   const styles = StyleSheet.create({
     card: {
@@ -62,14 +65,35 @@ const ScheduleCard = (props: ScheduleCardProps) => {
       marginRight: cx(16),
       marginTop: cx(16),
     },
+    typeContainer: {
+      flexDirection: 'row',
+      flexWrap: 'wrap',
+      marginVertical: cx(8),
+      marginHorizontal: cx(16),
+    },
+    tag: {
+      borderRadius: cx(16),
+      height: cx(16),
+      backgroundColor: '#E6E7E8',
+      marginRight: cx(10),
+      marginBottom: cx(6),
+      paddingHorizontal: cx(10)
+    },
+    tagTitle: {
+      fontSize: cx(10),
+      textAlign: 'center',
+      // fontFamily: 'PingFangSC-Medium',
+      color: '#000'
+    },
   })
 
   return (
     <Card
       style={styles.card}
-      containerStyle={[styles.container, style]}
+      containerStyle={[style]}
       onPress={onPress}
       onLongPress={onLongPress}>
+      <View style={styles.container}>
       <View style={styles.infoContainer}>
         <Text style={styles.time}>{is24HourClock ? item.time : convertTo12HourFormat(item.time)}</Text>
         <Text style={styles.loop}>
@@ -86,6 +110,16 @@ const ScheduleCard = (props: ScheduleCardProps) => {
           }}
         />
       </View>
+      </View>
+      <View style={styles.typeContainer}>
+        {tags.map(tag => (
+          <View style={styles.tag} key={tag.dp}>
+            <Text style={styles.tagTitle}>
+              {tag.key}
+            </Text>
+          </View>
+        ))}
+      </View>
     </Card>
   )