@ledvance/base 1.1.38 → 1.1.40

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.1.38",
+  "version": "1.1.40",
   "scripts": {},
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",

package/src/api/native.d.ts

@@ -34,4 +34,5 @@ export declare const openDownloadFile: (filePath: string) => Promise<unknown>;
 export declare const queryDpIds: (dpIds: string, deviceId: string) => Promise<unknown>;
 export declare const formatNumber: (num: number, fixed: number) => string;
 export declare const getTimeZone: () => string;
+export declare const getSystemTimeFormat: () => Promise<number>;
 export {};

package/src/api/native.ts

@@ -19,6 +19,7 @@ interface LDVDevicePanelManager {
   getFeature: (deviceId: string, featureId: string, callback: (res: NativeResult<string>) => void) => void
   putFeature: (deviceId: string, featureId: string, value: any, callback: (res: NativeResult<string>) => void) => void
   getGroupDevices: (tyGroupId: number) => Promise<NativeResult<string>>
+  getSystemTimeFormat: () => Promise<number>
 }
 
 export interface DeviceInfo {
@@ -298,4 +299,13 @@ export const formatNumber: (num: number, fixed: number) => string = (num, fixed)
 
 export const getTimeZone: () => string = () => {
   return Platform.OS === 'android' ? devicePanel.getTimeZone() || '' : Intl.DateTimeFormat().resolvedOptions().timeZone
+}
+
+// 获取手机系统设置的12小时制还是24小时制
+export const getSystemTimeFormat = async (): Promise<number> => {
+  try {
+    return await devicePanel.getSystemTimeFormat()
+  } catch (_) {
+    return 24
+  }
 }

package/src/components/ldvSwitch.tsx

@@ -11,16 +11,17 @@ interface Prop {
   colorAlpha: number
   enable: boolean
   setEnable: any
+  showSwitch?:boolean
 }
 
 const LdvSwitch = (props: Prop) => {
-  const {title, color, colorAlpha, enable, setEnable} = props
+  const {title, color, colorAlpha, enable, setEnable, showSwitch = true} = props
   return (
     <View style={styles.titleBGView}>
       <Text style={styles.title}>{title}</Text>
       <View style={[styles.colorBlock, {backgroundColor: color, opacity: colorAlpha}]}/>
       <Spacer style={{flex: 1}} height={0} width={0}/>
-      <SwitchButton value={enable} onValueChange={setEnable}/>
+      {showSwitch && <SwitchButton value={enable} onValueChange={setEnable}/>}
     </View>
   )
 }

package/src/utils/loopsCompare.ts

@@ -0,0 +1,62 @@
+import dayjs from 'dayjs';
+export function findConflicts(schedule, object) {
+  const conflicts: any = [];
+  schedule.forEach(item => {
+    item.weeks = getLoopsForTheOnceItem(item);
+  });
+  object.weeks = getLoopsForTheOnceItem(object);
+  const objectStart = object.isSleep
+    ? object.time[0] * 60 + object.time[1]
+    : object.time[0] * 60 + object.time[1] - object.fade;
+  const objectEnd = object.isSleep
+    ? objectStart + object.fade
+    : object.time[0] * 60 + object.time[1];
+  for (let i = 0; i < schedule.length; i++) {
+    const { enable, weeks, time, fade, isSleep } = schedule[i];
+    if (enable === 0) continue;
+
+    const start = isSleep ? time[0] * 60 + time[1] : time[0] * 60 + time[1] - fade;
+    const end = isSleep ? start + fade : time[0] * 60 + time[1];
+
+    let conflict = false;
+    for (let j = 0; j < 7; j++) {
+      if (weeks[j] && start < 0 && object.weeks[j - 1 < 0 ? 6 : j - 1]) {
+        if (objectEnd - 24 * 60 > start) {
+          conflict = true;
+          break;
+        }
+      }
+      if (object.weeks[j] && weeks[j]) {
+        if (objectStart < end && objectEnd > start) {
+          conflict = true;
+          break;
+        }
+      }
+      if (weeks[j] && end > 24 * 60 && object.weeks[j + 1 > 6 ? 0 : j + 1]) {
+        if (end - 24 * 60 > objectStart) {
+          conflict = true;
+          break;
+        }
+      }
+    }
+
+    if (conflict) {
+      conflicts.push(schedule[i]);
+    }
+  }
+
+  return conflicts;
+}
+// once
+function isLoopsEqualToOnce(loops) {
+  return loops.every(item => item === 0 || item === '0');
+}
+
+function getLoopsForTheOnceItem(item) {
+  let newLoops = [...item.loops];
+  if (isLoopsEqualToOnce(newLoops)) {
+    const now = dayjs();
+    newLoops[now.day()] = 1;
+  }
+  return newLoops;
+}