@ledvance/group-ui-biz-bundle 1.0.43 → 1.0.44

package/package.json

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

package/src/modules/biorhythm/BiorhythmPage.tsx

@@ -15,7 +15,6 @@ import { sortBy, cloneDeep } from 'lodash'
 import iconList from './iconListData'
 import pIdList from './pIdList'
 import {
-  useDeviceId,
   useDeviceInfo,
   useGroupDevices,
 } from '@ledvance/base/src/models/modules/NativePropsSlice'
@@ -25,11 +24,10 @@ import res from '@ledvance/base/src/res'
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import BiologicalRes from './res/BiologicalRes'
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
-import { NativeApi } from '@ledvance/base/src/api/native'
 import { setDataSource } from '@ledvance/base/src/components/weekSelect'
 import { BiorhythmEditPageParams } from './BiorhythmDetailPage'
 import { useBiorhythm } from './BiorhythmActions'
-import { showDialog as showCommonDialog } from '@ledvance/base/src/utils/common'
+import { showDialog as showCommonDialog, showDialog } from '@ledvance/base/src/utils/common'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import ApplyForDeviceList from '@ledvance/base/src/components/ApplyForDeviceList'
@@ -44,7 +42,6 @@ interface UIState extends BiorhythmBean {
   showGradientTypeSelectModal: boolean;
   flag: symbol;
   weekString: string,
-  timeSchedule: any[]
   loading: boolean
 }
 
@@ -59,7 +56,6 @@ const BiorhythmPage = () => {
   const navigation = useNavigation()
   const params = useParams<BiorhythmPageParams>()
   const [biorhythm, setBiorhythm] = useBiorhythm()
-  const deviceId = useDeviceId()
   const deviceInfo = useDeviceInfo()
   const [groupDevices] = useGroupDevices()
   const { productId } = deviceInfo
@@ -70,7 +66,6 @@ const BiorhythmPage = () => {
     showGradientTypeSelectModal: false,
     flag: Symbol(),
     weekString: '',
-    timeSchedule: [],
     loading: false
   })
 
@@ -257,21 +252,6 @@ const BiorhythmPage = () => {
     return availableChart[randomIndex]
   }
 
-  const reloadData = async () => {
-    const res: any = await NativeApi.getAllTaskTimer(deviceId)
-    console.log('reload data', res)
-    if (res.success && res.data) {
-      // 原生传过来的dps是json字符串。
-      if (Array.isArray(res.data) && res.data.length) {
-        state.timeSchedule = res.data
-      }
-    }
-  }
-
-  useEffect(() => {
-    reloadData().then()
-  }, [])
-
   return (
     <>
       <View style={{ flex: 1, flexDirection: 'column' }}>
@@ -305,7 +285,19 @@ const BiorhythmPage = () => {
               thumbColor={'#f60'}
               trackColor={{ false: '#00000026', true: '#ff660036' }}
               onValueChange={async enable => {
-                // if (enable && (enableTimeScheduleStatus)) return showDialog(enable)
+                if (enable) return showDialog({
+                  method: 'confirm',
+                  title: I18n.getLang('conflict_dialog_active_item_bio_rhythm_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
+                    state.enable = enable
+                    close()
+                    state.flag = Symbol()
+                  }
+                })
                 state.loading = true
                 state.enable = enable
                 state.flag = Symbol()

package/src/modules/fixedTimeForPlug/FixedTimeForPlugActon.ts

@@ -24,6 +24,7 @@ export interface FixedTimeItem {
   weeks: number[]
   startTime: number
   endTime: number
+  settingTime: number
   onTime: number
   offTime: number
   name?: string
@@ -72,6 +73,7 @@ const fixedTimeItemsFromBase64 = (base64Str: string): FixedTimeItem[] => {
       endTime,
       onTime,
       offTime,
+      settingTime: new Date().getTime(),
       name: `FixedTime ${items.length}`,
       index: items.length
     });

package/src/modules/fixedTimeForPlug/FixedTimeForPlugDetailPage.tsx

@@ -36,6 +36,7 @@ const newFixedTimeItem = (): FixedTimeItem => {
     weeks: [0, 0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
     endTime: startTime + 60,
+    settingTime: new Date().getTime(),
     onTime: 1,
     offTime: 1
   }
@@ -100,7 +101,19 @@ const FixedTimeForPlugDetailPage = () => {
     const item = cloneDeep(state.item)
     item.onTime = parseTime(state.onHour, state.onMinute)
     item.offTime = parseTime(state.offHour, state.offMinute)
-    await params.onPost(params.mode, item, true);
+    showDialog({
+      method: 'confirm',
+      title: I18n.getLang('conflict_dialog_active_item_fixedtimecycle_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
+        close()
+        await params.onPost(params.mode, item, true);
+        state.loading = false
+      }
+    })
   }
 
   const onDelete = () => {

package/src/modules/fixedTimeForPlug/ItemCard.tsx

@@ -3,7 +3,7 @@ import Card from "@ledvance/base/src/components/Card";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import {StyleSheet, Text, View} from "react-native";
 import {SwitchButton, Utils} from "tuya-panel-kit";
-import {loopText} from "@ledvance/base/src/utils/common";
+import {getIsClosed, loopText} from "@ledvance/base/src/utils/common";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import {FixedTimeItem} from "./FixedTimeForPlugActon";
 
@@ -19,6 +19,8 @@ export interface ItemCardProps {
 
 const ItemCard = (props: ItemCardProps) => {
   const {item, is24Hour, onSwitch, onPress} = props
+  // 判断是否关闭 
+  const closed = getIsClosed(item)
   return (
     <Card style={styles.itemCard} onPress={onPress}>
       <Spacer height={cx(16)}/>
@@ -32,11 +34,11 @@ const ItemCard = (props: ItemCardProps) => {
         </Text>
         <SwitchButton
           style={styles.switchBtn}
-          value={item.enable}
+          value={item.enable && closed}
           thumbStyle={{elevation: 0}}
           onValueChange={onSwitch}/>
       </View>
-      <Text style={styles.loopText}>{loopText(item.weeks, parseTimer(item.startTime * 60))}</Text>
+      <Text style={styles.loopText}>{loopText(item.weeks, parseTimer(item.endTime * 60))}</Text>
       <Spacer height={cx(5)}/>
       <Text style={styles.loopText}>{item.name}</Text>
       <Spacer/>

package/src/modules/fixedTimingForLight/FixedTimingForLightAction.ts

@@ -18,6 +18,7 @@ export interface FixedTimingItem {
   endTime: number
   openTime: number
   closeTime: number
+  settingTime: number 
   color: {
     hue: number
     saturation: number

package/src/modules/fixedTimingForLight/FixedTimingForLightDetailPage.tsx

@@ -39,6 +39,7 @@ const newFixedTimingItem = (): FixedTimingItem => {
     weeks: [0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
     endTime: startTime + 60,
+    settingTime: new Date().getTime(),
     openTime: 1,
     closeTime: 1,
     color: {
@@ -123,11 +124,24 @@ const FixedTimingForLightDetailPage = () => {
         value: state.isColorMode ? state.item.color.value : 0,
         temperature: state.isColorMode ? 0 : state.item.color.temperature,
         brightness: state.isColorMode ? 0 : state.item.color.brightness
-      }
+      },
+      settingTime: new Date().getTime()
     };
     item.openTime = parseTime(state.onHour, state.onMinute)
     item.closeTime = parseTime(state.offHour, state.offMinute)
-    await params.onPost(params.mode, item, true);
+    showDialog({
+      method: 'confirm',
+      title: I18n.getLang('conflict_dialog_active_item_fixedtimecycle_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
+        close()
+        await params.onPost(params.mode, item, true);
+        state.loading = false
+      }
+    })
   }
 
   const onDelete = () => {

package/src/modules/fixedTimingForLight/ItemCard.tsx

@@ -3,7 +3,7 @@ import Card from "@ledvance/base/src/components/Card";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import {StyleSheet, Text, View} from "react-native";
 import {SwitchButton, Utils} from "tuya-panel-kit";
-import {loopText} from "@ledvance/base/src/utils/common";
+import {getIsClosed, loopText} from "@ledvance/base/src/utils/common";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import {FixedTimingItem} from "./FixedTimingForLightAction";
 
@@ -19,6 +19,8 @@ export interface ItemCardProps {
 
 const ItemCard = (props: ItemCardProps) => {
   const {item, is24Hour, onSwitch, onPress} = props
+  // 判断是否关闭 
+  const closed = getIsClosed(item)
   return (
     <Card style={styles.itemCard} onPress={onPress}>
       <Spacer height={cx(16)}/>
@@ -32,11 +34,11 @@ const ItemCard = (props: ItemCardProps) => {
         </Text>
         <SwitchButton
           style={styles.switchBtn}
-          value={item.power}
+          value={item.power && closed}
           thumbStyle={{elevation: 0}}
           onValueChange={onSwitch}/>
       </View>
-      <Text style={styles.loopText}>{loopText(item.weeks, parseTimer(item.startTime * 60))}</Text>
+      <Text style={styles.loopText}>{loopText(item.weeks, parseTimer(item.endTime * 60))}</Text>
       <Spacer height={cx(5)}/>
       <Text style={styles.loopText}>{item.name}</Text>
       <Spacer/>

package/src/modules/music/MusicActions.ts

@@ -44,6 +44,7 @@ export const useDreamMusicData = (musicOption: MusicPageParams) => {
           dps[musicOption.musicDataDp] = v.phoneDpData
         }
         dps[musicOption.workModeDp] = WorkMode.Music
+        dps[musicOption.switchLedDp] = true
       }else{
         dps[musicOption.workModeDp] = v.lastWorkMode
       }

package/src/modules/randomTimeForPlug/ItemCard.tsx

@@ -3,7 +3,7 @@ import Card from "@ledvance/base/src/components/Card";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import {StyleSheet, Text, View} from "react-native";
 import {SwitchButton, Utils} from "tuya-panel-kit";
-import {loopText} from "@ledvance/base/src/utils/common";
+import {getIsClosed, loopText} from "@ledvance/base/src/utils/common";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 
 const {convertX: cx} = Utils.RatioUtils
@@ -14,6 +14,7 @@ export interface ItemCardProps<T> {
     enable: boolean
     startTime: number
     endTime: number
+    settingTime: number
     weeks: number[]
     name?: string
   },
@@ -24,6 +25,8 @@ export interface ItemCardProps<T> {
 
 const ItemCard = <T, >(props: ItemCardProps<T>) => {
   const {item, is24Hour, onSwitch, onPress} = props
+  // 判断是否关闭 
+  const closed = getIsClosed(item)
   return (
     <Card style={styles.itemCard} onPress={onPress}>
       <Spacer height={cx(16)}/>
@@ -37,11 +40,11 @@ const ItemCard = <T, >(props: ItemCardProps<T>) => {
         </Text>
         <SwitchButton
           style={styles.switchBtn}
-          value={item.enable}
+          value={item.enable && closed}
           thumbStyle={{elevation: 0}}
           onValueChange={onSwitch}/>
       </View>
-      <Text style={styles.loopText}>{loopText(item.weeks, parseTimer(item.startTime * 60))}</Text>
+      <Text style={styles.loopText}>{loopText(item.weeks, parseTimer(item.endTime * 60))}</Text>
       <Spacer height={cx(5)}/>
       <Text style={styles.loopText}>{item.name}</Text>
       <Spacer/>

package/src/modules/randomTimeForPlug/RandomTimeForPlugAction.ts

@@ -22,6 +22,7 @@ export interface RandomTimeItem {
   weeks: number[]
   startTime: number
   endTime: number
+  settingTime: number
   name?: string
   index?: number
 }
@@ -65,6 +66,7 @@ const randomTimeItemsFromBase64 = (base64Str: string): RandomTimeItem[] => {
       weeks,
       startTime,
       endTime,
+      settingTime: new Date().getTime(),
       name: `RandomTime ${items.length}`,
       index: items.length
     });

package/src/modules/randomTimeForPlug/RandomTimeForPlugDetailPage.tsx

@@ -35,6 +35,7 @@ const newRandomTimeItem = (): RandomTimeItem => {
     channel: 0,
     weeks: [0, 0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
+    settingTime: new Date().getTime(),
     endTime: startTime + 30
   }
 }
@@ -71,7 +72,22 @@ const RandomTimeForPlugDetailPage = () => {
       })
       return
     }
-    await params.onPost(params.mode, cloneDeep(state.item), true);
+    showDialog({
+      method: 'confirm',
+      title: I18n.getLang('conflict_dialog_active_item_randomtimecycle_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
+        close()
+        await params.onPost(params.mode, cloneDeep({
+          ...state.item,
+          settingTime: new Date().getTime()
+        }), true);
+        state.loading = false
+      }
+    })
   }
 
   const onDelete = () => {

package/src/modules/randomTimingForLight/ItemCard.tsx

@@ -3,7 +3,7 @@ import Card from "@ledvance/base/src/components/Card";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import {StyleSheet, Text, View} from "react-native";
 import {SwitchButton, Utils} from "tuya-panel-kit";
-import {loopText} from "@ledvance/base/src/utils/common";
+import {getIsClosed, loopText} from "@ledvance/base/src/utils/common";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 
 const {convertX: cx} = Utils.RatioUtils
@@ -14,6 +14,7 @@ export interface ItemCardProps<T> {
     power: boolean
     startTime: number
     endTime: number
+    settingTime: number
     weeks: number[]
     name?: string
   },
@@ -24,6 +25,8 @@ export interface ItemCardProps<T> {
 
 const ItemCard = <T, >(props: ItemCardProps<T>) => {
   const {item, is24Hour, onSwitch, onPress} = props
+  // 判断是否关闭 
+  const closed = getIsClosed(item)
   return (
     <Card style={styles.itemCard} onPress={onPress}>
       <Spacer height={cx(16)}/>
@@ -37,11 +40,11 @@ const ItemCard = <T, >(props: ItemCardProps<T>) => {
         </Text>
         <SwitchButton
           style={styles.switchBtn}
-          value={item.power}
+          value={item.power && closed}
           thumbStyle={{elevation: 0}}
           onValueChange={onSwitch}/>
       </View>
-      <Text style={styles.loopText}>{loopText(item.weeks, parseTimer(item.startTime * 60))}</Text>
+      <Text style={styles.loopText}>{loopText(item.weeks, parseTimer(item.endTime * 60))}</Text>
       <Spacer height={cx(5)}/>
       <Text style={styles.loopText}>{item.name}</Text>
       <Spacer/>

package/src/modules/randomTimingForLight/RandomTimingForLightAction.ts

@@ -16,6 +16,7 @@ export interface RandomTimingItem {
   weeks: number[]
   startTime: number
   endTime: number
+  settingTime: number 
   color: {
     hue: number
     saturation: number

package/src/modules/randomTimingForLight/RandomTimingForLightDetailPage.tsx

@@ -38,6 +38,7 @@ const newRandomTimingItem = (): RandomTimingItem => {
     weeks: [0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
     endTime: startTime + 60,
+    settingTime: new Date().getTime(),
     color: {
       hue: 0,
       saturation: 100,
@@ -86,17 +87,30 @@ const RandomTimingForLightDetailPage = () => {
       })
       return
     }
-    await params.onPost(params.mode, {
-      ...state.item,
-      power: true,
-      color: {
-        hue: state.isColorMode ? state.item.color.hue : 0,
-        saturation: state.isColorMode ? state.item.color.saturation : 0,
-        value: state.isColorMode ? state.item.color.value : 0,
-        temperature: state.isColorMode ? 0 : state.item.color.temperature,
-        brightness: state.isColorMode ? 0 : state.item.color.brightness
+    showDialog({
+      method: 'confirm',
+      title: I18n.getLang('conflict_dialog_active_item_randomtimecycle_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
+        close()
+        await params.onPost(params.mode, {
+          ...state.item,
+          power: true,
+          color: {
+            hue: state.isColorMode ? state.item.color.hue : 0,
+            saturation: state.isColorMode ? state.item.color.saturation : 0,
+            value: state.isColorMode ? state.item.color.value : 0,
+            temperature: state.isColorMode ? 0 : state.item.color.temperature,
+            brightness: state.isColorMode ? 0 : state.item.color.brightness
+          },
+          settingTime: new Date().getTime()
+        }, true);
+        state.loading = false
       }
-    }, true);
+    })
   }
 
   const onDelete = () => {