diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts
index 1aaff5bb..0c9a6513 100644
--- a/src/appDeprecatedKeys.ts
+++ b/src/appDeprecatedKeys.ts
@@ -722,6 +722,11 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
     name: '航旅纵横',
     deprecatedKeys: [8],
   },
+  {
+    id: 'cn.mil.junhao',
+    name: '中国军号',
+    deprecatedKeys: [1],
+  },
 ];
 
 const map: Map<string, number[]> = new Map();
diff --git a/src/apps/cn.TuHu.android.ts b/src/apps/cn.TuHu.android.ts
index 5d6e6e77..c8b5013d 100644
--- a/src/apps/cn.TuHu.android.ts
+++ b/src/apps/cn.TuHu.android.ts
@@ -8,22 +8,34 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
-      activityIds: 'cn.TuHu.Activity.tuhutab.TuHuTabActivity',
-      rules:
-        '@[id="cn.TuHu.android:id/imgClose"] - [id="cn.TuHu.android:id/rlContent"] > [id="cn.TuHu.android:id/img_jump"]',
-      snapshotUrls: 'https://i.gkd.li/i/13228818',
-    },
-    {
-      key: 10,
-      fastQuery: true,
-      name: '权限提示-通知权限',
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="cn.TuHu.android:id/imgClose"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/13228796', //推送提醒消息弹窗
-        'https://i.gkd.li/i/13256535', //2023年11月5日新增推送物流进度等信息弹窗
+      rules: [
+        {
+          activityIds: 'cn.TuHu.Activity.tuhutab.TuHuTabActivity',
+          matches:
+            '@[id="cn.TuHu.android:id/imgClose"] - [id="cn.TuHu.android:id/rlContent"] > [id="cn.TuHu.android:id/img_jump"]',
+          snapshotUrls: 'https://i.gkd.li/i/13228818',
+        },
+      ],
+    },
+    {
+      key: 10,
+      name: '权限提示-通知权限',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'cn.TuHu.Activity.tuhutab.TuHuTabActivity',
+          matches: '[id="cn.TuHu.android:id/imgClose"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13228796',
+            'https://i.gkd.li/i/13256535',
+          ],
+        },
       ],
     },
   ],
diff --git a/src/apps/cn.chuci.and.wkfenshen.ts b/src/apps/cn.chuci.and.wkfenshen.ts
index d815fbec..4b8d15f9 100644
--- a/src/apps/cn.chuci.and.wkfenshen.ts
+++ b/src/apps/cn.chuci.and.wkfenshen.ts
@@ -7,10 +7,13 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-购买会员弹窗',
-      activityIds: 'cn.chuci.and.wkfenshen.ActMain',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
-          fastQuery: true,
+          activityIds: 'cn.chuci.and.wkfenshen.ActMain',
           matches: [
             '[id="cn.chuci.and.wkfenshen:id/dialog_local_buy_btn"]',
             '[id="cn.chuci.and.wkfenshen:id/action_close"]',
diff --git a/src/apps/cn.com.langeasy.LangEasyLexis.ts b/src/apps/cn.com.langeasy.LangEasyLexis.ts
index dff5df29..fb2c49ce 100644
--- a/src/apps/cn.com.langeasy.LangEasyLexis.ts
+++ b/src/apps/cn.com.langeasy.LangEasyLexis.ts
@@ -10,6 +10,7 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'cn.com.langeasy.LangEasyLexis.activity.MainActivity',
@@ -24,6 +25,8 @@ export default defineGkdApp({
       desc: '点击关闭',
       fastQuery: true,
       matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'cn.com.langeasy.LangEasyLexis.activity.MainActivity',
diff --git a/src/apps/cn.com.livelab.ts b/src/apps/cn.com.livelab.ts
index c8d9fc34..db7883ce 100644
--- a/src/apps/cn.com.livelab.ts
+++ b/src/apps/cn.com.livelab.ts
@@ -7,9 +7,18 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
-      activityIds: 'cn.com.livelab.MainActivity',
-      rules: 'View >n View[childCount=2] > ImageView + Button',
-      snapshotUrls: 'https://i.gkd.li/i/13258873',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'cn.com.livelab.MainActivity',
+          matches:
+            '@Button[clickable=true][childCount=0][visibleToUser=true] <2 View < View < View < View < FrameLayout < FrameLayout < [id="android:id/content"]',
+          snapshotUrls: 'https://i.gkd.li/i/13258873',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/cn.honor.qinxuan.ts b/src/apps/cn.honor.qinxuan.ts
index ba06a8db..6c62b805 100644
--- a/src/apps/cn.honor.qinxuan.ts
+++ b/src/apps/cn.honor.qinxuan.ts
@@ -6,9 +6,12 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      fastQuery: true,
       name: '全屏广告-首页弹窗广告',
-      desc: '点击X',
+      desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'cn.honor.qinxuan.MainActivity',
diff --git a/src/apps/cn.kuwo.player.ts b/src/apps/cn.kuwo.player.ts
index b48c4bd0..c43877b9 100644
--- a/src/apps/cn.kuwo.player.ts
+++ b/src/apps/cn.kuwo.player.ts
@@ -6,8 +6,11 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      fastQuery: true,
       name: '全屏广告-酷我会员日弹窗',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'cn.kuwo.player.activities.MainActivity',
diff --git a/src/apps/cn.lezhi.speedtest.ts b/src/apps/cn.lezhi.speedtest.ts
index b73a0564..542c8b70 100644
--- a/src/apps/cn.lezhi.speedtest.ts
+++ b/src/apps/cn.lezhi.speedtest.ts
@@ -39,7 +39,7 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       rules:
-        '[id="cn.lezhi.speedtest:id/rl_update_dialog_layout"] >n [id="cn.lezhi.speedtest:id/iv_close"]',
+        '[id="cn.lezhi.speedtest:id/rl_update_dialog_layout"] >2 [id="cn.lezhi.speedtest:id/iv_close"]',
       snapshotUrls: 'https://i.gkd.li/i/12727619',
     },
   ],
diff --git a/src/apps/cn.mil.junhao.ts b/src/apps/cn.mil.junhao.ts
index 29c2c088..cafd2b4d 100644
--- a/src/apps/cn.mil.junhao.ts
+++ b/src/apps/cn.mil.junhao.ts
@@ -12,23 +12,40 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules: '[vid="splash_adv_ship"]',
-      snapshotUrls: 'https://i.gkd.li/i/13806892',
-    },
-    {
-      key: 1,
-      name: '功能类-首页右侧浮窗',
-      activityIds: 'com.mediacloud.app.nav2.AppHome21Style',
-      rules:
-        '[vid="fragment_containerx"] > FrameLayout > ImageView[index=2][clickable=true]',
-      snapshotUrls: 'https://i.gkd.li/i/13806894',
+      rules: [
+        {
+          matches: '[vid="splash_adv_ship"]',
+          snapshotUrls: 'https://i.gkd.li/i/13806892',
+        },
+      ],
     },
     {
       key: 2,
-      name: '功能类-意见反馈浮窗',
-      activityIds: 'com.mediacloud.app.nav2.AppHome21Style',
-      rules: '[vid="float_feedback"] > ImageView[index=2][clickable=true]',
-      snapshotUrls: 'https://i.gkd.li/i/13806896',
+      name: '局部广告-右侧悬浮窗',
+      desc: '点击关闭',
+      rules: [
+        {
+          key: 0,
+          fastQuery: true,
+          actionMaximum: 1,
+          resetMatch: 'app',
+          activityIds: 'com.mediacloud.app.nav2.AppHome21Style',
+          matches:
+            '@ImageView[clickable=true][visibleToUser=true][childCount=0] <3 [vid="float_feedback"]',
+          snapshotUrls: 'https://i.gkd.li/i/13806896',
+        },
+        {
+          key: 1,
+          fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
+          activityIds: 'com.mediacloud.app.nav2.AppHome21Style',
+          matches:
+            '@ImageView[clickable=true][visibleToUser=true][childCount=0] <3 FrameLayout <2 [vid="fragment_containerx"]',
+          snapshotUrls: 'https://i.gkd.li/i/13806894',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/cn.ms.pages.ts b/src/apps/cn.ms.pages.ts
index 207dc56b..39a31f02 100644
--- a/src/apps/cn.ms.pages.ts
+++ b/src/apps/cn.ms.pages.ts
@@ -44,13 +44,14 @@ export default defineGkdApp({
     {
       key: 2,
       name: '分段广告-看视频得奖励广告',
+      fastQuery: true,
       activityIds:
         'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
       rules: [
         {
           key: 0,
           matches:
-            '[id="android:id/content"] >2 FrameLayout[childCount=3] >2 FrameLayout[childCount=3] >3 RelativeLayout[clickable=true]',
+            '@RelativeLayout[childCount=0][clickable=true] < FrameLayout < FrameLayout < FrameLayout < FrameLayout < FrameLayout < FrameLayout < [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/fd1ff96e-6d17-4738-a2f1-3648169ce53c',
           snapshotUrls: 'https://i.gkd.li/i/16136235',
@@ -58,7 +59,6 @@ export default defineGkdApp({
         {
           preKeys: [0],
           key: 1,
-          fastQuery: true,
           matches: '[text="坚持退出"]',
           exampleUrls:
             'https://m.gkd.li/57941037/f09986f3-6dc6-4067-9136-ac6aa0afad3f',
diff --git a/src/apps/cn.nlyuming.duanju.ting.ts b/src/apps/cn.nlyuming.duanju.ting.ts
index aab4372b..5238c240 100644
--- a/src/apps/cn.nlyuming.duanju.ting.ts
+++ b/src/apps/cn.nlyuming.duanju.ting.ts
@@ -6,13 +6,17 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      name: '功能类-[您还未登录]弹窗',
+      name: '其他-[您还未登录]弹窗',
       desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'cn.nlyuming.duanju.ting.MainActivity',
           matches:
-            '[id="android:id/content"] >5 FrameLayout[childCount=3] >2 ImageView[visibleToUser=true]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] <2 FrameLayout[childCount=3] < FrameLayout < FrameLayout < FrameLayout < FrameLayout < [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/3041769f-b644-460b-b0de-9c2a84518849',
           snapshotUrls: 'https://i.gkd.li/i/14321891',
diff --git a/src/apps/cn.samsclub.app.ts b/src/apps/cn.samsclub.app.ts
index 7cbed5e3..b18f7b1f 100644
--- a/src/apps/cn.samsclub.app.ts
+++ b/src/apps/cn.samsclub.app.ts
@@ -30,11 +30,13 @@ export default defineGkdApp({
     {
       key: 1,
       name: '权限提示-定位权限',
+      fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'cn.samsclub.app.ui.MainActivity',
       rules: [
         {
+          activityIds: 'cn.samsclub.app.ui.MainActivity',
           matches: '[id="cn.samsclub.app:id/tips_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13609113',
         },
@@ -43,9 +45,13 @@ export default defineGkdApp({
     {
       key: 2,
       name: '局部广告-关闭「您有一张亲友卡待赠送」通知条',
-      activityIds: 'cn.samsclub.app.ui.MainActivity',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: 'cn.samsclub.app.ui.MainActivity',
           matches: '[id="cn.samsclub.app:id/fragment_home_window_delete_iv"]',
           snapshotUrls: 'https://i.gkd.li/i/13609113',
         },
diff --git a/src/apps/cn.wps.yun.ts b/src/apps/cn.wps.yun.ts
index 2bda8a14..a6b4c059 100644
--- a/src/apps/cn.wps.yun.ts
+++ b/src/apps/cn.wps.yun.ts
@@ -10,8 +10,8 @@ export default defineGkdApp({
       desc: '点击右侧x',
       rules: [
         {
-          activityIds: 'cn.wps.yun.ui.IndexActivity',
           fastQuery: true,
+          activityIds: 'cn.wps.yun.ui.IndexActivity',
           matches:
             '[id="cn.wps.yun:id/rootGroup"][childCount=5] >  [text^="实用技巧"] +3 [id="cn.wps.yun:id/moreIconRight"]',
           exampleUrls:
@@ -26,20 +26,32 @@ export default defineGkdApp({
     {
       key: 2,
       name: '更新提示',
+      fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
-      rules: '[text="发现新版本"] +3 [text="取消"]',
-      snapshotUrls: 'https://i.gkd.li/i/14333103',
+      rules: [
+        {
+          activityIds: '.ui.IndexActivity',
+          matches: '[text="发现新版本"] +3 [text="取消"]',
+          snapshotUrls: 'https://i.gkd.li/i/14333103',
+        },
+      ],
     },
     {
       key: 3,
       name: '权限提示-通知权限',
+      fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
-      rules: '[text="开启推送通知"] +2 * > [text="取消"]',
-      snapshotUrls: 'https://i.gkd.li/i/14333362',
+      rules: [
+        {
+          activityIds: '.ui.IndexActivity',
+          matches: '[text="开启推送通知"] +2 * > [text="取消"]',
+          snapshotUrls: 'https://i.gkd.li/i/14333362',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/cn.wsds.gamemaster.ts b/src/apps/cn.wsds.gamemaster.ts
index ebc89eea..94c05b49 100644
--- a/src/apps/cn.wsds.gamemaster.ts
+++ b/src/apps/cn.wsds.gamemaster.ts
@@ -22,18 +22,18 @@ export default defineGkdApp({
     {
       key: 2,
       name: '分段广告-卡片广告',
-      desc: '点击X-点击不感兴趣',
+      desc: '点击关闭-点击不感兴趣',
+      fastQuery: true,
       rules: [
         {
           key: 0,
           activityIds: 'cn.wsds.gamemaster.ui.gamedetails.ActivityGameDetails',
           matches:
-            '[id="cn.wsds.gamemaster:id/feed_ad"] [text="立即下载"] + ImageView[clickable=true]',
+            'ViewGroup[childCount=2] > @ImageView[childCount=0][index=1][clickable=true][visibleToUser=true] - [text="立即下载"]',
           snapshotUrls: 'https://i.gkd.li/i/13930398',
         },
         {
           preKeys: 0,
-          fastQuery: true,
           activityIds: 'cn.wsds.gamemaster.ui.gamedetails.ActivityGameDetails',
           matches: '[text="不感兴趣"]',
           snapshotUrls: 'https://i.gkd.li/i/13930399',
diff --git a/src/apps/cn.xuexi.android.ts b/src/apps/cn.xuexi.android.ts
index 26508872..6526e933 100644
--- a/src/apps/cn.xuexi.android.ts
+++ b/src/apps/cn.xuexi.android.ts
@@ -10,19 +10,29 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="取消"] + [text="立即升级"]',
-      snapshotUrls: 'https://i.gkd.li/i/12715139',
+      rules: [
+        {
+          activityIds: 'com.alibaba.android.rimet.biz.SplashActivity',
+          matches: '@[text="取消"] + [text="立即升级"]',
+          snapshotUrls: 'https://i.gkd.li/i/12715139',
+        },
+      ],
     },
     {
       key: 10,
       name: '权限提示-通知权限',
-      desc: '自动点击x按钮',
+      desc: '点击关闭',
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
-        '[text^="开启消息通知"] +2 [id="cn.xuexi.android:id/layout_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/12715160',
+      rules: [
+        {
+          activityIds: 'com.alibaba.android.rimet.biz.SplashActivity',
+          matches:
+            '[text^="开启消息通知"] +2 [id="cn.xuexi.android:id/layout_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12715160',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/cn.yonghui.hyd.ts b/src/apps/cn.yonghui.hyd.ts
index cf48821c..96cf511a 100644
--- a/src/apps/cn.yonghui.hyd.ts
+++ b/src/apps/cn.yonghui.hyd.ts
@@ -7,24 +7,21 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-红包弹窗',
+      desc: '点击关闭',
       rules: [
-        {
-          key: 0,
-          name: '领券中心-红包弹窗',
-          activityIds:
-            'cn.yonghui.hyd.coupon.couponfactory.CouponFactoryActivity',
-          matches:
-            '[id="cn.yonghui.hyd:id/advance"] +n [id="cn.yonghui.hyd:id/close"]',
-          snapshotUrls: 'https://i.gkd.li/i/13414401',
-        },
         {
           key: 1,
           name: '好券即将过期弹窗',
           activityIds:
             'cn.yonghui.hyd.coupon.couponfactory.CouponFactoryActivity',
-          matches:
-            '[id="cn.yonghui.hyd:id/couponsWillGoneHeaderIv"] +n [id="cn.yonghui.hyd:id/close"]',
-          snapshotUrls: 'https://i.gkd.li/i/13414444',
+          matches: [
+            '[id="cn.yonghui.hyd:id/advance" || id="cn.yonghui.hyd:id/couponsWillGoneHeaderIv"]',
+            '[id="cn.yonghui.hyd:id/close"]',
+          ],
+          snapshotUrls: [
+            'https://i.gkd.li/i/13414401',
+            'https://i.gkd.li/i/13414444',
+          ],
         },
       ],
     },
diff --git a/src/apps/ctrip.android.view.ts b/src/apps/ctrip.android.view.ts
index 08e6d456..62be05c5 100644
--- a/src/apps/ctrip.android.view.ts
+++ b/src/apps/ctrip.android.view.ts
@@ -22,11 +22,19 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text*="用户已升级"] < * + [desc="关闭"]',
-      snapshotUrls: 'https://i.gkd.li/i/13218347',
+      rules: [
+        {
+          activityIds:
+            'ctrip.android.publicproduct.home.view.CtripHomeActivity',
+          matches:
+            '@ImageView[desc="关闭"][clickable=true][visibleToUser=true] <3 FrameLayout < FrameLayout < [id="android:id/content"]',
+          snapshotUrls: 'https://i.gkd.li/i/13218347',
+        },
+      ],
     },
     {
       key: 2,
diff --git a/src/apps/downloadtwittervideo.twitterdownloader.twittervideodownloader.twittersaver.ts b/src/apps/downloadtwittervideo.twitterdownloader.twittervideodownloader.twittersaver.ts
index 6856f4a6..1322d5a6 100644
--- a/src/apps/downloadtwittervideo.twitterdownloader.twittervideodownloader.twittersaver.ts
+++ b/src/apps/downloadtwittervideo.twitterdownloader.twittervideodownloader.twittersaver.ts
@@ -7,15 +7,19 @@ export default defineGkdApp({
     {
       key: 3,
       name: '评价提示-评分弹窗',
-      desc: '自动点击 LATER ',
+      desc: '点击 LATER ',
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
-          matches:
-            '[id="downloadtwittervideo.twitterdownloader.twittervideodownloader.twittersaver:id/tv_cancel"]',
+          activityIds:
+            'downloadtwittervideo.twitterdownloader.twittervideodownloader.twittersaver',
+          matches: [
+            '[text="Love it"][visibleToUser=true]',
+            '[text="LATER"][visibleToUser=true]',
+          ],
           snapshotUrls: 'https://i.gkd.li/i/13748858',
         },
       ],
diff --git a/src/apps/dxwt.questionnaire.ui.ts b/src/apps/dxwt.questionnaire.ui.ts
index 3338c9e9..e2ee3350 100644
--- a/src/apps/dxwt.questionnaire.ui.ts
+++ b/src/apps/dxwt.questionnaire.ui.ts
@@ -7,14 +7,20 @@ export default defineGkdApp({
     {
       key: 0,
       name: '开屏广告',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules: '[desc^="关闭"][desc.length<=10][visibleToUser=true]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/13255491',
-        'https://i.gkd.li/i/13259475', // 限制 visibleToUser=true 防止按钮未出现就触发规则
+      rules: [
+        {
+          matches:
+            '@View[desc^="关闭"][visibleToUser=true] <3 FrameLayout < FrameLayout < FrameLayout < [id="dxwt.questionnaire.ui:id/container"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13255491',
+            'https://i.gkd.li/i/13259475', // 限制 visibleToUser=true 防止按钮未出现就触发规则
+          ],
+        },
       ],
     },
   ],
diff --git a/src/apps/enfc.metro.ts b/src/apps/enfc.metro.ts
index 680b4789..b01356fd 100644
--- a/src/apps/enfc.metro.ts
+++ b/src/apps/enfc.metro.ts
@@ -6,11 +6,11 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      fastQuery: true,
       name: '全屏广告-出站后摇一摇广告',
       desc: '点击跳过',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'enfc.metro.session.web.rn.RPReactActivity',
           matches: '@View[clickable=true] - * [text="扭动手机"]',
           snapshotUrls: 'https://i.gkd.li/i/13988597',
diff --git a/src/apps/info.muge.appshare.ts b/src/apps/info.muge.appshare.ts
index 1fdda3f3..2050ab80 100644
--- a/src/apps/info.muge.appshare.ts
+++ b/src/apps/info.muge.appshare.ts
@@ -73,8 +73,8 @@ export default defineGkdApp({
     },
     {
       key: 2,
-      fastQuery: true,
       name: '功能类-自动签到',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/io.dcloud.H576E6CC7.ts b/src/apps/io.dcloud.H576E6CC7.ts
index 0b814e79..cb19239c 100644
--- a/src/apps/io.dcloud.H576E6CC7.ts
+++ b/src/apps/io.dcloud.H576E6CC7.ts
@@ -45,8 +45,9 @@ export default defineGkdApp({
       rules: [
         {
           fastQuery: true,
+          matchTime: 10000,
           activityIds: 'com.yupao.entry.MainActivity',
-          matches: '[vid="close"]',
+          matches: '@[vid="close"][visibleToUser=true] - [vid="flItemContent"]',
           exampleUrls:
             'https://m.gkd.li/57941037/42273686-b44a-4964-80a5-84b55e6ad75c',
           snapshotUrls: 'https://i.gkd.li/i/14731764',
diff --git a/src/apps/io.iftech.android.box.ts b/src/apps/io.iftech.android.box.ts
index 50bb37e3..679231d5 100644
--- a/src/apps/io.iftech.android.box.ts
+++ b/src/apps/io.iftech.android.box.ts
@@ -21,8 +21,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text*="新版本"] +(2) [text="取消"]',
-      snapshotUrls: 'https://i.gkd.li/i/12706195',
+      rules: [
+        {
+          activityIds: '.main.HomeActivity',
+          matches: '[text*="新版本"] +2 [text="取消"]',
+          snapshotUrls: 'https://i.gkd.li/i/12706195',
+        },
+      ],
     },
     {
       key: 2,
diff --git a/src/apps/io.microshow.fm.ts b/src/apps/io.microshow.fm.ts
index e1b8d3b4..6bc2953e 100644
--- a/src/apps/io.microshow.fm.ts
+++ b/src/apps/io.microshow.fm.ts
@@ -10,9 +10,10 @@ export default defineGkdApp({
       desc: '点击关闭',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'io.microshow.fm.ui.activity.MainActivity',
           matches:
-            '[id="android:id/content"] > RelativeLayout > FrameLayout[childCount=2] > Button[clickable=true][visibleToUser=true]',
+            '@Button[childCount=0][clickable=true][visibleToUser=true] <2 FrameLayout < RelativeLayout < [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/14953007',
         },
       ],
diff --git a/src/apps/io.sbyd.app.ts b/src/apps/io.sbyd.app.ts
index 399d3235..d7cf4b39 100644
--- a/src/apps/io.sbyd.app.ts
+++ b/src/apps/io.sbyd.app.ts
@@ -11,8 +11,9 @@ export default defineGkdApp({
       rules: [
         {
           key: 1,
+          fastQuery: true,
           matches:
-            'TextView < LinearLayout[childCount=2] < FrameLayout[childCount=2] > FrameLayout[childCount=1] > ImageView',
+            '@ImageView[childCount=0][text=null][visibleToUser=true] < FrameLayout[childCount=1] <2 FrameLayout[childCount=2] <2 FrameLayout[childCount=2] <2 FrameLayout[childCount=2] - FrameLayout > [text^="扭动或点击"]',
           snapshotUrls: 'https://i.gkd.li/i/13274336',
         },
         {
diff --git a/src/apps/lab.vie.two.ts b/src/apps/lab.vie.two.ts
index 6fdcc87f..2176f175 100644
--- a/src/apps/lab.vie.two.ts
+++ b/src/apps/lab.vie.two.ts
@@ -8,10 +8,16 @@ export default defineGkdApp({
       key: 1,
       name: '其他-账号注册说明弹窗',
       desc: '每次打开app的弹窗提示，自动点击"我知道了"',
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[desc="账号注册说明"] +2 [desc="我知道了"]',
-      snapshotUrls: 'https://i.gkd.li/i/13379070',
+      rules: [
+        {
+          activityIds: '.MainActivity',
+          matches: '[desc="账号注册说明"] +2 [desc="我知道了"]',
+          snapshotUrls: 'https://i.gkd.li/i/13379070',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/make.more.r2d2.cellular_z.ts b/src/apps/make.more.r2d2.cellular_z.ts
index bd24c225..4c706aab 100644
--- a/src/apps/make.more.r2d2.cellular_z.ts
+++ b/src/apps/make.more.r2d2.cellular_z.ts
@@ -31,16 +31,14 @@ export default defineGkdApp({
     {
       key: 2,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
-          matches: [
-            '[id="make.more.r2d2.cellular_z:id/tv_alert_title"][text="发现新版本"]',
-            '[id="make.more.r2d2.cellular_z:id/btn_alert_left"][text="取消"]',
-          ], //防止误触其它取消按钮
+          activityIds: '.activity.MonitorActivity',
+          matches: ['[text="发现新版本"]', '[text="取消"]'],
           snapshotUrls: 'https://i.gkd.li/i/13608563',
         },
       ],
diff --git a/src/apps/me.drakeet.puremosaic.ts b/src/apps/me.drakeet.puremosaic.ts
index 6c6109ed..050efbef 100644
--- a/src/apps/me.drakeet.puremosaic.ts
+++ b/src/apps/me.drakeet.puremosaic.ts
@@ -7,13 +7,15 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-解锁高级功能',
-      desc: '点击“不”',
-      fastQuery: true,
-      activityIds: ['.MainActivity', 'me.iwf.photopicker.PhotoPickerActivity'],
+      desc: '点击[不]',
       rules: [
         {
+          fastQuery: true,
+          activityIds: [
+            '.MainActivity',
+            'me.iwf.photopicker.PhotoPickerActivity',
+          ],
           matches: ['[text="解锁高级功能"]', '[text="不"]'],
-          action: 'clickNode',
           snapshotUrls: [
             'https://i.gkd.li/i/16761630',
             'https://i.gkd.li/i/16761818',
diff --git a/src/apps/me.ele.ts b/src/apps/me.ele.ts
index 87dfa91e..ff6f2818 100644
--- a/src/apps/me.ele.ts
+++ b/src/apps/me.ele.ts
@@ -189,7 +189,7 @@ export default defineGkdApp({
       key: 9,
       fastQuery: true,
       name: '通知提示-获取订单信息通知',
-      desc: '点击X',
+      desc: '点击关闭',
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
diff --git a/src/apps/me.piebridge.brevent.ts b/src/apps/me.piebridge.brevent.ts
index 85002192..0a792d63 100644
--- a/src/apps/me.piebridge.brevent.ts
+++ b/src/apps/me.piebridge.brevent.ts
@@ -8,16 +8,13 @@ export default defineGkdApp({
       key: 1,
       name: '权限提示-权限不足弹窗',
       desc: '点击取消',
-      activityIds: ['me.piebridge.brevent.ui.BreventActivity'],
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
-          matches: [
-            '[id="android:id/message"][text^="黑阈服务权限不足"]',
-            '[text="取消"][id^="android:id/button"]',
-          ],
+          activityIds: 'me.piebridge.brevent.ui.BreventActivity',
+          matches: ['[text^="黑阈服务权限不足"]', '[text="取消"]'],
           snapshotUrls: 'https://i.gkd.li/i/13218439',
         },
       ],
diff --git a/src/apps/net.pchome.kds.ts b/src/apps/net.pchome.kds.ts
index 9e216956..4ad79a46 100644
--- a/src/apps/net.pchome.kds.ts
+++ b/src/apps/net.pchome.kds.ts
@@ -15,7 +15,7 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/13043221',
         },
         {
-          preKeys: 0,
+          preKeys: [0],
           key: 1,
           matches: '@LinearLayout > [text="不感兴趣"]',
           snapshotUrls: 'https://i.gkd.li/i/13049609',
diff --git a/src/apps/org.daimhim.zzzfun.ts b/src/apps/org.daimhim.zzzfun.ts
index fe5747d4..0f6fc84b 100644
--- a/src/apps/org.daimhim.zzzfun.ts
+++ b/src/apps/org.daimhim.zzzfun.ts
@@ -7,9 +7,15 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
-      activityIds: 'org.daimhim.zzzfun.ui.home.video.VideoDetailsActivity',
-      rules: 'ImageView -2 ImageView + FrameLayout > ImageView',
-      snapshotUrls: 'https://i.gkd.li/i/13402608',
+      desc: '点击关闭',
+      rules: [
+        {
+          activityIds: 'org.daimhim.zzzfun.ui.home.video.VideoDetailsActivity',
+          matches:
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] <2 FrameLayout < FrameLayout < FrameLayout < FrameLayout < FrameLayout < [id="android:id/content"]',
+          snapshotUrls: 'https://i.gkd.li/i/13402608',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/run.xbud.android.ts b/src/apps/run.xbud.android.ts
index 9cc08c5c..5b9a59af 100644
--- a/src/apps/run.xbud.android.ts
+++ b/src/apps/run.xbud.android.ts
@@ -22,6 +22,7 @@ export default defineGkdApp({
         {
           key: 1,
           name: '腾讯广告',
+          fastQuery: true,
           activityIds: 'run.xbud.android.mvp.ui.other.MainActivity',
           matches:
             '@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="查看详情"]',
@@ -30,6 +31,7 @@ export default defineGkdApp({
         {
           key: 2,
           name: '京东广告',
+          fastQuery: true,
           activityIds: 'run.xbud.android.mvp.ui.other.MainActivity',
           matches:
             '@ImageView[childCount=0][text=null][visibleToUser=true] < FrameLayout[childCount=1] <3 FrameLayout[childCount=3] < FrameLayout[childCount=2] +5 FrameLayout[childCount=4] > [text^="扭动或点击"]',
@@ -47,6 +49,7 @@ export default defineGkdApp({
         {
           key: 4,
           name: '字节广告-2',
+          fastQuery: true,
           activityIds:
             'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
           matches: '[id="com.byted.pangle:id/tt_reward_full_count_down_after"]',
diff --git a/src/apps/tw.com.gamer.android.activecenter.ts b/src/apps/tw.com.gamer.android.activecenter.ts
index 856d84c7..512d2194 100644
--- a/src/apps/tw.com.gamer.android.activecenter.ts
+++ b/src/apps/tw.com.gamer.android.activecenter.ts
@@ -7,12 +7,18 @@ export default defineGkdApp({
     {
       key: 0,
       name: '开屏广告',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules: '[desc="Interstitial close button"][clickable=true]',
-      snapshotUrls: 'https://i.gkd.li/i/14292691',
+      rules: [
+        {
+          matches:
+            '@ImageButton[desc="Interstitial close button"][visibleToUser=true] < FrameLayout <2 RelativeLayout < [id="android:id/content"]',
+          snapshotUrls: 'https://i.gkd.li/i/14292691',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/tw.com.gamer.android.animad.ts b/src/apps/tw.com.gamer.android.animad.ts
index c4098ac0..cad85ed9 100644
--- a/src/apps/tw.com.gamer.android.animad.ts
+++ b/src/apps/tw.com.gamer.android.animad.ts
@@ -8,10 +8,10 @@ export default defineGkdApp({
       key: 1,
       name: '其他-动画疯年龄限制',
       desc: '点击同意',
-      activityIds: 'tw.com.gamer.android.animad.VideoActivity',
-      fastQuery: true,
       rules: [
         {
+          fastQuery: true,
+          activityIds: 'tw.com.gamer.android.animad.VideoActivity',
           matches:
             '[id="tw.com.gamer.android.animad:id/agree_button"][text="同意"]',
           snapshotUrls: 'https://i.gkd.li/i/13808757',
diff --git a/src/apps/tw.nekomimi.nekogram.ts b/src/apps/tw.nekomimi.nekogram.ts
index 77839950..f7903074 100644
--- a/src/apps/tw.nekomimi.nekogram.ts
+++ b/src/apps/tw.nekomimi.nekogram.ts
@@ -7,12 +7,20 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[desc$="稍后提醒我"] -3 * >2 [text="更新 Nekogram"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/14229236',
-        'https://i.gkd.li/i/14372061',
+      rules: [
+        {
+          activityIds: 'org.telegram.ui.LaunchActivity',
+          matches:
+            '@Button[desc$="稍后提醒我"] - [desc="立即下载"] <3 FrameLayout < FrameLayout < [id="android:id/content"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/14229236',
+            'https://i.gkd.li/i/14372061',
+          ],
+        },
       ],
     },
   ],
diff --git a/src/apps/xxx.pornhub.fuck.ts b/src/apps/xxx.pornhub.fuck.ts
index 2e7591b4..612a3049 100644
--- a/src/apps/xxx.pornhub.fuck.ts
+++ b/src/apps/xxx.pornhub.fuck.ts
@@ -15,7 +15,7 @@ export default defineGkdApp({
       rules: [
         {
           matches:
-            '[desc="公告"] + * + @[desc="知道了"] <<n [id="android:id/content"]',
+            '@Button[desc="知道了"][visibleToUser=true] <3 View < View < View < View < FrameLayout < [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/ae1792dd-210b-4ac2-bfce-c2081ed03498',
           snapshotUrls: 'https://i.gkd.li/i/14559882',