Merge branch 'gkd-kit:main' into com.csmbcx.candada

gkd-kit · Jan 29, 2024 · 7573475 · 7573475
2 parents 81bfeb5 + dcd0623
commit 7573475
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/globalGroups.ts b/src/globalGroups.ts
@@ -1,5 +1,6 @@
 import apps from './rawApps';
 import type { RawGlobalGroup } from './types';
+import { OPEN_AD_ORDER } from './utils';
 
 const diabledAppIds = [
   'com.android.systemui', // 通知栏界面
@@ -31,7 +32,7 @@ const globalGroups: RawGlobalGroup[] = [
   {
     key: 0,
     name: '开屏广告',
-    order: -1,
+    order: OPEN_AD_ORDER,
     actionMaximum: 2,
     matchTime: 10000,
     resetMatch: 'app',

diff --git a/src/rawApps.ts b/src/rawApps.ts
@@ -5,6 +5,7 @@ import picocolors from 'picocolors';
 import { pinyin } from 'pinyin-pro';
 import { walk } from './file';
 import type { RawApp } from './types';
+import { OPEN_AD_ORDER } from './utils';
 
 const rawApps: RawApp[] = [];
 for await (const tsFp of walk(process.cwd() + '/src/apps')) {
@@ -26,7 +27,7 @@ for await (const tsFp of walk(process.cwd() + '/src/apps')) {
     if (!g.name.startsWith('开屏广告')) {
       g.enable = false;
     } else {
-      g.order = -1;
+      g.order = OPEN_AD_ORDER;
     }
   });
   rawApps.push(appConfig);

diff --git a/src/utils.ts b/src/utils.ts
@@ -5,3 +5,5 @@ export const tryRun = <T>(fc: () => T, fallbackFc: (e: unknown) => T) => {
     return fallbackFc(e);
   }
 };
+
+export const OPEN_AD_ORDER = -10;
-Original file line number
+Diff line change
@@ Expand Up @@
         return fallbackFc(e);
       }
     };
+    export const OPEN_AD_ORDER = -10;