perf: some rules

2025-12-20 00:35:17 +08:00 · 2024-12-03 20:22:45 +08:00
parent d6875451c1
commit e574714ef1
72 changed files with 701 additions and 427 deletions
--- a/src/appDeprecatedKeys.ts
+++ b/src/appDeprecatedKeys.ts
@@ -385,7 +385,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
  {
    id: 'com.danlan.xiaolan',
    name: 'Blued极速版',
-    deprecatedKeys: [0],
+    deprecatedKeys: [0, 1],
  },
  {
    id: 'com.douban.frodo',
@@ -732,6 +732,21 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
    name: '阿里云盘',
    deprecatedKeys: [2],
  },
+  {
+    id: 'com.duokan.phone.remotecontroller',
+    name: '万能遥控',
+    deprecatedKeys: [0],
+  },
+  {
+    id: 'com.fenbi.android.solar',
+    name: '小猿搜题',
+    deprecatedKeys: [1],
+  },
+  {
+    id: 'com.guwendao.gwd',
+    name: '古文岛',
+    deprecatedKeys: [1],
+  },
 ];

 const map: Map<string, number[]> = new Map();
--- a/src/apps/com.daimajia.gold.ts
+++ b/src/apps/com.daimajia.gold.ts
@@ -11,9 +11,15 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules:
-        '@[id="com.daimajia.gold:id/iv_close"] -n LinearLayout [id="com.daimajia.gold:id/tv_title"][text="发现新版本"]',
+      rules: [
+        {
+          matches: [
+            '[text="发现新版本"]',
+            '[id="com.daimajia.gold:id/iv_close"]',
+          ],
          snapshotUrls: 'https://i.gkd.li/i/13498703',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.danlan.xiaolan.ts
+++ b/src/apps/com.danlan.xiaolan.ts
@@ -4,42 +4,31 @@ export default defineGkdApp({
  id: 'com.danlan.xiaolan',
  name: 'Blued极速版',
  groups: [
-    {
-      key: 1,
-      fastQuery: true,
-      name: '分段广告-"附近的人"页面卡片广告',
-      activityIds: 'com.soft.blued.ui.home.HomeActivity',
-      rules: [
-        {
-          key: 0,
-          matches:
-            '[id="com.danlan.xiaolan:id/ad_container"] >n [id="com.danlan.xiaolan:id/img_close"][clickable=true]',
-          snapshotUrls: 'https://i.gkd.li/i/13421613',
-        },
-        {
-          preKeys: [0],
-          key: 1,
-          matches: '@LinearLayout > [text="不感兴趣"]',
-          snapshotUrls: 'https://i.gkd.li/i/13421622',
-        },
-      ],
-    },
    {
      key: 3,
+      name: '分段广告-卡片广告',
      fastQuery: true,
-      name: '分段广告-"来访"页面卡片广告',
-      activityIds: 'com.blued.android.core.ui.TerminalActivity',
+      activityIds: [
+        'com.blued.android.core.ui.TerminalActivity',
+        'com.soft.blued.ui.home.HomeActivity',
+      ],
      rules: [
        {
          key: 0,
          matches: '[id="com.danlan.xiaolan:id/img_close"][clickable=true]',
-          snapshotUrls: 'https://i.gkd.li/i/13421923',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13421613',
+            'https://i.gkd.li/i/13421923',
+          ],
        },
        {
          preKeys: [0],
          key: 1,
          matches: '@LinearLayout > [text="不感兴趣"]',
-          snapshotUrls: 'https://i.gkd.li/i/13422170',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13421622',
+            'https://i.gkd.li/i/13422170',
+          ],
        },
      ],
    },
--- a/src/apps/com.dataoke.union.ts
+++ b/src/apps/com.dataoke.union.ts
@@ -14,6 +14,7 @@ export default defineGkdApp({
      resetMatch: 'app',
      rules: [
        {
+          activityIds: 'com.dtk.plat_home_lib.index.activity.IndexActivity',
          matches: ['[text^="你还没有打开通知哦"]', '[text="取消"]'],
          snapshotUrls: 'https://i.gkd.li/i/13446826',
        },
--- a/src/apps/com.ddsy.songyao.ts
+++ b/src/apps/com.ddsy.songyao.ts
@@ -8,9 +8,12 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-优惠卷提示',
      fastQuery: true,
-      activityIds: 'com.ddsy.songyao.activity.SplashActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
+          activityIds: 'com.ddsy.songyao.activity.SplashActivity',
          matches:
            '[id="com.ddsy.songyao:id/iv_coupon_bottom"] + [id="com.ddsy.songyao:id/iv_close"]',
          snapshotUrls: 'https://i.gkd.li/i/13048720',
--- a/src/apps/com.ddyc.lotterytool.ts
+++ b/src/apps/com.ddyc.lotterytool.ts
@@ -7,23 +7,30 @@ export default defineGkdApp({
    {
      key: 1,
      name: '全屏广告-弹窗广告',
-      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
      activityIds: 'com.ddyc.lotterytool.module.main.MainActivity',
-      rules:
-        'ImageView - ImageButton[id="com.ddyc.lotterytool:id/arg"][text=null]',
+      rules: [
+        {
+          matches:
+            '@ImageButton[clickable=true][childCount=0] < LinearLayout < FrameLayout < [parent=null]',
          snapshotUrls: 'https://i.gkd.li/i/13324555',
        },
+      ],
+    },
    {
      key: 2,
      name: '权限提示-通知权限',
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '[text^="开启推送通知"] +2 LinearLayout [text="以后再说"]',
+      rules: [
+        {
+          matches: '[text^="开启推送通知"] +2 LinearLayout [text="以后再说"]',
          snapshotUrls: 'https://i.gkd.li/i/13325888',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.dep.biguo.ts
+++ b/src/apps/com.dep.biguo.ts
@@ -10,25 +10,41 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '@[text="取消"] +2 [text="立即更新"]',
+      rules: [
+        {
+          activityIds: '.dialog',
+          matches: '@[text="取消"] +2 [text="立即更新"]',
          snapshotUrls: 'https://i.gkd.li/i/12708751',
        },
+      ],
+    },
    {
      key: 2,
      name: '全屏广告-首页弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
          activityIds: 'com.dep.biguo.dialog',
-      rules:
+          matches:
            '[id="com.dep.biguo:id/imageView"] + [id="com.dep.biguo:id/closeView"]',
          snapshotUrls: 'https://i.gkd.li/i/12708756',
        },
+      ],
+    },
    {
      key: 10,
      name: '权限提示-定位权限',
      actionMaximum: 1,
      resetMatch: 'app',
+      rules: [
+        {
          activityIds: 'com.dep.biguo.mvp.ui.activity.MainActivity',
-      rules: '[text*="定位权限"] +2 [text="拒绝"]',
+          matches: '[text*="定位权限"] +2 [text="拒绝"]',
          snapshotUrls: 'https://i.gkd.li/i/12708770',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.dewmobile.kuaiya.ts
+++ b/src/apps/com.dewmobile.kuaiya.ts
@@ -11,9 +11,10 @@ export default defineGkdApp({
        {
          key: 0,
          name: '腾讯广告',
+          fastQuery: true,
          activityIds: 'com.dewmobile.kuaiya.act.MainActivity',
          matches:
-            'ImageView - FrameLayout[childCount=1] > ImageView[childCount=0]',
+            'FrameLayout[childCount=5] > FrameLayout[childCount=1] > @ImageView[childCount=0][visibleToUser=true] <<n [id="com.dewmobile.kuaiya:id/sdk_container"]',
          snapshotUrls: 'https://i.gkd.li/i/13477048',
        },
      ],
--- a/src/apps/com.dianping.v1.ts
+++ b/src/apps/com.dianping.v1.ts
@@ -7,24 +7,33 @@ export default defineGkdApp({
    {
      key: 1,
      name: '全屏广告-主页推荐关注弹窗',
-      activityIds: ['com.dianping.main.guide.SplashActivity'],
-      rules:
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.dianping.main.guide.SplashActivity',
+          matches:
            'FrameLayout[id="android:id/content"] >2 FrameLayout > ImageView + FrameLayout[id=null][desc="关闭"][clickable=true]',
          snapshotUrls: 'https://i.gkd.li/i/12727011',
        },
+      ],
+    },
    {
      key: 2,
      name: '权限提示-通知权限',
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: {
+      rules: [
+        {
          matches:
            '[text="去开启"][clickable=true] +2 @FrameLayout[clickable=true] > ImageView',
          action: 'clickCenter', // clickNode无响应
-      },
          snapshotUrls: 'https://i.gkd.li/i/12727070',
        },
+      ],
+    },
    {
      key: 3,
      name: '局部广告-关闭[签到开红包]',
--- a/src/apps/com.didi.live.spring.ts
+++ b/src/apps/com.didi.live.spring.ts
@@ -8,9 +8,12 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-弹窗广告',
      desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
-          fastQuery: true,
          activityIds:
            'com.qennnsad.aknkaksd.presentation.ui.MainContainerActivity',
          matches: '[vid="dialog_hall_iv_close"]',
--- a/src/apps/com.diershoubing.erbing.ts
+++ b/src/apps/com.diershoubing.erbing.ts
@@ -34,18 +34,19 @@ export default defineGkdApp({
      key: 6,
      name: '分段广告',
      fastQuery: true,
+      activityIds: '.activity.MainReActivity',
      rules: [
        {
          key: 1,
-          matches: '[id="com.diershoubing.erbing:id/mainV"] >n [text="广告"]',
-          exampleUrls:
-            'https://m.gkd.li/47232102/5498dc61-9f29-42c6-a75b-ac8471e48328',
+          matches: '[text="广告"]',
+          exampleUrls: 'https://e.gkd.li/921d559f-6535-4d54-9bb2-8bbc82a6f2e1',
          snapshotUrls: 'https://i.gkd.li/i/13868396',
        },
        {
+          preKeys: [1],
          key: 2,
-          preKeys: 1,
          matches: '@LinearLayout > [text="不感兴趣"]',
+          exampleUrls: 'https://e.gkd.li/e6818e93-3fab-4afa-95b9-0ba38ea7f2db',
          snapshotUrls: 'https://i.gkd.li/i/13868401',
        },
      ],
--- a/src/apps/com.dlmetro.app.ts
+++ b/src/apps/com.dlmetro.app.ts
@@ -8,6 +8,9 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-弹窗广告',
      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          fastQuery: true,
--- a/src/apps/com.dmzj.manhua.ts
+++ b/src/apps/com.dmzj.manhua.ts
@@ -7,26 +7,33 @@ export default defineGkdApp({
    {
      key: 1,
      name: '全屏广告-弹窗广告',
-      activityIds: 'com.dmzj.manhua.ui.LaunchInterceptorActivity',
      fastQuery: true,
-      actionMaximum: 1,
-      resetMatch: 'activity',
      matchTime: 10000,
-      rules: '[id="com.dmzj.manhua:id/iv_close"]',
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.dmzj.manhua.ui.LaunchInterceptorActivity',
+          matches: '[id="com.dmzj.manhua:id/iv_close"]',
          snapshotUrls: 'https://i.gkd.li/i/13542503',
        },
+      ],
+    },
    {
      key: 2,
-      name: '局部广告-主页"您想运行会员系统吗"弹窗',
+      name: '局部广告-悬浮广告',
      desc: '点击取消',
-      activityIds: 'com.dmzj.manhua.ui.home.HomeTabsActivitys',
      fastQuery: true,
-      actionMaximum: 1,
-      resetMatch: 'activity',
      matchTime: 10000,
-      rules:
-        '@[id="com.dmzj.manhua:id/ivAdClose"] - [id="com.dmzj.manhua:id/ivFloatAd"]',
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.dmzj.manhua.ui.home.HomeTabsActivitys',
+          matches: '[id="com.dmzj.manhua:id/ivAdClose"]',
          snapshotUrls: 'https://i.gkd.li/i/13542506',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.dmzjsq.manhua.ts
+++ b/src/apps/com.dmzjsq.manhua.ts
@@ -8,6 +8,9 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-弹窗广告',
      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          key: 1,
--- a/src/apps/com.doc360.client.ts
+++ b/src/apps/com.doc360.client.ts
@@ -7,11 +7,16 @@ export default defineGkdApp({
    {
      key: 5,
      name: '局部广告-信息流广告',
+      desc: '点击关闭',
+      rules: [
+        {
          fastQuery: true,
          activityIds: 'com.doc360.client.activity.ReadRoomActivity',
-      rules:
-        '@FrameLayout[desc^="dislike"] <<n [id="com.doc360.client:id/fl_ad_container"]',
+          matches:
+            '@View[clickable=true] < FrameLayout[desc^="dislike"] -2 FrameLayout >2 [text="广告"]',
          snapshotUrls: 'https://i.gkd.li/i/13485051',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.dongqiudi.news.ts
+++ b/src/apps/com.dongqiudi.news.ts
@@ -48,9 +48,14 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: 'TextView[text*="新版本"] +3 TextView[text="下次提醒"]',
+      rules: [
+        {
+          activityIds: '.DownloadActivity',
+          matches: 'TextView[text*="新版本"] +3 TextView[text="下次提醒"]',
          snapshotUrls: 'https://i.gkd.li/i/12620586',
        },
+      ],
+    },
    {
      key: 4,
      name: '分段广告-首页信息流广告',
@@ -82,12 +87,19 @@ export default defineGkdApp({
    {
      key: 5,
      name: '全屏广告-首页弹窗广告',
-      desc: '点击底部"x"关闭',
-      activityIds: 'com.dongqiudi.news.MainActivity',
+      desc: '点击关闭',
      fastQuery: true,
-      rules: '[id="com.dongqiudi.news:id/iv_close"]',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.dongqiudi.news.MainActivity',
+          matches: '[id="com.dongqiudi.news:id/iv_close"]',
          snapshotUrls: 'https://i.gkd.li/i/13260467',
        },
+      ],
+    },
    {
      key: 8,
      name: '全屏广告-数据页弹窗广告',
@@ -96,23 +108,29 @@ export default defineGkdApp({
      activityIds: 'com.dongqiudi.news.MainActivity',
      rules: [
        {
+          key: 1,
          name: '腾讯广告SDK',
+          fastQuery: true,
          matches:
-            'FrameLayout > FrameLayout[childCount=1] > ImageView[width<80][height<80]',
+            '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]',
          snapshotUrls: 'https://i.gkd.li/i/13626900',
        },
        {
+          key: 2,
          name: '快手广告磁力智投SDK',
+          fastQuery: true,
          matches:
-            'ViewGroup[childCount=1] > @ViewGroup[clickable=true][childCount=1] > ImageView',
+            'ImageView[childCount=0][text=null] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] < ViewGroup +n ViewGroup[childCount=2] > [text="广告"]',
          snapshotUrls: 'https://i.gkd.li/i/13627105',
        },
        {
+          key: 3,
          name: '字节广告穿山甲SDK-1',
          matches: 'View[text="反馈"] -2 @View > Image',
          snapshotUrls: 'https://i.gkd.li/i/13627106',
        },
        {
+          key: 4,
          name: '字节广告穿山甲SDK-2', //合并key3
          matches: 'FrameLayout[desc^="webview-close"] > View[clickable=true]',
          snapshotUrls: 'https://i.gkd.li/i/12620588',
--- a/src/apps/com.douban.frodo.ts
+++ b/src/apps/com.douban.frodo.ts
@@ -59,7 +59,6 @@ export default defineGkdApp({
      desc: '书影音-作品-状态-不分享/同步短评(5s后可手动)',
      fastQuery: true,
      matchTime: 5000,
-      resetMatch: 'activity',
      activityIds: 'com.douban.frodo.subject.activity.RatingActivity',
      rules: [
        {
@@ -179,6 +178,7 @@ export default defineGkdApp({
      resetMatch: 'app',
      rules: [
        {
+          activityIds: '.activity.SplashActivity',
          matches: '[text="下次再说"][id="com.douban.frodo:id/neutral"]',
          snapshotUrls: 'https://i.gkd.li/i/12548314',
        },
@@ -263,6 +263,10 @@ export default defineGkdApp({
      rules: [
        {
          key: 0,
+          activityIds: [
+            '.activity.BetaApkDialogActivity',
+            '.activity.SplashActivity',
+          ],
          matches: ['[text="新版试用邀请"]', '@[text="取消"] + [text="下载"]'],
          snapshotUrls: [
            'https://i.gkd.li/i/13228832',
--- a/src/apps/com.dragon.read.ts
+++ b/src/apps/com.dragon.read.ts
@@ -55,13 +55,18 @@ export default defineGkdApp({
    {
      key: 1,
      name: '更新提示',
+      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      fastQuery: true,
-      rules: '@[text="以后再说"] + [text="优先体验"]',
+      rules: [
+        {
+          activityIds: '.update',
+          matches: '@[text="以后再说"] + [text="优先体验"]',
          snapshotUrls: 'https://i.gkd.li/i/12716477',
        },
+      ],
+    },
    {
      key: 2,
      name: '局部广告-首页右侧悬浮广告',
@@ -127,7 +132,7 @@ export default defineGkdApp({
    },
    {
      key: 4,
-      name: '功能类-阅读页面关注作者弹窗',
+      name: '全屏广告-阅读页面关注作者弹窗',
      fastQuery: true,
      rules: [
        {
@@ -180,31 +185,46 @@ export default defineGkdApp({
    {
      key: 6,
      name: '评价提示-请求好评弹窗',
+      fastQuery: true,
      actionMaximum: 1,
      resetMatch: 'app',
-      fastQuery: true,
-      rules: '@ImageView[clickable=true] +3 * > [text="五星好评"]',
+      rules: [
+        {
+          activityIds: '.pages.main.MainFragmentActivity',
+          matches: '@ImageView[clickable=true] +3 * > [text="五星好评"]',
          snapshotUrls: 'https://i.gkd.li/i/14395093',
        },
+      ],
+    },
    {
      key: 10,
      name: '权限提示-通知权限',
-      desc: '自动点击"取消"',
+      desc: '点击"取消"',
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '@[text="取消"] < * -2 * > [text="开启推送提醒"]',
+      rules: [
+        {
+          activityIds: '.widget.ConfirmDialogBuilder',
+          matches: '@[text="取消"] < * -2 * > [text="开启推送提醒"]',
          snapshotUrls: 'https://i.gkd.li/i/12716592',
        },
+      ],
+    },
    {
      key: 12,
      name: '全屏广告',
-      desc: '点击右上角"关闭"',
+      desc: '点击"关闭"',
+      rules: [
+        {
          fastQuery: true,
          activityIds: 'com.dragon.read.reader.ui.ReaderActivity',
-      rules: 'TextView[text="广告"] +2 Button[id="com.dragon.read:id/close"]',
+          matches:
+            'TextView[text="广告"] +2 Button[id="com.dragon.read:id/close"]',
          snapshotUrls: 'https://i.gkd.li/i/13191156',
        },
+      ],
+    },
    {
      key: 14,
      name: '全屏广告-会员福利弹窗',
--- a/src/apps/com.dtdream.publictransit.ts
+++ b/src/apps/com.dtdream.publictransit.ts
@@ -7,9 +7,17 @@ export default defineGkdApp({
    {
      key: 0,
      name: '全屏广告-弹窗广告',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
          activityIds: 'com.dtchuxing.main.MainActivity',
-      rules: '[id="com.dtdream.publictransit:id/ifv_close"]',
+          matches: '[id="com.dtdream.publictransit:id/ifv_close"]',
          snapshotUrls: 'https://i.gkd.li/i/12830113',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.dubox.drive.ts
+++ b/src/apps/com.dubox.drive.ts
@@ -30,10 +30,17 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-弹窗广告',
      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
          activityIds: 'com.dubox.drive.ui.MainActivity',
-      rules: 'ImageView[id="com.dubox.drive:id/ivClose"]',
+          matches: 'ImageView[id="com.dubox.drive:id/ivClose"]',
          snapshotUrls: 'https://i.gkd.li/i/13200577',
        },
+      ],
+    },
    {
      key: 2,
      name: '权限提示-通知权限',
@@ -41,9 +48,14 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules:
+      rules: [
+        {
+          activityIds: '.permission.view.PermissionDialogActivity',
+          matches:
            '[text="Authorize"] - [id="com.dubox.drive:id/dialog_button_cancel"]',
          snapshotUrls: 'https://i.gkd.li/i/13688406',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.duitang.main.ts
+++ b/src/apps/com.duitang.main.ts
@@ -5,8 +5,9 @@ export default defineGkdApp({
  name: '堆糖',
  groups: [
    {
-      name: '局部广告-信息流广告',
      key: 2,
+      name: '局部广告-信息流广告',
+      fastQuery: true,
      rules: [
        {
          key: 0,
@@ -14,22 +15,13 @@ export default defineGkdApp({
            'com.duitang.main.business.',
            'com.duitang.main.activity.',
          ],
-          fastQuery: true,
-          matches: '[vid="adOptionEntry"][visibleToUser=true]',
+          matches: '[vid="adOptionEntry" || vid="adClose"][visibleToUser=true]',
          snapshotUrls: [
            'https://i.gkd.li/i/14232228',
            'https://i.gkd.li/i/14232332',
            'https://i.gkd.li/i/14232347',
            'https://i.gkd.li/i/14232348',
            'https://i.gkd.li/i/14232368',
-          ],
-        },
-        {
-          key: 1,
-          activityIds: 'com.duitang.main.business.',
-          fastQuery: true,
-          matches: '[vid="adClose"][visibleToUser=true]',
-          snapshotUrls: [
            'https://i.gkd.li/i/14232218',
            'https://i.gkd.li/i/14232352',
          ],
@@ -40,12 +32,13 @@ export default defineGkdApp({
      key: 3,
      name: '评价提示',
      desc: '点击[下次再说]',
+      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      fastQuery: true,
      rules: [
        {
+          activityIds: '.business.main.NAMainActivity',
          matches: '[vid="scoreDuitangCancel"]',
          snapshotUrls: 'https://i.gkd.li/i/14273094',
        },
@@ -53,11 +46,11 @@ export default defineGkdApp({
    },
    {
      key: 4,
-      fastQuery: true,
      name: '全屏广告-图片页弹窗广告',
-      desc: '点击X',
+      desc: '点击关闭',
      rules: [
        {
+          fastQuery: true,
          activityIds: [
            'com.duitang.main.business.display.ImageActivity',
            'com.duitang.main.business.main.NAMainActivity',
@@ -73,12 +66,18 @@ export default defineGkdApp({
    {
      key: 5,
      name: '权限提示-通知权限',
-      desc: '点击[x]',
+      desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      fastQuery: true,
-      rules: '@[vid="dialogNegative"] +2 [text="打开通知"]',
+      rules: [
+        {
+          activityIds: '.business.main.NAMainActivity',
+          matches: '@[vid="dialogNegative"] +2 [text="打开通知"]',
          snapshotUrls: 'https://i.gkd.li/i/14273121',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.duoduo.cimoc.su.ts
+++ b/src/apps/com.duoduo.cimoc.su.ts
@@ -8,6 +8,9 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-首页弹窗广告',
      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          fastQuery: true,
@@ -24,9 +27,10 @@ export default defineGkdApp({
      desc: '点击X',
      rules: [
        {
+          fastQuery: true,
          activityIds: 'com.duoduo.cimoc.su.MainActivity',
          matches:
-            '@TextView[clickable=true] <2 View[childCount=2] -2 [text="广告"]',
+            '@TextView[clickable=true] <2 View[childCount=2] -2 [visibleToUser=true][text="广告"] <<n [vid="ksad_container"]',
          snapshotUrls: 'https://i.gkd.li/i/13999283',
        },
      ],
@@ -37,9 +41,10 @@ export default defineGkdApp({
      desc: '关闭视频播放页、搜索页广告',
      rules: [
        {
+          fastQuery: true,
          activityIds: 'com.duoduo.cimoc.su.MainActivity',
          matches:
-            'FrameLayout[childCount=4] > FrameLayout > ImageView[visibleToUser=true]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout > [text="查看详情"]',
          snapshotUrls: [
            'https://i.gkd.li/i/13999284',
            'https://i.gkd.li/i/13999376',
--- a/src/apps/com.duokan.phone.remotecontroller.ts
+++ b/src/apps/com.duokan.phone.remotecontroller.ts
@@ -4,26 +4,22 @@ export default defineGkdApp({
  id: 'com.duokan.phone.remotecontroller',
  name: '万能遥控',
  groups: [
-    {
-      key: 0,
-      name: '局部广告-底部横幅广告',
-      activityIds:
-        'com.xiaomi.mitv.phone.remotecontroller.HoriWidgetMainActivityV2',
-      rules:
-        'ImageView[id="com.duokan.phone.remotecontroller:id/image_close_banner"]',
-    },
    {
      key: 4,
      name: '权限提示-定位权限',
+      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      fastQuery: true,
+      rules: [
+        {
          activityIds:
            'com.xiaomi.mitv.phone.remotecontroller.HoriWidgetMainActivityV2',
-      rules:
-        '[id="com.duokan.phone.remotecontroller:id/ll_permission"] [text="取消"]',
+          matches:
+            '[id="com.duokan.phone.remotecontroller:id/ll_permission"] >2 [text="取消"]',
          snapshotUrls: 'https://i.gkd.li/i/13642080',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.duokan.reader.ts
+++ b/src/apps/com.duokan.reader.ts
@@ -8,10 +8,17 @@ export default defineGkdApp({
      key: 2,
      name: '全屏广告-首页弹窗广告',
      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
          activityIds: 'com.duokan.reader.DkMainActivity',
-      rules: '[id="com.duokan.reader:id/store_feed_layer_close"]',
+          matches: '[id="com.duokan.reader:id/store_feed_layer_close"]',
          snapshotUrls: 'https://i.gkd.li/i/13248773',
        },
+      ],
+    },
    {
      key: 3,
      name: '全屏广告-小说推荐弹窗',
@@ -19,8 +26,8 @@ export default defineGkdApp({
        {
          key: 1,
          name: '退出阅读时的推荐弹窗',
-          activityIds: 'com.duokan.reader.DkMainActivity',
          fastQuery: true,
+          activityIds: 'com.duokan.reader.DkMainActivity',
          matches:
            '[id="com.duokan.reader:id/reading_stop_read_recommend_stop"]',
          snapshotUrls: 'https://i.gkd.li/i/13413412',
@@ -31,34 +38,37 @@ export default defineGkdApp({
      key: 4,
      name: '局部广告-小说页广告',
      desc: '小说页面下方出现的条形广告',
+      rules: [
+        {
          fastQuery: true,
          activityIds: 'com.duokan.reader.DkMainActivity',
-      rules:
+          matches:
            '@ImageView < FrameLayout[id="com.duokan.reader:id/reading__app_ad_view__close"]',
          snapshotUrls: 'https://i.gkd.li/i/13497902',
        },
+      ],
+    },
    {
      key: 5,
      name: '分段广告-小说页全屏卡片广告',
-      desc: '点击关闭和确定按钮',
+      desc: '点击关闭-点击确定按钮',
      fastQuery: true,
+      activityIds: 'com.duokan.reader.DkMainActivity',
      rules: [
        {
          key: 0,
-          activityIds: 'com.duokan.reader.DkMainActivity',
          matches:
            '@TextView[id="com.duokan.reader:id/reading__app_ad_view__close"][text="广告"]',
+          snapshotUrls: 'https://i.gkd.li/i/13498048',
        },
        {
+          preKeys: [0],
          key: 1,
          matches:
            '@TextView[id="com.duokan.reader:id/ad__feedback_close_dialog_button"][text="知道了"]',
+          snapshotUrls: 'https://i.gkd.li/i/13497990',
        },
      ],
-      snapshotUrls: [
-        'https://i.gkd.li/i/13498048',
-        'https://i.gkd.li/i/13497990',
-      ],
    },
    {
      key: 6,
@@ -70,6 +80,7 @@ export default defineGkdApp({
      resetMatch: 'app',
      rules: [
        {
+          activityIds: '.DkMainActivity',
          matches:
            '[id="com.duokan.reader:id/general__common_dialog_view__button_frame"] >2 [text="以后再说"]',
          snapshotUrls: 'https://i.gkd.li/i/14007573',
--- a/src/apps/com.duowan.kiwi.ts
+++ b/src/apps/com.duowan.kiwi.ts
@@ -29,14 +29,16 @@ export default defineGkdApp({
        },
        {
          key: 2,
+          fastQuery: true,
          matches:
            '[id="com.duowan.kiwi:id/popup_banner"] >2 [id="com.duowan.kiwi:id/ui_count_down"]',
          snapshotUrls: ['https://i.gkd.li/i/13417245'],
        },
        {
          key: 3,
+          fastQuery: true,
          matches:
-            '[id="com.duowan.kiwi:id/miniapp_content_container"] FrameLayout > ViewGroup[childCount=2] > @ViewGroup[clickable=true] > ImageView',
+            '@ViewGroup[clickable=true][visibleToUser=true] <2 ViewGroup < FrameLayout <2 FrameLayout < [id="com.duowan.kiwi:id/miniapp_content_container"]',
          snapshotUrls: 'https://i.gkd.li/i/13401266',
        },
      ],
@@ -50,6 +52,7 @@ export default defineGkdApp({
      resetMatch: 'app',
      rules: [
        {
+          activityIds: '.homepage.Homepage',
          matches: '@ImageView[id="com.duowan.kiwi:id/upgrade_cancel"]',
          snapshotUrls: 'https://i.gkd.li/i/13440833',
        },
@@ -58,10 +61,14 @@ export default defineGkdApp({
    {
      key: 4,
      name: '全屏广告-弹窗广告',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          key: 0,
-          activityIds: 'com.duowan.kiwi.homepage.Homepage',
+          activityIds: '.homepage.Homepage',
          matches:
            '[id="com.duowan.kiwi:id/animation_view"] + [id="com.duowan.kiwi:id/v_close"]',
          snapshotUrls: 'https://i.gkd.li/i/13625453',
@@ -70,14 +77,19 @@ export default defineGkdApp({
    },
    {
      key: 5,
-      name: '功能类-root提示',
+      name: '其他-root提示',
      desc: '点击确认',
      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '[text^="您的设备已经被ROOT"] + LinearLayout [text="确认"]',
+      rules: [
+        {
+          activityIds: '.homepage.Homepage',
+          matches: '[text^="您的设备已经被ROOT"] + LinearLayout [text="确认"]',
          snapshotUrls: 'https://i.gkd.li/i/13536744',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.dw.btime.ts
+++ b/src/apps/com.dw.btime.ts
@@ -8,28 +8,43 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-弹窗广告',
      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
          activityIds: 'com.dw.btime.MainHomeTabActivity',
-      rules: '[id="com.dw.btime:id/iv_overlay_close"][clickable=true]',
+          matches: '[id="com.dw.btime:id/iv_overlay_close"][clickable=true]',
          snapshotUrls: 'https://i.gkd.li/i/12889448',
        },
+      ],
+    },
    {
      key: 2,
      name: '局部广告-横幅广告',
+      rules: [
+        {
          fastQuery: true,
          activityIds: 'com.dw.btime.MainHomeTabActivity',
-      rules: '[id="com.dw.btime:id/old_baby_close"][clickable=true]',
+          matches: '[id="com.dw.btime:id/old_baby_close"][clickable=true]',
          snapshotUrls: 'https://i.gkd.li/i/12889450',
        },
+      ],
+    },
    {
      key: 3,
      name: '更新提示',
+      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      fastQuery: true,
-      rules:
-        'TextView[text="立即更新"] -3 [id="com.dw.btime:id/iv_upgrade_close"]',
+      rules: [
+        {
+          activityIds: '.base_library.dialog.DWBaseDialog',
+          matches: '[id="com.dw.btime:id/iv_upgrade_close"]',
          snapshotUrls: 'https://i.gkd.li/i/12911011',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.dz.xmbnxj.ts
+++ b/src/apps/com.dz.xmbnxj.ts
@@ -9,8 +9,8 @@ export default defineGkdApp({
      name: '局部广告-底部卡片广告',
      rules: [
        {
-          activityIds: 'com.lynx.boot.LynxActivity',
          fastQuery: true,
+          activityIds: 'com.lynx.boot.LynxActivity',
          matches: '[id="com.dz.xmbnxj:id/mix_img_close"]',
          exampleUrls:
            'https://m.gkd.li/99116490/40d3c3c9-9443-4c71-9a98-69efa38f8bfd',
--- a/src/apps/com.eastmoney.android.berlin.ts
+++ b/src/apps/com.eastmoney.android.berlin.ts
@@ -10,11 +10,13 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      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/i/12706070', //com.eastmoney.android.module.launcher.internal.home.HomeActivity
-        'https://i.gkd.li/i/13399156', //com.bbk.launcher2.Launcher
+      rules: [
+        {
+          activityIds:
+            'com.eastmoney.android.module.launcher.internal.home.HomeActivity',
+          matches: '[id="com.eastmoney.android.berlin:id/tv_update_next_time"]',
+          snapshotUrls: 'https://i.gkd.li/i/12706070',
+        },
      ],
    },
    {
@@ -23,9 +25,15 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules:
-        '[id="com.eastmoney.android.berlin:id/push_on_notify_on"] + [id="com.eastmoney.android.berlin:id/push_on_notify_delete"]',
+      rules: [
+        {
+          activityIds:
+            'com.eastmoney.android.module.launcher.internal.home.HomeActivity',
+          matches:
+            '[id="com.eastmoney.android.berlin:id/push_on_notify_delete"]',
          snapshotUrls: 'https://i.gkd.li/i/12706065',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.eastmoney.android.fund.ts
+++ b/src/apps/com.eastmoney.android.fund.ts
@@ -7,32 +7,45 @@ export default defineGkdApp({
    {
      key: 1,
      name: '局部广告-自选页面广告',
+      rules: [
+        {
          activityIds:
            'com.eastmoney.android.fund.centralis.activity.FundRootActivity',
-      rules: [
+          matches:
            'FrameLayout > FrameLayout > ImageView + FrameLayout[childCount=1] > ImageView',
-      ],
          snapshotUrls: 'https://i.gkd.li/i/12642387',
        },
+      ],
+    },
    {
      key: 2,
-      name: '功能类-自选页面缩写提示信息',
+      name: '其他-自选页面缩写提示信息',
+      rules: [
+        {
          activityIds:
            'com.eastmoney.android.fund.centralis.activity.FundRootActivity',
-      rules: [
+          matches:
            '[desc="表示场内基金的最新价和折价率"] -(2) FrameLayout < FrameLayout + ImageView',
-      ],
          snapshotUrls: 'https://i.gkd.li/i/12642387',
        },
+      ],
+    },
    {
      key: 3,
      name: '更新提示',
+      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '@FrameLayout[clickable=true] - * >2 [desc="立即升级"]',
+      rules: [
+        {
+          activityIds: '.centralis.activity.FundRootActivity',
+          matches:
+            '@FrameLayout[clickable=true] - * >2 [desc="立即升级"] <<n [id="com.eastmoney.android.fund:id/container"]',
          snapshotUrls: 'https://i.gkd.li/i/13546927',
        },
+      ],
+    },
    {
      key: 4,
      name: '全屏广告-弹窗广告',
@@ -45,7 +58,7 @@ export default defineGkdApp({
            'com.eastmoney.android.fund.activity.FundSplashActivity',
          ],
          matches:
-            '@ImageView[visibleToUser=true] < FrameLayout - ImageView < FrameLayout <<n [vid="container"]',
+            'ImageView[childCount=0] < @FrameLayout[clickable=true][childCount=1] <2 FrameLayout < FrameLayout < FrameLayout < FrameLayout < [vid="container"]',
          exampleUrls:
            'https://m.gkd.li/57941037/21743bbb-010a-410c-8ce1-57710d37722d',
          snapshotUrls: [
@@ -59,13 +72,14 @@ export default defineGkdApp({
      key: 5,
      name: '评价提示-好评弹窗',
      desc: '点击下次再说',
+      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
      rules: [
        {
-          matches:
-            '[id="com.eastmoney.android.fund:id/container"] [desc="下次再说"]',
+          activityIds: '.centralis.activity.FundRootActivity',
+          matches: '@[desc="下次再说"] <<n [vid="container"]',
          exampleUrls:
            'https://m.gkd.li/57941037/d791a2f9-ae86-4389-8ee7-36a87f11b60d',
          snapshotUrls: 'https://i.gkd.li/i/14179508',
--- a/src/apps/com.ecellsz.watch.guard.ts
+++ b/src/apps/com.ecellsz.watch.guard.ts
@@ -11,9 +11,13 @@ export default defineGkdApp({
      actionMaximum: 1,
      resetMatch: 'app',
      priorityTime: 10000,
-      rules:
+      rules: [
+        {
+          matches:
            'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][text=null][visibleToUser=true] + TextView[visibleToUser=true][text=null][index=parent.childCount.minus(1)]',
          snapshotUrls: 'https://i.gkd.li/i/14039510',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.ecitic.bank.mobile.ts
+++ b/src/apps/com.ecitic.bank.mobile.ts
@@ -10,41 +10,58 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '@[text="暂不更新"] + [text="立即更新"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/12701217',
-        'https://i.gkd.li/i/12701250', // activityId: 'com.miui.home.launcher.Launcher'
+      rules: [
+        {
+          activityIds: '.ui.MainActivity',
+          matches: '@[text="暂不更新"] + [text="立即更新"]',
+          snapshotUrls: 'https://i.gkd.li/i/12701217',
+        },
      ],
    },
    {
      key: 2,
      name: '全屏广告-弹窗广告',
+      rules: [
+        {
+          fastQuery: true,
          activityIds: [
            'com.ecitic.bank.mobile.ui.MainActivity',
            'com.ecitic.bank.mobile.ui.webview.CordovaWebViewActivity',
          ],
-      rules:
-        '[id="com.ecitic.bank.mobile:id/id_cordova_view"] + [id="com.ecitic.bank.mobile:id/close_product_send"]',
+          matches: '[id="com.ecitic.bank.mobile:id/close_product_send"]',
          snapshotUrls: [
-        'https://i.gkd.li/i/13402746',
            'https://i.gkd.li/i/12701230',
+            'https://i.gkd.li/i/13402746',
+          ],
+        },
      ],
    },
    {
      key: 3,
      name: '权限提示-通知权限',
+      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '@[text="取消"] + [text="立即开启"]',
+      rules: [
+        {
+          activityIds: '.ui.MainActivity',
+          matches: '@[text="取消"] + [text="立即开启"]',
          snapshotUrls: 'https://i.gkd.li/i/13399102',
        },
+      ],
+    },
    {
      key: 4,
      name: '局部广告-理财产品悬浮广告',
+      rules: [
+        {
          activityIds: 'com.ecitic.bank.mobile.ui.MainActivity',
-      rules: '@[clickable=true] +2 [text="恭喜您关注到宝藏基金"]',
+          matches:
+            '@[clickable=true] +2 [visibleToUser=true][text="恭喜您关注到宝藏基金"] <<n [vid="cordova_view"]',
          snapshotUrls: 'https://i.gkd.li/i/14208637',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.eco.global.app.ts
+++ b/src/apps/com.eco.global.app.ts
@@ -12,8 +12,12 @@ export default defineGkdApp({
      actionMaximum: 1,
      resetMatch: 'app',
      priorityTime: 10000,
-      rules: 'ImageView[id="com.eco.global.app:id/adview_jump"]',
+      rules: [
+        {
+          matches: 'ImageView[id="com.eco.global.app:id/adview_jump"]',
          snapshotUrls: 'https://i.gkd.li/i/13538616',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.eg.android.AlipayGphone.ts
+++ b/src/apps/com.eg.android.AlipayGphone.ts
@@ -8,13 +8,6 @@ export default defineGkdApp({
      key: 0,
      name: '全屏广告-关闭花呗升级弹窗',
      rules: [
-        {
-          key: 0,
-          activityIds:
-            'com.alipay.mobile.nebulax.integration.mpaas.activity.NebulaActivity$Main',
-          matches: 'View[childCount=3] > @Image - View[text="花呗服务升级"]',
-          snapshotUrls: 'https://i.gkd.li/i/12737055',
-        },
        {
          key: 1,
          fastQuery: true,
@@ -52,10 +45,14 @@ export default defineGkdApp({
      fastQuery: true,
      actionMaximum: 1,
      resetMatch: 'app',
+      rules: [
+        {
          activityIds: 'com.eg.android.AlipayGphone.AlipayLogin',
-      rules: '@[desc="关闭"] - * >4 [text*="开启定位权限"]',
+          matches: '@[desc="关闭"] - * >4 [text*="开启定位权限"]',
          snapshotUrls: 'https://i.gkd.li/i/12792688',
        },
+      ],
+    },
    {
      key: 2,
      name: '权限提示-通知权限',
@@ -100,6 +97,10 @@ export default defineGkdApp({
      rules: [
        {
          key: 0,
+          activityIds: [
+            'com.alipay.mobile.alipassapp.alkb.kb.ALPMainPage',
+            '.AlipayLogin',
+          ],
          matches: [
            '[text="立即更新" || text="马上体验"]',
            '[text^="稍后"][text.length=4]',
@@ -111,6 +112,10 @@ export default defineGkdApp({
        },
        {
          key: 1,
+          activityIds: [
+            'com.alipay.mobile.about.ui.AboutAlipayActivity',
+            '.AlipayLogin',
+          ],
          matches:
            '[text="版本更新"||text^="Version"] - [id="com.alipay.mobile.antui:id/btn_close"]',
          snapshotUrls: [
@@ -120,6 +125,7 @@ export default defineGkdApp({
        },
        {
          key: 2,
+          activityIds: '.AlipayLogin',
          matches:
            '[text="立即升级最新版支付宝客户端"] < LinearLayout + [id="com.alipay.mobile.advertisement:id/announcementview_righticon"]',
          snapshotUrls: 'https://i.gkd.li/i/13490797',
--- a/src/apps/com.enflick.android.TextNow.ts
+++ b/src/apps/com.enflick.android.TextNow.ts
@@ -6,11 +6,12 @@ export default defineGkdApp({
  groups: [
    {
      key: 1,
-      name: '功能类-设为默认应用提示',
+      name: '其他-设为默认应用提示',
+      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      fastQuery: true,
+      activityIds: '.activities.MainActivity',
      rules: [
        {
          key: 0,
@@ -19,7 +20,7 @@ export default defineGkdApp({
          snapshotUrls: 'https://i.gkd.li/i/13630460',
        },
        {
-          preKeys: 0,
+          preKeys: [0],
          matches: '[id="android:id/button2"][text="SKIP"]',
          snapshotUrls: 'https://i.gkd.li/i/13630463',
        },
@@ -31,8 +32,10 @@ export default defineGkdApp({
      fastQuery: true,
      actionMaximum: 1,
      resetMatch: 'app',
+      rules: [
+        {
          activityIds: 'com.enflick.android.TextNow.activities.MainActivity',
-      rules:
+          matches:
            '@ImageView[clickable=true] <2 [id="com.enflick.android.TextNow:id/calling_banner"]',
          snapshotUrls: [
            'https://i.gkd.li/i/13657279',
@@ -40,4 +43,6 @@ export default defineGkdApp({
          ],
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.estrongs.android.pop.ts
+++ b/src/apps/com.estrongs.android.pop.ts
@@ -9,14 +9,18 @@ export default defineGkdApp({
      name: '全屏广告',
      rules: [
        {
+          key: 0,
+          fastQuery: true,
          activityIds: 'com.fighter.loader.view.InteractTemplateAdDialog',
          matches: '[id="com.estrongs.android.pop:id/iv_close"]',
          snapshotUrls: 'https://i.gkd.li/i/12509667',
        },
        {
+          key: 1,
+          fastQuery: true,
          activityIds: 'com.estrongs.android.pop.view.FileExplorerActivity',
          matches:
-            'TextView[text!=null] < FrameLayout - ImageView - FrameLayout > ImageView',
+            '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]',
          snapshotUrls: 'https://i.gkd.li/i/12509669',
        },
      ],
--- a/src/apps/com.example.raylink_flutter.ts
+++ b/src/apps/com.example.raylink_flutter.ts
@@ -10,9 +10,14 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '[desc="立即升级"] + [desc="以后再说"]',
+      rules: [
+        {
+          activityIds: '.MainActivity',
+          matches: '[desc="立即升级"] + [desc="以后再说"]',
          snapshotUrls: 'https://i.gkd.li/i/13659530',
        },
+      ],
+    },
    {
      key: 2,
      name: '功能类-退出软件时点击"退出程序"',
--- a/src/apps/com.example.servyouappzhuhai.ts
+++ b/src/apps/com.example.servyouappzhuhai.ts
@@ -13,6 +13,8 @@ export default defineGkdApp({
      resetMatch: 'app',
      rules: [
        {
+          activityIds:
+            'cn.com.servyou.servyouzhuhai.activity.main.imps.MainActivity',
          matches: '[id="com.example.servyouappzhuhai:id/btn_dialog_negtive"]',
          snapshotUrls: 'https://i.gkd.li/i/13440721',
        },
--- a/src/apps/com.example.yr.ts
+++ b/src/apps/com.example.yr.ts
@@ -8,6 +8,9 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-弹窗广告',
      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          key: 0,
--- a/src/apps/com.excean.gspace.ts
+++ b/src/apps/com.excean.gspace.ts
@@ -7,6 +7,9 @@ export default defineGkdApp({
    {
      key: 1,
      name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      forcedTime: 10000,
      rules: [
        {
--- a/src/apps/com.excean.na.ts
+++ b/src/apps/com.excean.na.ts
@@ -22,11 +22,11 @@ export default defineGkdApp({
    },
    {
      key: 1,
-      fastQuery: true,
      name: '局部广告-卡片广告',
-      desc: '点击X',
+      desc: '点击关闭',
      rules: [
        {
+          fastQuery: true,
          activityIds: 'com.excelliance.kxqp.ui.activity.GameLaunchActivity',
          matches: '[id="com.excean.na:id/iv_close_ad"]',
          snapshotUrls: 'https://i.gkd.li/i/13931051',
@@ -36,7 +36,10 @@ export default defineGkdApp({
    {
      key: 2,
      name: '全屏广告-首页弹窗广告',
-      desc: '点击X',
+      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          key: 0,
--- a/src/apps/com.excean.splay.ts
+++ b/src/apps/com.excean.splay.ts
@@ -1,17 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.excean.splay',
-  name: 'OurPlay加速器',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: '[text="发现新版本"] +n * > [text="忽略"]',
-      snapshotUrls: 'https://i.gkd.li/i/12684551',
-    },
-  ],
-});
--- a/src/apps/com.facetech.konking.ts
+++ b/src/apps/com.facetech.konking.ts
@@ -7,10 +7,18 @@ export default defineGkdApp({
    {
      key: 1,
      name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
          activityIds:
            'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
-      rules: '@Image[text=""] < View +n View > View > TextView[text="广告"]',
+          matches:
+            '@Image[text=""] < View +n View > View > TextView[text="广告"]',
          snapshotUrls: 'https://i.gkd.li/i/12841081',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.fan.app.ts
+++ b/src/apps/com.fan.app.ts
@@ -26,37 +26,39 @@ export default defineGkdApp({
    },
    {
      key: 1,
-      name: '局部广告-卡片广告',
+      name: '分段广告-卡片广告',
+      fastQuery: true,
      activityIds: 'com.mvvm.view.LazyMapStrategyActivity_TengXun',
      rules: [
        {
          key: 0,
-          matches: '[desc^="dislike"] > View',
+          matches:
+            '@View[clickable=true][childCount=0] < FrameLayout[desc^="dislike"] + FrameLayout >2 [text="广告"]',
          snapshotUrls: 'https://i.gkd.li/i/13258021',
        },
        {
-          preKeys: 0,
+          preKeys: [0],
          key: 1,
          matches: '@LinearLayout > [text="不感兴趣"]',
          snapshotUrls: 'https://i.gkd.li/i/13258015',
        },
-        {
-          key: 2,
-          matches: '@Image < View -2 View >2 View > TextView[text="广告"]',
-          snapshotUrls: 'https://i.gkd.li/i/13258018',
-        },
      ],
    },
    {
      key: 2,
      name: '权限提示-通知权限',
-      desc: '自动点击“以后再说”',
+      desc: '点击[以后再说]',
      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '[id="com.fan.app:id/tv_nj_later"]',
+      rules: [
+        {
+          activityIds: 'com.mvc.activity.HomepageActivity2',
+          matches: '[id="com.fan.app:id/tv_nj_later"]',
          snapshotUrls: 'https://i.gkd.li/i/13601734',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.fanli.android.apps.ts
+++ b/src/apps/com.fanli.android.apps.ts
@@ -7,10 +7,21 @@ export default defineGkdApp({
    {
      key: 1,
      name: '全屏广告-弹窗广告',
+      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          fastQuery: true,
          activityIds:
            'com.fanli.android.module.webview.ui.activity.TransparentBrowserInnerActivity',
-      rules: '[id="J_poplayer_box"] >n @View + [text="main_bkg"]',
+          matches:
+            '@[desc="closewv"][visibleToUser=true] <<n [id="com.fanli.android.apps:id/webviewContainer"]',
+          exampleUrls: 'https://e.gkd.li/7e013a50-4f55-4f49-8024-7dd749e8d53d',
          snapshotUrls: 'https://i.gkd.li/i/13245808',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.fcbox.hivebox.ts
+++ b/src/apps/com.fcbox.hivebox.ts
@@ -7,12 +7,15 @@ export default defineGkdApp({
    {
      key: 1,
      name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          key: 0,
          name: '首页弹窗广告',
-          activityIds: 'com.fcbox.hivebox.business.main.MainActivity',
          fastQuery: true,
+          activityIds: 'com.fcbox.hivebox.business.main.MainActivity',
          matches:
            '[id="com.fcbox.hivebox:id/fl_content_container"] + [id="com.fcbox.hivebox:id/iv_close"]',
          snapshotUrls: 'https://i.gkd.li/i/13459000',
--- a/src/apps/com.feicui.vdhelper.ts
+++ b/src/apps/com.feicui.vdhelper.ts
@@ -7,7 +7,10 @@ export default defineGkdApp({
    {
      key: 1,
      name: '全屏广告-首页弹窗广告',
-      activityIds: ['com.ys.resemble.ui.MainActivity'],
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      activityIds: 'com.ys.resemble.ui.MainActivity',
      rules: [
        {
          key: 0,
--- a/src/apps/com.feiyu.morin.ts
+++ b/src/apps/com.feiyu.morin.ts
@@ -7,6 +7,9 @@ export default defineGkdApp({
    {
      key: 0,
      name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          key: 0,
@@ -51,12 +54,13 @@ export default defineGkdApp({
        {
          key: 0,
          name: '腾讯广告',
+          fastQuery: true,
          activityIds: [
            'com.feiyu.morin.view.main.MainActivity',
            'com.feiyu.morin.view.main.PlayerBottomControlActivity',
          ],
          matches:
-            'ImageView + LinearLayout + LinearLayout + FrameLayout[childCount=1] > ImageView[childCount=0]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout > [text="下载应用" || text="立即下载"]',
          snapshotUrls: [
            'https://i.gkd.li/i/13521680',
            'https://i.gkd.li/i/13625476',
--- a/src/apps/com.fenbi.android.leo.ts
+++ b/src/apps/com.fenbi.android.leo.ts
@@ -11,8 +11,13 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '@[text="残忍拒绝"] + [text*="好评"][text.length<=10]',
+      rules: [
+        {
+          activityIds: '.imgsearch.sdk.activity.NewCheckCameraActivity',
+          matches: '@[text="残忍拒绝"] + [text*="好评"][text.length<=10]',
          snapshotUrls: 'https://i.gkd.li/i/13226140',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.fenbi.android.servant.ts
+++ b/src/apps/com.fenbi.android.servant.ts
@@ -1,21 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.fenbi.android.servant',
-  name: '粉笔',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: [
-        {
-          matches: '[id="com.fenbi.android.servant:id/close"]',
-          snapshotUrls: 'https://i.gkd.li/i/12999725',
-        },
-      ],
-    },
-  ],
-});
--- a/src/apps/com.fenbi.android.solar.ts
+++ b/src/apps/com.fenbi.android.solar.ts
@@ -4,23 +4,6 @@ export default defineGkdApp({
  id: 'com.fenbi.android.solar',
  name: '小猿搜题',
  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      fastQuery: true,
-      rules: [
-        {
-          matches: [
-            '[id="com.fenbi.android.solar:id/text_upgrade"]',
-            '[id="com.fenbi.android.solar:id/img_close"]',
-          ],
-          snapshotUrls: 'https://i.gkd.li/i/13246056',
-        },
-      ],
-    },
    {
      key: 2,
      name: '评价提示',
--- a/src/apps/com.fengeek.f002.ts
+++ b/src/apps/com.fengeek.f002.ts
@@ -8,14 +8,14 @@ export default defineGkdApp({
      key: 2,
      name: '功能类-自动连接耳机',
      desc: '点击连接耳机按钮,点击扫描到的第一个设备',
-      activityIds: ['com.fengeek.f002.MainActivity'],
+      activityIds: 'com.fengeek.f002.MainActivity',
      rules: [
        {
          key: 0,
          name: '点击连接耳机按钮',
          fastQuery: true,
          action: 'clickCenter',
-          matches: '[clickable=true][id="com.fengeek.f002:id/av_elc"]',
+          matches: '[id="com.fengeek.f002:id/av_elc"]',
          snapshotUrls: 'https://i.gkd.li/i/13161277',
        },
        {
@@ -23,9 +23,7 @@ export default defineGkdApp({
          key: 1,
          name: '点击扫描到的设备',
          fastQuery: true,
-          action: 'clickNode',
-          matches:
-            '[clickable=true][id="com.fengeek.f002:id/device_container"]',
+          matches: '[id="com.fengeek.f002:id/device_container"]',
          snapshotUrls: 'https://i.gkd.li/i/13161365',
        },
      ],
--- a/src/apps/com.fileunzip.zxwknight.ts
+++ b/src/apps/com.fileunzip.zxwknight.ts
@@ -7,6 +7,9 @@ export default defineGkdApp({
    {
      key: 1,
      name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          key: 1,
@@ -29,17 +32,22 @@ export default defineGkdApp({
    {
      key: 2,
      name: '全屏广告-升级专业版弹窗',
+      rules: [
+        {
          fastQuery: true,
          activityIds: [
            'com.fileunzip.zxwknight.activity.MainActivity',
            'com.fileunzip.zxwknight.activity.VideoPlayActivity',
          ],
-      rules: '@[vid="ziputil_dialog_imageview"] < * > [text="升级到专业版"]',
+          matches:
+            '@[vid="ziputil_dialog_imageview"] < * > [text="升级到专业版"]',
          snapshotUrls: [
            'https://i.gkd.li/i/13328212',
            'https://i.gkd.li/i/14885336',
          ],
        },
+      ],
+    },
    {
      key: 3,
      name: '全屏广告-软件推广',
--- a/src/apps/com.finshell.wallet.ts
+++ b/src/apps/com.finshell.wallet.ts
@@ -8,6 +8,9 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-弹窗广告',
      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          fastQuery: true,
--- a/src/apps/com.firebear.androil.ts
+++ b/src/apps/com.firebear.androil.ts
@@ -67,9 +67,14 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules:
+      rules: [
+        {
+          activityIds: '.app.home.MainActivity',
+          matches:
            '@[id="com.firebear.androil:id/dismissNtfImgView"] < RelativeLayout - [id="com.firebear.androil:id/contentLay"] >3 TextView[text^="升级"]',
          snapshotUrls: 'https://i.gkd.li/i/12755032',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.fiveplay.ts
+++ b/src/apps/com.fiveplay.ts
@@ -14,6 +14,7 @@ export default defineGkdApp({
      rules: [
        {
          fastQuery: true,
+          activityIds: '.sihp_homepage.module.main.Main2Activity',
          matches: '@[vid="iv_close"] - * > [text="打开消息推送"]',
          exampleUrls:
            'https://m.gkd.li/57941037/020e18ab-1bf1-4639-b32a-777719881dcb',
@@ -31,6 +32,7 @@ export default defineGkdApp({
      rules: [
        {
          fastQuery: true,
+          activityIds: '.sihp_homepage.module.main.Main2Activity',
          matches: '[id="com.fiveplay:id/iv_ad_float_close"]',
          snapshotUrls: 'https://i.gkd.li/i/16825082',
        },
--- a/src/apps/com.flttrade.flt1064trade.gong.ts
+++ b/src/apps/com.flttrade.flt1064trade.gong.ts
@@ -9,6 +9,9 @@ export default defineGkdApp({
      name: '全屏广告-弹窗广告',
      desc: '点击关闭',
      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          key: 0,
--- a/src/apps/com.fongmi.android.tv.ts
+++ b/src/apps/com.fongmi.android.tv.ts
@@ -13,6 +13,7 @@ export default defineGkdApp({
      resetMatch: 'app',
      rules: [
        {
+          activityIds: '.ui.activity.MainActivity',
          matches:
            '[id="com.fongmi.android.tv:id/buttonPanel"] >2 [text="取消"]',
          snapshotUrls: 'https://i.gkd.li/i/14035154',
--- a/src/apps/com.fzfengzheng.fzboyp.ts
+++ b/src/apps/com.fzfengzheng.fzboyp.ts
@@ -25,6 +25,9 @@ export default defineGkdApp({
      key: 1,
      name: '全屏广告-弹窗广告',
      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          activityIds:
--- a/src/apps/com.giraffe.ts
+++ b/src/apps/com.giraffe.ts
@@ -7,13 +7,14 @@ export default defineGkdApp({
    {
      key: 1,
      name: '更新提示',
-      desc: '点击X',
-      actionMaximum: 1,
-      matchTime: 10000,
-      resetMatch: 'app',
+      desc: '点击关闭',
      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
+          activityIds: 'com.speed.shadowsocks.ui.main.MainActivity',
          matches: '[id="com.giraffe:id/iv_close"]',
          snapshotUrls: 'https://i.gkd.li/i/14000409',
        },
--- a/src/apps/com.github.eprendre.tingshu.ts
+++ b/src/apps/com.github.eprendre.tingshu.ts
@@ -7,19 +7,23 @@ export default defineGkdApp({
    {
      key: 1,
      name: '局部广告-卡片广告',
-      activityIds: [
-        'com.github.eprendre.tingshu.ui.search.AggregateSearchActivity',
-        'com.github.eprendre.tingshu.ui.play.PlayerActivity',
-      ],
      rules: [
        {
          key: 0,
          name: '搜索结果底部/播放页面卡片广告',
-          activityIds: 'com.github.eprendre.tingshu.ui.play.PlayerActivity',
+          activityIds: '.ui.search.AggregateSearchActivity',
          matches:
            'FrameLayout > FrameLayout[childCount=1] > ImageView[width<80][height<80]',
+          snapshotUrls: 'https://i.gkd.li/i/12783466',
+        },
+        {
+          key: 1,
+          fastQuery: true,
+          activityIds: '.ui.play.PlayerActivity',
+          matches:
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout - LinearLayout > [text="立即下载" || text="下载应用"]',
+          exampleUrls: 'https://e.gkd.li/d3d33d4f-4c15-45a0-9e86-0c1ca2ecc7c9',
          snapshotUrls: [
-            'https://i.gkd.li/i/12783466',
            'https://i.gkd.li/i/13334850',
            'https://i.gkd.li/i/13446735',
          ],
--- a/src/apps/com.gkid.crazyrope.ts
+++ b/src/apps/com.gkid.crazyrope.ts
@@ -20,16 +20,22 @@ export default defineGkdApp({
    {
      key: 2,
      name: '分段广告-浮窗广告',
-      desc: '二步确认',
+      desc: '点击关闭-点击关闭广告',
      fastQuery: true,
-      activityIds: 'com.gkid.crazyrope.ui.drillcommon.DrillActivity',
+      activityIds: '.ui.drillcommon.DrillActivity',
      rules: [
-        '[id="com.gkid.crazyrope:id/iv_close"]',
-        '[id="com.gkid.crazyrope:id/tv_close"][text="关闭广告"]',
-      ],
-      snapshotUrls: [
-        'https://i.gkd.li/i/13262845',
-        'https://i.gkd.li/i/13262844',
+        {
+          key: 0,
+          matches: '[id="com.gkid.crazyrope:id/iv_close"]',
+          exampleUrls: 'https://e.gkd.li/398c08eb-ebfb-4cf6-9349-0b0ad4b575c9',
+          snapshotUrls: 'https://i.gkd.li/i/13262845',
+        },
+        {
+          preKeys: [0],
+          matches: '[text="关闭广告"]',
+          exampleUrls: 'https://e.gkd.li/3d27d844-b552-4a0c-800b-3dc5790fb8c0',
+          snapshotUrls: 'https://i.gkd.li/i/13262844',
+        },
      ],
    },
  ],
--- a/src/apps/com.google.android.apps.photos.ts
+++ b/src/apps/com.google.android.apps.photos.ts
@@ -6,27 +6,27 @@ export default defineGkdApp({
  groups: [
    {
      key: 0,
-      name: '更新提示-取消更新',
+      name: '更新提示',
      desc: '点击[以后再说]',
+      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      fastQuery: true,
      rules: [
        {
-          matches:
-            '[id="com.google.android.apps.photos:id/negative_button"][text="以后再说"]',
+          activityIds: '.update.treatment.UpdateAppTreatmentPromoPageActivity',
+          matches: '[text="以后再说"]',
          snapshotUrls: 'https://i.gkd.li/i/13218940',
        },
      ],
    },
    {
      key: 1,
-      fastQuery: true,
      name: '全屏广告-优惠提示',
-      desc: '点击X',
+      desc: '点击关闭',
      rules: [
        {
+          fastQuery: true,
          activityIds:
            'com.google.android.apps.photos.cloudstorage.paidfeatures.PaidFeaturesActivity',
          matches:
--- a/src/apps/com.google.android.apps.translate.ts
+++ b/src/apps/com.google.android.apps.translate.ts
@@ -6,16 +6,18 @@ export default defineGkdApp({
  groups: [
    {
      key: 4,
-      name: '功能类-登录弹窗',
-      desc: '登录备份翻译记录',
+      name: '功能类-关闭登录备份翻译记录弹窗',
      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
+      rules: [
+        {
          activityIds: 'com.google.android.apps.translate.TranslateActivity',
-      rules:
-        'Button[id="com.google.android.apps.translate:id/sign_in_button"] + [id="com.google.android.apps.translate:id/secondary_action_button"]',
+          matches: ['[text="备份您的翻译历史记录"]', '[text="取消"]'],
          snapshotUrls: 'https://i.gkd.li/i/13495796',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.google.android.apps.youtube.music.ts
+++ b/src/apps/com.google.android.apps.youtube.music.ts
@@ -7,10 +7,16 @@ export default defineGkdApp({
    {
      key: 1,
      name: '局部广告-播放界面广告',
+      rules: [
+        {
+          fastQuery: true,
          activityIds:
            'com.google.android.apps.youtube.music.activities.MusicActivity',
-      rules: '[id="com.google.android.apps.youtube.music:id/skip_ad_text"]',
+          matches:
+            '[id="com.google.android.apps.youtube.music:id/skip_ad_button"]',
          snapshotUrls: 'https://i.gkd.li/i/13196056',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.google.android.youtube.ts
+++ b/src/apps/com.google.android.youtube.ts
@@ -7,28 +7,23 @@ export default defineGkdApp({
    {
      key: 0,
      name: '全屏广告-视频播放-跳过广告',
+      rules: [
+        {
          fastQuery: true,
+          key: 0,
          activityIds: [
            'com.google.android.apps.youtube.app.watchwhile.WatchWhileActivity',
            'com.google.android.apps.youtube.app.watchwhile.MainActivity',
            'com.google.android.youtube',
          ],
-      rules: [
-        {
-          key: 0,
-          name: '类型1',
-          matches: '[id="com.google.android.youtube:id/skip_ad_button_text"]',
+          matches:
+            '[vid="skip_ad_button" || id="com.google.android.youtube:id/modern_skip_ad_text"]',
          snapshotUrls: [
            'https://i.gkd.li/i/13797491',
            'https://i.gkd.li/i/12565261',
+            'https://i.gkd.li/i/13705106',
          ],
        },
-        {
-          key: 1,
-          name: '类型2',
-          matches: '[id="com.google.android.youtube:id/modern_skip_ad_text"]',
-          snapshotUrls: ['https://i.gkd.li/i/13705106'],
-        },
      ],
    },
    {
@@ -63,12 +58,17 @@ export default defineGkdApp({
    {
      key: 3,
      name: '全屏广告-订阅浮窗广告',
+      rules: [
+        {
+          fastQuery: true,
          activityIds:
            'com.google.android.apps.youtube.app.watchwhile.MainActivity',
-      rules:
-        'ViewGroup[desc="免费试用 1 个月"] < * - * > ViewGroup[text="不用了，谢谢"]', // 缺少英文快照
+          matches:
+            'ViewGroup[desc="免费试用 1 个月"] < * - * > @ViewGroup[visibleToUser=true][text="不用了，谢谢"] <<n [vid="bottom_ui_container"]', // 缺少英文快照
          snapshotUrls: 'https://i.gkd.li/i/13797512',
        },
+      ],
+    },
    {
      key: 4,
      name: '权限提示-通知权限',
@@ -77,6 +77,8 @@ export default defineGkdApp({
      resetMatch: 'app',
      rules: [
        {
+          activityIds:
+            'com.google.android.apps.youtube.app.watchwhile.MainActivity',
          matches: ['[text="开启通知"]', '[text="不用了"]'],
          snapshotUrls: 'https://i.gkd.li/i/14194155',
        },
--- a/src/apps/com.gotokeep.keep.ts
+++ b/src/apps/com.gotokeep.keep.ts
@@ -8,17 +8,17 @@ export default defineGkdApp({
      key: 2,
      name: '全屏广告-首页弹窗广告',
      desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
          key: 0,
          activityIds:
            'com.gotokeep.keep.refactor.business.main.activity.MainActivity',
-          matches:
-            '[id="com.gotokeep.keep:id/layoutLottie"] +(1,2) [id="com.gotokeep.keep:id/imgCloseHomePageDialog"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/12706102',
-            'https://i.gkd.li/i/13761641',
-          ],
+          matches: '[id="com.gotokeep.keep:id/imgCloseHomePageDialog"]',
+          snapshotUrls: 'https://i.gkd.li/i/13761641',
        },
      ],
    },
--- a/src/apps/com.greenpoint.android.mc10086.activity.ts
+++ b/src/apps/com.greenpoint.android.mc10086.activity.ts
@@ -27,6 +27,7 @@ export default defineGkdApp({
      resetMatch: 'app',
      rules: [
        {
+          activityIds: 'com.mc10086.cmcc.view.tabs.AppTabFragment',
          matches:
            'Button[text="以后再说"][id^="com.greenpoint.android.mc10086.activity:id/dialog_btn"]',
          exampleUrls:
@@ -38,9 +39,12 @@ export default defineGkdApp({
    {
      key: 2,
      name: '全屏广告-首页弹窗广告',
-      activityIds: 'com.mc10086.cmcc.view.tabs.AppTabFragment',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
      rules: [
        {
+          activityIds: 'com.mc10086.cmcc.view.tabs.AppTabFragment',
          matches:
            '[id="com.greenpoint.android.mc10086.activity:id/ad_image"] < RelativeLayout + [id="com.greenpoint.android.mc10086.activity:id/close_btn"]',
          snapshotUrls: 'https://i.gkd.li/i/12662361',
@@ -58,14 +62,13 @@ export default defineGkdApp({
      rules: [
        {
          key: 0,
+          activityIds: 'com.mc10086.cmcc.base.StartPageActivity',
          matches: ['[text*="开启推送通知"]', '[text="取消"]'],
-          snapshotUrls: [
-            'https://i.gkd.li/i/12662213',
-            'https://i.gkd.li/i/13327880',
-          ],
+          snapshotUrls: 'https://i.gkd.li/i/13327880',
        },
        {
          key: 1,
+          activityIds: 'com.mc10086.cmcc.view.tabs.AppTabFragment',
          matches: '[text="授权提醒"] +3 [text="拒绝"]',
          snapshotUrls: 'https://i.gkd.li/i/13775652',
        },
@@ -133,6 +136,7 @@ export default defineGkdApp({
      resetMatch: 'app',
      rules: [
        {
+          activityIds: 'com.mc10086.cmcc.view.tabs.AppTabFragment',
          matches:
            '@[id="com.greenpoint.android.mc10086.activity:id/close_img"][desc="关闭"] - RelativeLayout >(2) [text$="好评"]',
          snapshotUrls: 'https://i.gkd.li/i/12662345',
--- a/src/apps/com.growing.topwidgets.ts
+++ b/src/apps/com.growing.topwidgets.ts
@@ -47,12 +47,13 @@ export default defineGkdApp({
        },
        {
          key: 1,
+          fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
          matches:
-            '[id="android:id/content"] >3 FrameLayout[childCount=2] > FrameLayout[childCount=1] > ImageView',
-          snapshotUrls: [
-            'https://i.gkd.li/i/14964868',
-            'https://i.gkd.li/i/14969910', // 避免误触
-          ],
+            '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null] - FrameLayout[childCount>2] >3 [text^="立即" || text$="应用" || text="了解更多" || text="查看详情"]',
+          snapshotUrls: 'https://i.gkd.li/i/14964868',
        },
      ],
    },
--- a/src/apps/com.guodongbaohe.app.ts
+++ b/src/apps/com.guodongbaohe.app.ts
@@ -11,10 +11,14 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
+      rules: [
+        {
          fastQuery: true,
          activityIds: 'com.guodongbaohe.app.activity.AdvertisementTwoActivity',
-      rules: 'LinearLayout[id="com.guodongbaohe.app:id/close_dialog_lv"]',
+          matches: 'LinearLayout[id="com.guodongbaohe.app:id/close_dialog_lv"]',
          snapshotUrls: 'https://i.gkd.li/i/13577877',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.guwendao.gwd.ts
+++ b/src/apps/com.guwendao.gwd.ts
@@ -5,17 +5,11 @@ export default defineGkdApp({
  name: '古文岛',
  groups: [
    {
-      key: 1,
-      name: '更新提示',
+      key: 2,
+      name: '全屏广告-弹窗广告',
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules: '[text="应用升级提醒"] +n LinearLayout > [text="取消"]',
-      snapshotUrls: 'https://i.gkd.li/i/12776605',
-    },
-    {
-      key: 2,
-      name: '全屏广告-弹窗广告',
      activityIds: 'com.guwendao.gwd.MainActivity',
      rules: [
        {
--- a/src/apps/com.gvsoft.gofun.ts
+++ b/src/apps/com.gvsoft.gofun.ts
@@ -11,15 +11,14 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      activityIds: 'com.gvsoft.gofun.module.home.activity.HomeActivity',
      rules: [
        {
-          action: 'clickCenter',
+          activityIds: 'com.gvsoft.gofun.module.home.activity.HomeActivity',
          matches:
            '[id="com.gvsoft.gofun:id/cardView"] + [id="com.gvsoft.gofun:id/iv_close"]',
-        },
-      ],
          snapshotUrls: 'https://i.gkd.li/i/13497777',
        },
      ],
+    },
+  ],
 });
--- a/src/globalGroups.ts
+++ b/src/globalGroups.ts
@@ -62,7 +62,7 @@ export default defineGkdGlobalGroups([
        matches: [
          '[text*="内测" || text*="测试版" || text*="新版" || text*="更新" || text*="升级" || text*="体验" || text*="內測" || text*="測試版" || text*="升級" || text*="體驗" || text*="Update" || text*="Upgrade" || text*="Experience"][text!*="自动" && text!*="自動" && text!*="成功" && text!*="失败" && text!*="失敗" && text!*="检查更新" && text!*="检测更新" && text!*="卸载"][name!$=".CheckBox"][childCount=0][visibleToUser=true]',
          '[text*="更新" || text*="下载" || text*="安装" || text*="升级" || text*="查看" || text*="体验" || text*="确定" || text*="确认"][text.length<6][name!$=".CheckBox"][childCount=0][visibleToUser=true]',
-          '[text*="不再提醒" || text$="再说" || text$="拒绝" || text$="再想想" || text*="再看看" || text^="忽略" || text^="暂不" || text^="放弃" || text^="取消" || text$="不要" || text$="再說" || text$="暫不" || text$="拒絕" || text*="稍后" || text^="关闭" || text$="Later" || text^="Ignore" || text^="Not now" || text^="Cancel" || vid="iv_close" || vid="iv_cancel" || vid="img_close" || vid="btn_close" || vid="ivCancel" || vid="ivClose" || vid="imgClose" || vid="iv_negative"][name!$=".CheckBox"][childCount=0][visibleToUser=true]',
+          '[text*="不再提醒" || text$="再说" || text$="拒绝" || text$="再想想" || text*="再看看" || text^="忽略" || text^="暂不" || text^="放弃" || text^="取消" || text$="不要" || text$="再說" || text$="暫不" || text$="拒絕" || text*="稍后" || text^="关闭" || text$="Later" || text^="Ignore" || text^="Not now" || text^="Cancel" || vid="iv_close" || vid="iv_cancel" || vid="close" || vid="Close" || vid="img_close" || vid="btn_close" || vid="ivCancel" || vid="ivClose" || vid="imgClose" || vid="iv_negative"][name!$=".CheckBox"][childCount=0][visibleToUser=true]',
        ],
        excludeSnapshotUrls: [
          // 避免误触