Merge branch 'main' into jump_com.huawei.hwread.dz

gkd-kit · Nov 18, 2023 · 0d0cb71 · 0d0cb71
2 parents 1ae8b89 + 0ac1d76
commit 0d0cb71
Show file tree

Hide file tree

Showing 44 changed files with 737 additions and 50 deletions.
diff --git a/src/apps/cn.xiaochuankeji.zuiyouLite.ts b/src/apps/cn.xiaochuankeji.zuiyouLite.ts
@@ -7,6 +7,10 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
@@ -26,9 +30,34 @@ export default defineAppConfig({
     {
       key: 1,
       name: '青少年模式弹窗',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       activityIds: 'cn.xiaochuankeji.zuiyouLite.ui.main.MainActivity',
       rules: '[id="cn.xiaochuankeji.zuiyouLite:id/young_close_btn"]',
       snapshotUrls: 'https://i.gkd.li/import/12745083',
     },
+    {
+      enable: false,
+      key: 2,
+      name: '信息流广告',
+      quickFind: true,
+      activityIds: 'cn.xiaochuankeji.zuiyouLite.ui.slide.ActivitySlideDetail',
+      rules: [
+        {
+          key: 0,
+          name: '点击【x】',
+          matches: '[id="cn.xiaochuankeji.zuiyouLite:id/ad_remove"]',
+          snapshotUrls: 'https://i.gkd.li/import/13387116',
+        },
+        {
+          preKeys: 0,
+          name: '点击【不喜欢广告主】',
+          matches: '@LinearLayout[clickable=true] > [text="不喜欢广告主"]',
+          snapshotUrls: 'https://i.gkd.li/import/13387155',
+        },
+      ],
+    },
   ],
 });
diff --git a/src/apps/com.autonavi.minimap.ts b/src/apps/com.autonavi.minimap.ts
@@ -7,14 +7,38 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      activityIds: 'com.autonavi.map.activity.NewMapActivity',
-      rules:
-        '[id="com.autonavi.minimap:id/fl_splash_container"] >n [text^="跳过"]',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: '@LinearLayout > [text^="跳过"][text.length<=10]',
       snapshotUrls: [
         'https://i.gkd.li/import/12667556',
         'https://i.gkd.li/import/12750045',
       ],
     },
+    {
+      key: 1,
+      name: '更新弹窗',
+      actionMaximum: 1,
+      resetMatch: 'app',
+      quickFind: true,
+      rules: [
+        {
+          key: 1,
+          name: '更新弹窗-1',
+          matches:
+            '@[id="com.autonavi.minimap:id/iv_close"] + * > [text^="立即升级"]',
+          snapshotUrls: 'https://i.gkd.li/import/13379094',
+        },
+        {
+          key: 2,
+          name: '更新弹窗-2',
+          matches: '@[text="取消"] + * + [text="去下载"]',
+          snapshotUrls: 'https://i.gkd.li/import/13379426',
+        },
+      ],
+    },
     {
       key: 10,
       name: '首页-地图页面上方消息提醒',

diff --git a/src/apps/com.badmintoncn.bbs.ts b/src/apps/com.badmintoncn.bbs.ts
@@ -11,8 +11,11 @@ export default defineAppConfig({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="跳过"]',
-      snapshotUrls: 'https://i.gkd.li/import/13258044',
+      rules: '[text$="跳过"][text.length<=10]',
+      snapshotUrls: [
+        'https://i.gkd.li/import/13258044',
+        'https://i.gkd.li/import/13379472',
+      ],
     },
   ],
 });
diff --git a/src/apps/com.bilibili.app.in.ts b/src/apps/com.bilibili.app.in.ts
@@ -21,5 +21,14 @@ export default defineAppConfig({
       rules: '[id="com.bilibili.app.in:id/cancel"][text="下次再说"]',
       snapshotUrls: 'https://i.gkd.li/import/13180746',
     },
+    {
+      key: 7,
+      name: '订阅感兴趣的通知',
+      desc: '点击【暂不开启】',
+      quickFind: true,
+      matchLauncher: true,
+      rules: '[text="订阅感兴趣的通知"] +2 LinearLayout [text="暂不开启"]',
+      snapshotUrls: 'https://i.gkd.li/import/13399195',
+    },
   ],
 });
diff --git a/src/apps/com.ccbhome.lanhai.ts b/src/apps/com.ccbhome.lanhai.ts
@@ -0,0 +1,18 @@
+import { defineAppConfig } from '../types';
+
+export default defineAppConfig({
+  id: 'com.ccbhome.lanhai',
+  name: 'CCB建融家园',
+  groups: [
+    {
+      key: 0,
+      name: '开屏广告',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: '[text$="跳过"][text.length<=10]',
+      snapshotUrls: 'https://i.gkd.li/import/13399182',
+    },
+  ],
+});
diff --git a/src/apps/com.chinatelecom.bestpayclient.ts b/src/apps/com.chinatelecom.bestpayclient.ts
@@ -14,5 +14,16 @@ export default defineAppConfig({
       rules: '[id="com.chinatelecom.bestpayclient:id/tv_ad_skip"]',
       snapshotUrls: 'https://i.gkd.li/import/13197640',
     },
+    {
+      key: 1,
+      name: '版本更新',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      activityIds: 'com.chinatelecom.bestpayclient.ui.MainActivity',
+      rules: '[id="com.chinatelecom.bestpayclient:id/bupdate_tv_bottom_tip"]',
+      snapshotUrls: 'https://i.gkd.li/import/13391544',
+    },
   ],
 });
diff --git a/src/apps/com.cn21.ecloud.ts b/src/apps/com.cn21.ecloud.ts
@@ -22,5 +22,16 @@ export default defineAppConfig({
         'https://i.gkd.li/import/12865488',
       ],
     },
+    {
+      key: 2,
+      name: '版本更新',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      activityIds: ['com.cn21.ecloud.activity.MainPageActivity'],
+      rules: '[id="com.cn21.ecloud:id/ivCancel"]',
+      snapshotUrls: 'https://i.gkd.li/import/13399488',
+    },
   ],
 });
diff --git a/src/apps/com.codoon.gps.ts b/src/apps/com.codoon.gps.ts
@@ -0,0 +1,46 @@
+import { defineAppConfig } from '../types';
+
+export default defineAppConfig({
+  id: 'com.codoon.gps',
+  name: '咕咚',
+  groups: [
+    {
+      key: 0,
+      name: '开屏广告',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          key: 0,
+          name: '【跳过+倒计时】型',
+          matches: '[text*="跳过"][text.length<=10]',
+          snapshotUrls: 'https://i.gkd.li/import/13348806',
+        },
+      ],
+    },
+    {
+      key: 1,
+      name: '广告弹窗',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'activity',
+      activityIds: 'com.codoon.gps.ui.SlideActivity',
+      rules: [
+        {
+          name: '首页-广告弹窗',
+          matches:
+            '[id="android:id/content"] >2 RelativeLayout > ViewGroup[childCount=2] > ImageView[clickable=true] + ImageView[clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/import/13358586',
+        },
+        {
+          name: '运动圈-广告弹窗',
+          matches:
+            '[id="android:id/content"] >4 FrameLayout > ImageView + FrameLayout > ImageView',
+          snapshotUrls: 'https://i.gkd.li/import/13348663',
+        },
+      ],
+    },
+  ],
+});
diff --git a/src/apps/com.diershoubing.erbing.ts b/src/apps/com.diershoubing.erbing.ts
@@ -0,0 +1,27 @@
+import { defineAppConfig } from '../types';
+
+export default defineAppConfig({
+  id: 'com.diershoubing.erbing',
+  name: '二柄',
+  groups: [
+    {
+      key: 0,
+      name: '开屏广告',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules:
+        '@[id="com.byted.pangle:id/tt_splash_skip_btn"] <<n [id="com.diershoubing.erbing:id/containerV"]',
+      snapshotUrls: 'https://i.gkd.li/import/13378853',
+    },
+    {
+      key: 1,
+      name: '签到弹窗',
+      activityIds: 'com.diershoubing.erbing.activity.MainReActivity',
+      rules:
+        '@[id="com.diershoubing.erbing:id/closeBtn"] - * > [text="签到成功"]',
+      snapshotUrls: 'https://i.gkd.li/import/13378845',
+    },
+  ],
+});
diff --git a/src/apps/com.digitalmall.chery.ts b/src/apps/com.digitalmall.chery.ts
@@ -0,0 +1,18 @@
+import { defineAppConfig } from '../types';
+
+export default defineAppConfig({
+  id: 'com.digitalmall.chery',
+  name: '奇瑞汽车',
+  groups: [
+    {
+      key: 0,
+      name: '开屏广告',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: '[desc$="跳过"][desc.length<=10]',
+      snapshotUrls: 'https://i.gkd.li/import/13392254',
+    },
+  ],
+});
diff --git a/src/apps/com.duowan.kiwi.ts b/src/apps/com.duowan.kiwi.ts
@@ -7,6 +7,7 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
+      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -30,6 +31,7 @@ export default defineAppConfig({
         'com.duowan.kiwi.homepage.Homepage', // 缺少快照
         'com.duowan.kiwi.immersepage.impl.ImmersePageActivity',
       ],
+      quickFind: true,
       matchLauncher: true,
       rules:
         '[id="com.duowan.kiwi:id/hyui_dialog_button_positive"][text="我知道了"]',
@@ -38,6 +40,7 @@ export default defineAppConfig({
     {
       key: 2,
       name: '直播间悬浮广告',
+      quickFind: true,
       activityIds: 'com.duowan.kiwi.liveroom.ChannelPage',
       rules: [
         {
@@ -48,6 +51,14 @@ export default defineAppConfig({
             'https://i.gkd.li/import/12901044',
           ],
         },
+        {
+          key: 1,
+          matches: '[id="com.duowan.kiwi:id/game_header_close"]',
+          snapshotUrls: [
+            'https://i.gkd.li/import/13395604',
+            'https://i.gkd.li/import/13395606',
+          ],
+        },
       ],
     },
   ],

diff --git a/src/apps/com.eastmoney.android.berlin.ts b/src/apps/com.eastmoney.android.berlin.ts
@@ -16,10 +16,14 @@ export default defineAppConfig({
       name: '更新弹窗',
       activityIds: [
         'com.eastmoney.android.module.launcher.internal.home.HomeActivity',
+        'com.bbk.launcher2.Launcher',
       ],
       rules:
         '@[id="com.eastmoney.android.berlin:id/tv_update_next_time"] + [id="com.eastmoney.android.berlin:id/tv_update_now"]',
-      snapshotUrls: ['https://i.gkd.li/import/12706070'],
+      snapshotUrls: [
+        'https://i.gkd.li/import/12706070', //com.eastmoney.android.module.launcher.internal.home.HomeActivity
+        'https://i.gkd.li/import/13399156', //com.bbk.launcher2.Launcher
+      ],
     },
     {
       enable: true,

diff --git a/src/apps/com.ecitic.bank.mobile.ts b/src/apps/com.ecitic.bank.mobile.ts
@@ -7,17 +7,18 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      activityIds: ['com.ecitic.bank.mobile.ui.SplashActivity'],
-      rules: '[id="com.ecitic.bank.mobile:id/skip_adv_layout"]',
-      snapshotUrls: ['https://i.gkd.li/import/12701203'],
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: '@LinearLayout > [text="跳过"]',
+      snapshotUrls: 'https://i.gkd.li/import/12701203',
     },
     {
       key: 1,
       name: '更新弹窗',
-      activityIds: [
-        'com.ecitic.bank.mobile.ui.MainActivity',
-        'com.miui.home.launcher.Launcher',
-      ],
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: '@[text="暂不更新"] + [text="立即更新"]',
       snapshotUrls: [
         'https://i.gkd.li/import/12701217',
@@ -32,5 +33,12 @@ export default defineAppConfig({
         '[id="com.ecitic.bank.mobile:id/id_cordova_view"] + [id="com.ecitic.bank.mobile:id/close_product_send"]',
       snapshotUrls: ['https://i.gkd.li/import/12701230'],
     },
+    {
+      key: 3,
+      name: '请求开通知权限弹窗',
+      activityIds: 'com.ecitic.bank.mobile.ui.MainActivity',
+      rules: '@[text="取消"] + [text="立即开启"]',
+      snapshotUrls: 'https://i.gkd.li/import/13399102',
+    },
   ],
 });
diff --git a/src/apps/com.excean.gspace.ts b/src/apps/com.excean.gspace.ts
@@ -11,8 +11,11 @@ export default defineAppConfig({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.excean.gspace:id/tv_jump"]',
-      snapshotUrls: 'https://i.gkd.li/import/13296144',
+      rules: '[text^="跳过"][text.length<10]',
+      snapshotUrls: [
+        'https://i.gkd.li/import/13296144',
+        'https://i.gkd.li/import/13385318', // 无id
+      ],
     },
     {
       key: 1,

diff --git a/src/apps/com.fileunzip.zxwknight.ts b/src/apps/com.fileunzip.zxwknight.ts
@@ -6,17 +6,25 @@ export default defineAppConfig({
   groups: [
     {
       key: 1,
-      name: '广告弹窗',
+      name: '弹窗广告',
       rules: [
         {
-          key: 0,
+          key: 1,
           name: '字节广告',
           activityIds:
             'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
           matches:
             '@Image[text=""] < View +n View > View > TextView[text="广告"]',
           snapshotUrls: 'https://i.gkd.li/import/13328194',
         },
+        {
+          key: 2,
+          name: '腾讯广告',
+          matchLauncher: true,
+          matches:
+            'ImageView - FrameLayout > FrameLayout[childCount=1] > ImageView[childCount=0]',
+          snapshotUrls: 'https://i.gkd.li/import/13391833',
+        },
       ],
     },
     {