@ledvance/group-ui-biz-bundle 1.0.11 → 1.0.13

package/package.json

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

package/src/modules/flags/FlagInfo.tsx

@@ -1,4 +1,5 @@
 import I18n from "@ledvance/base/src/i18n";
+import res from "@ledvance/base/src/res";
 import { SceneNodeTransitionMode } from "../mood/SceneInfo";
 
 type HSV = {
@@ -19,8 +20,7 @@ export interface FlagItemInfo {
   speed: number
   colors: HSV[]
   whiteColors: BT []
-  fanEnable?: boolean
-  fanSpeed?: number
+  icon?: number | string
 }
 
 export interface FlagUiInfo extends FlagItemInfo{
@@ -301,6 +301,7 @@ export const defFlagList: FlagUiInfo[] = [
     mode: SceneNodeTransitionMode.Jump,
     speed: 70,
     name: I18n.getLang('flag_leverkusen'),
+    icon: res.leverkusen_icon,
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],

package/src/modules/flags/FlagItem.tsx

@@ -1,4 +1,4 @@
-import { StyleSheet, View, Text, ViewStyle } from 'react-native'
+import { StyleSheet, View, Text, ViewStyle, Image } from 'react-native'
 import React from 'react'
 import Card from '@ledvance/base/src/components/Card'
 import { SwitchButton, Utils } from 'tuya-panel-kit'
@@ -11,12 +11,15 @@ interface RecommendMoodItemProps {
   enable: boolean
   title: string
   colors: string[]
+  icon?: number | string
   style?: ViewStyle
   onPress?: () => void
   onSwitch: (enable: boolean) => void
 }
 
 export default function FlagItem(props: RecommendMoodItemProps) {
+  const icon = typeof props.icon === 'number' ? props.icon : { uri: props.icon }
+
   return (
     <Card
       style={[styles.card, props.style]}
@@ -24,7 +27,10 @@ export default function FlagItem(props: RecommendMoodItemProps) {
       <View>
         <Spacer height={cx(16)} />
         <View style={styles.headline}>
-          <Text style={styles.headText}>{props.title}</Text>
+          <View style={{ flexDirection: 'row', flex: 1, paddingRight: cx(5), justifyContent: 'flex-start' }}>
+            <Text style={styles.headText}>{props.title}</Text>
+            {props.icon && <Image source={icon} style={{ width: cx(60), aspectRatio: 2.14, marginRight: cx(10) }} />}
+          </View>
           <SwitchButton
             thumbStyle={{ elevation: 0 }}
             value={props.enable}
@@ -50,13 +56,14 @@ const styles = StyleSheet.create({
   headline: {
     flexDirection: 'row',
     marginHorizontal: cx(16),
+    justifyContent: 'space-between',
   },
   headText: {
-    flex: 1,
     color: '#000',
     fontSize: cx(16),
     fontFamily: 'helvetica_neue_lt_std_bd',
     lineHeight: cx(20),
+    flex: 1
   },
   gradientItem: {
     alignItems: 'center',

package/src/modules/flags/FlagPage.tsx

@@ -193,6 +193,7 @@ const FlagPage = () => {
         renderItem={({ item }) => <FlagItem
           enable={flagState?.workMode === (params.isStripLight ? WorkMode.Colour : WorkMode.Scene) && flagId === item.id}
           title={item.name}
+          icon={item.icon}
           colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v))}
           onSwitch={async (enable) => {
             if (enable) {

package/src/modules/time_schedule/ScheduleCard.tsx

@@ -2,9 +2,10 @@ import React 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';
-import { convertTo12HourFormat, loopText } from '@ledvance/base/src/utils/common';
+import { convertTo12HourFormat, loopText, showDialog } from '@ledvance/base/src/utils/common';
 import { Timer } from "./Interface";
 import { useSystemTimeFormate } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import I18n from "@ledvance/base/src/i18n";
 const { convertX: cx } = Utils.RatioUtils;
 
 interface ScheduleCardProps {
@@ -44,7 +45,21 @@ const ScheduleCard = (props: ScheduleCardProps) => {
           value={!!item.status}
           thumbStyle={{ elevation: 0 }}
           onValueChange={() => {
-            onEnableChange(!item.status);
+            if (!item.status) {
+              showDialog({
+                method: 'confirm',
+                title: I18n.getLang('conflict_dialog_active_item_timeschedule_titel'),
+                subTitle: I18n.getLang('group_conflict_feature'),
+                confirmText: I18n.getLang('registration_dialog_button_yes'),
+                cancelText: I18n.getLang('registration_dialog_button_no'),
+                onConfirm: (_, {close}) => {
+                  onEnableChange(!item.status);
+                  close()
+                }
+              });
+            } else {
+              onEnableChange(!item.status);
+            }
           }}
         />
       </View>
@@ -110,4 +125,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default ScheduleCard
+export default ScheduleCard

package/src/modules/time_schedule/TimeScheduleDetailPage.tsx

@@ -420,18 +420,28 @@ const TimeScheduleDetailPage = () => {
       rightButtonIcon={allowSubmit ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={async () => {
         if (!allowSubmit || state.loading) return
-        state.loading = true
-        const res = await props.modDeleteTimeSchedule(props.mode, {
-          ...state.timeSchedule,
-          status: 1,
-          dps: getActions()
-        }, '')
-        console.log(res, '< ---- resss')
-        state.loading = false
-        if (res.success) {
-          props.refreshFn()
-          navigation.goBack()
-        }
+        showDialog({
+          method: 'confirm',
+          title: I18n.getLang('conflict_dialog_active_item_timeschedule_titel'),
+          subTitle: I18n.getLang('group_conflict_feature'),
+          confirmText: I18n.getLang('registration_dialog_button_yes'),
+          cancelText: I18n.getLang('registration_dialog_button_no'),
+          onConfirm: async (_, { close }) => {
+            state.loading = true
+            const res = await props.modDeleteTimeSchedule(props.mode, {
+              ...state.timeSchedule,
+              status: 1,
+              dps: getActions()
+            }, '')
+            console.log(res, '< ---- resss')
+            state.loading = false
+            if (res.success) {
+              close()
+              props.refreshFn()
+              navigation.goBack()
+            }
+          }
+        })
       }}
       backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}
       backDialogContent={I18n.getLang('cancel_dialog_leave_unsaved_timeschedule_note')}