@ledvance/base 1.3.33 → 1.3.35

package/src/utils/common.ts

@@ -3,7 +3,7 @@ import I18n from '../i18n/index'
 import { formatNumber, openDownloadFile } from 'api/native'
 import dayjs from 'dayjs'
 import RNFetchBlob from 'rn-fetch-blob'
-import { isEqual } from 'lodash'
+import { cloneDeep, isEqual } from 'lodash'
 import { Dialog, Utils } from 'tuya-panel-kit'
 import {GlobalParams} from "../models/GlobalParams";
 
@@ -300,6 +300,11 @@ interface DialogProps {
   onCancel?: () => void
 }
 
+// 获取文本的默认值
+const getText = (text: string | undefined, defaultText: string | undefined, show: boolean) => {
+  return show ? text || defaultText || '' : '';
+};
+
 export function showDialog(props: DialogProps) {
   const {
     method,
@@ -312,31 +317,21 @@ export function showDialog(props: DialogProps) {
     onConfirm,
     onCancel
   } = props
+
+  const defDialogProps = {
+    title,
+    confirmText: getText(confirmText, I18n.getLang('conflict_dialog_save_item_fixedtimecycle_answer_yes_text'), showConfirmText),
+    cancelText: getText(cancelText, I18n.getLang('conflict_dialog_save_item_fixedtimecycle_answer_no_text'), showCancelText),
+    subTitle,
+    onConfirm,
+    motionConfig: {
+      hideDuration: 0,
+      showDuration: 100
+    }
+  }
+  const cancelProps = onCancel ? { onCancel } : {};
   return (
-    method === 'confirm' ?
-      Dialog.confirm({
-        title: title,
-        cancelText: showCancelText && (cancelText || I18n.getLang('conflict_dialog_save_item_fixedtimecycle_answer_no_text')) || '',
-        confirmText: showConfirmText && (confirmText || I18n.getLang('conflict_dialog_save_item_fixedtimecycle_answer_yes_text')) || '',
-        subTitle,
-        onConfirm,
-        onCancel,
-        motionConfig: {
-          hideDuration: 0,
-          showDuration: 100
-        }
-      })
-      :
-      Dialog.alert({
-        title: title,
-        confirmText: showConfirmText && (confirmText || I18n.getLang('conflict_dialog_save_item_fixedtimecycle_answer_yes_text')) || '',
-        subTitle,
-        onConfirm,
-        motionConfig: {
-          hideDuration: 0,
-          showDuration: 100
-        }
-      })
+    method === 'confirm' ? Dialog.confirm({ ...defDialogProps, ...cancelProps }) : Dialog.alert(defDialogProps)
   )
 }
 
@@ -448,17 +443,26 @@ export function isConflictTask(task1, task2) {
   function checkOverlap(start1, end1, start2, end2) {
     return (start1 <= end2 && start2 <= end1);
   }
+  const cloneTask1 = cloneDeep(task1)
+  const cloneTask2 = cloneDeep(task2)
+  const weekDay = dayjs().day()
+  if (cloneTask1.weeks.every(w => Number(w) === 0)){
+    cloneTask1.weeks[weekDay] = 1
+  }
+  if (cloneTask2.weeks.every(w => Number(w) === 0)){
+    cloneTask2.weeks[weekDay] = 1
+  }
   // 检查一周的每一天
   for (let i = 0; i < 7; i++) {
     // 如果 task1 在该天执行
-    if (Number(task1.weeks[i]) === 1) {
-      const [start1, end1] = [task1.startTime, task1.endTime];
+    if (Number(cloneTask1.weeks[i]) === 1) {
+      const [start1, end1] = [cloneTask1.startTime, cloneTask1.endTime];
       const task1CrossDay = start1 > end1;
 
       // 如果 task2 在该天或跨天执行
       for (let j = 0; j < 7; j++) {
-        if (Number(task2.weeks[j]) === 1) {
-          const [start2, end2] = [task2.startTime, task2.endTime];
+        if (Number(cloneTask2.weeks[j]) === 1) {
+          const [start2, end2] = [cloneTask2.startTime, cloneTask2.endTime];
           const task2CrossDay = start2 > end2;
           // 检查当前天是否有重叠
           if (i === j && checkOverlap(start1, end1, start2, end2)) {

package/translateKey.txt

@@ -1012,3 +1012,4 @@ legend_humidity
 battery_status_normal
 battery_status_low
 battery_status_empty
+push_notifications_contact_sensor_door_closing_title