diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts
index 0c9a6513..70e7bb17 100644
--- a/src/appDeprecatedKeys.ts
+++ b/src/appDeprecatedKeys.ts
@@ -727,6 +727,11 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
     name: '中国军号',
     deprecatedKeys: [1],
   },
+  {
+    id: 'com.alicloud.databox',
+    name: '阿里云盘',
+    deprecatedKeys: [2],
+  },
 ];
 
 const map: Map<string, number[]> = new Map();
diff --git a/src/apps/com.able.wisdomtree.ts b/src/apps/com.able.wisdomtree.ts
index df5017fa..6fa5f7af 100644
--- a/src/apps/com.able.wisdomtree.ts
+++ b/src/apps/com.able.wisdomtree.ts
@@ -7,30 +7,50 @@ export default defineGkdApp({
     {
       key: 2,
       name: '权限提示-通知权限',
-      desc: '自动点击暂不开启。',
+      desc: '点击[暂不开启]',
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: 'TextView[id="com.able.wisdomtree:id/negativeButton"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/13458779',
-        'https://i.gkd.li/i/13623441',
-        'https://i.gkd.li/i/13695447',
+      rules: [
+        {
+          activityIds: [
+            '.widget.MyAlertDialog',
+            '.login.MainGroupActivity',
+            'com.example.advertisement_business.advertisement.AdvertisementActivity',
+          ],
+          matches: [
+            '[text="开启消息推送通知"][visibleToUser=true]',
+            '[text="暂不开启"][visibleToUser=true]',
+          ],
+          snapshotUrls: [
+            'https://i.gkd.li/i/13458779',
+            'https://i.gkd.li/i/13623441',
+            'https://i.gkd.li/i/13695447',
+          ],
+        },
       ],
     },
     {
       key: 3,
       name: '更新提示',
-      desc: '自动点击忽略',
+      desc: '点击[忽略]',
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="更新"] -n [text="忽略"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/13458796',
-        'https://i.gkd.li/i/13797285',
+      rules: [
+        {
+          activityIds: [
+            '.login.StartActivity',
+            'com.example.advertisement_business.advertisement.AdvertisementActivity',
+          ],
+          matches: ['[text="更新"] ', ' [text="忽略"]'],
+          snapshotUrls: [
+            'https://i.gkd.li/i/13458796',
+            'https://i.gkd.li/i/13797285',
+          ],
+        },
       ],
     },
   ],
diff --git a/src/apps/com.ai.obc.cbn.app.ts b/src/apps/com.ai.obc.cbn.app.ts
index 523495cd..0c8b5457 100644
--- a/src/apps/com.ai.obc.cbn.app.ts
+++ b/src/apps/com.ai.obc.cbn.app.ts
@@ -12,6 +12,10 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: [
+            '.ui.other.activity.MainActivity',
+            '.ui.main.fragment.MainFragment$7$1',
+          ],
           matches: '[id$="/ivDis"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12617201',
diff --git a/src/apps/com.aiwu.market.ts b/src/apps/com.aiwu.market.ts
index 061460ea..b89d5caa 100644
--- a/src/apps/com.aiwu.market.ts
+++ b/src/apps/com.aiwu.market.ts
@@ -7,13 +7,14 @@ export default defineGkdApp({
     {
       key: 1,
       name: '青少年模式',
-      desc: '点击"我知道了"',
+      desc: '点击[我知道了]',
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.ui.activity.NewHomeActivity',
           matches: '[vid="hintTextView2"] + [vid="confirmView"]',
           snapshotUrls: 'https://i.gkd.li/i/14032203',
         },
diff --git a/src/apps/com.alibaba.ailabs.tg.ts b/src/apps/com.alibaba.ailabs.tg.ts
index 222735fa..fe731036 100644
--- a/src/apps/com.alibaba.ailabs.tg.ts
+++ b/src/apps/com.alibaba.ailabs.tg.ts
@@ -11,9 +11,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
-        '[id="com.alibaba.ailabs.tg:id/ll_download"] + [id="com.alibaba.ailabs.tg:id/va_dialog_cancel"]',
-      snapshotUrls: 'https://i.gkd.li/i/13296332',
+      rules: [
+        {
+          activityIds: '.activity.HomeActivity',
+          matches:
+            '[id="com.alibaba.ailabs.tg:id/ll_download"] + [id="com.alibaba.ailabs.tg:id/va_dialog_cancel"]',
+          snapshotUrls: 'https://i.gkd.li/i/13296332',
+        },
+      ],
     },
     {
       key: 2,
diff --git a/src/apps/com.alibaba.aliyun.ts b/src/apps/com.alibaba.aliyun.ts
index ca3a9658..d4b00e5d 100644
--- a/src/apps/com.alibaba.aliyun.ts
+++ b/src/apps/com.alibaba.aliyun.ts
@@ -11,8 +11,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text^="打开手机消息通知"] + * >2 [text="以后再说"]',
-      snapshotUrls: 'https://i.gkd.li/i/13446162',
+      rules: [
+        {
+          activityIds: '.biz.home.mine.activity.KFeeCenterActivity',
+          matches: '[text^="打开手机消息通知"] + * >2 [text="以后再说"]',
+          snapshotUrls: 'https://i.gkd.li/i/13446162',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/com.alibaba.android.rimet.ts b/src/apps/com.alibaba.android.rimet.ts
index d086bd55..fcd3ac3a 100644
--- a/src/apps/com.alibaba.android.rimet.ts
+++ b/src/apps/com.alibaba.android.rimet.ts
@@ -38,10 +38,10 @@ export default defineGkdApp({
       ],
     },
     {
-      name: '功能类-自动点击原图',
       key: 3,
-      actionMaximum: 1,
+      name: '功能类-自动点击原图',
       fastQuery: true,
+      actionMaximum: 1,
       activityIds:
         'com.alibaba.android.dingtalk.photoui.activitys.AlbumActivity',
       rules: [
diff --git a/src/apps/com.alibaba.wireless.ts b/src/apps/com.alibaba.wireless.ts
index fe14dd5e..63054017 100644
--- a/src/apps/com.alibaba.wireless.ts
+++ b/src/apps/com.alibaba.wireless.ts
@@ -15,6 +15,10 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          activityIds: [
+            '.launch.home.V5HomeActivity',
+            '.workbench.myali.MyAliSettingActivity',
+          ],
           matches: '[id="com.alibaba.wireless:id/update_button_cancel"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12684422',
@@ -23,6 +27,7 @@ export default defineGkdApp({
         },
         {
           key: 1,
+          activityIds: '.launch.home.V5HomeActivity',
           matches: '[vid="update_pop_cancel_btn"]',
           snapshotUrls: 'https://i.gkd.li/i/15004486',
         },
@@ -31,12 +36,20 @@ export default defineGkdApp({
     {
       key: 2,
       name: '全屏广告-首页弹窗广告',
-      fastQuery: true,
-      activityIds: 'com.alibaba.wireless.launch.home.V5HomeActivity',
-      rules: 'WebView >n View > Image[text*="FXa-124-124"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/13683509',
-        'https://i.gkd.li/i/13683510',
+      desc: '点击关闭',
+      rules: [
+        {
+          fastQuery: true,
+          actionMaximum: 1,
+          resetMatch: 'app',
+          activityIds: 'com.alibaba.wireless.launch.home.V5HomeActivity',
+          matches:
+            '@Image[text*="FXa-124-124"][visibleToUser=true] <<n [id="com.alibaba.wireless:id/v_yacht_float_cell"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13683509',
+            'https://i.gkd.li/i/13683510',
+          ],
+        },
       ],
     },
   ],
diff --git a/src/apps/com.alicloud.databox.ts b/src/apps/com.alicloud.databox.ts
index 4be79cad..83219fa9 100644
--- a/src/apps/com.alicloud.databox.ts
+++ b/src/apps/com.alicloud.databox.ts
@@ -12,8 +12,8 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       activityIds: [
-        'com.alicloud.databox.MainActivity',
-        'com.alicloud.databox.navigation.NavigationFragmentContainerActivity',
+        '.MainActivity',
+        '.navigation.NavigationFragmentContainerActivity',
       ],
       rules: [
         {
@@ -36,24 +36,18 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-活动弹窗',
-      activityIds: 'com.alicloud.databox.MainActivity',
-      rules:
-        '[id="com.alicloud.databox:id/webContainer"] >5 View[childCount=3] > TextView[index=1]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/13228610',
-        'https://i.gkd.li/i/14235204',
-      ],
-    },
-    {
-      key: 2,
-      name: '功能类-时光设备间页面自动点击“开心收下”',
-      activityIds:
-        'com.alipay.mobile.nebulax.integration.mpaas.activity.NebulaActivity$Main',
-      actionMaximum: 1,
-      resetMatch: 'activity',
+      fastQuery: true,
       matchTime: 10000,
-      rules: 'View[childCount=9] > @Image -2 View[childCount=5]',
-      snapshotUrls: 'https://i.gkd.li/i/13596924',
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: '.MainActivity',
+          matches:
+            '@TextView[clickable=true][visibleToUser=true] - Image[text!=null] < View < View < View < WebView < WebView < [vid="webContainer"]',
+          snapshotUrls: 'https://i.gkd.li/i/14235204',
+        },
+      ],
     },
     {
       key: 3,
@@ -64,6 +58,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.MainActivity',
           matches:
             '[text^="立即了解"] -3 @View[clickable=true] <<n [vid="webContainer"]',
           snapshotUrls: 'https://i.gkd.li/i/13806865',
@@ -76,9 +71,10 @@ export default defineGkdApp({
       desc: '关闭弹窗',
       rules: [
         {
-          activityIds: 'com.alicloud.databox.MainActivity',
+          fastQuery: true,
+          activityIds: '.MainActivity',
           matches:
-            '[vid="webContainer"] >5 View[childCount=4] > TextView[index=3][clickable=true]',
+            '@TextView[childCount=0][clickable=true][visibleToUser=true] <4 View[childCount=4] < View < View < WebView < WebView < [vid="webContainer"]',
           snapshotUrls: 'https://i.gkd.li/i/14414446',
         },
       ],
@@ -86,9 +82,9 @@ export default defineGkdApp({
     {
       key: 5,
       name: '功能类-扫描二维码登录时自动点击登录',
+      fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
           activityIds: 'com.taobao.login4android.scan.QrScanActivity',
@@ -126,13 +122,6 @@ export default defineGkdApp({
           matches: '[vid="close"]',
           snapshotUrls: 'https://i.gkd.li/i/15433289',
         },
-        // {
-        //   误触，无法解决 https://i.gkd.li/i/17556779
-        //   key: 1,
-        //   activityIds: 'com.alicloud.databox.MainActivity',
-        //   matches: '[vid="ivTitleAction"]',
-        //   snapshotUrls: 'https://i.gkd.li/i/15524767',
-        // },
       ],
     },
   ],
diff --git a/src/apps/com.allhistory.dls.marble.ts b/src/apps/com.allhistory.dls.marble.ts
index 13927ee1..6cb61f78 100644
--- a/src/apps/com.allhistory.dls.marble.ts
+++ b/src/apps/com.allhistory.dls.marble.ts
@@ -14,6 +14,8 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds:
+            'com.pwrd.dls.marble.other.notification.NotificationDialogActivity',
           matches: '[vid="v_open"] + [vid="v_not"]',
           snapshotUrls: 'https://i.gkd.li/i/13997956',
         },
@@ -21,13 +23,16 @@ export default defineGkdApp({
     },
     {
       key: 2,
-      fastQuery: true,
       name: '局部广告-左下角参与答题卡片',
-      desc: '点击X',
+      desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'com.pwrd.dls.marble.moudle.homepage.HomePageActivity',
-          matches: '[id="com.allhistory.dls.marble:id/iv_close"]',
+          matches: ['[vid="iv_board"]', '[vid="iv_close"]'],
           snapshotUrls: 'https://i.gkd.li/i/13997954',
         },
       ],
diff --git a/src/apps/com.android.bankabc.ts b/src/apps/com.android.bankabc.ts
index 027d144d..50506d1a 100644
--- a/src/apps/com.android.bankabc.ts
+++ b/src/apps/com.android.bankabc.ts
@@ -33,8 +33,10 @@ export default defineGkdApp({
       key: 2,
       name: '更新提示',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      activityIds: '.MainActivity',
       rules: [
         {
           key: 0,
@@ -62,19 +64,31 @@ export default defineGkdApp({
       key: 3,
       name: '权限提示-定位权限',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="允许获取位置信息"] +n * > [text="取消"]',
-      snapshotUrls: 'https://i.gkd.li/i/14208572',
+      rules: [
+        {
+          activityIds: '.MainActivity',
+          matches: '[text="允许获取位置信息"] +n * > [text="取消"]',
+          snapshotUrls: 'https://i.gkd.li/i/14208572',
+        },
+      ],
     },
     {
       key: 4,
       name: '权限提示-通知权限',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[vid="iv_notification_reminder_dialog_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/14208621',
+      rules: [
+        {
+          activityIds: '.MainActivity',
+          matches: '[vid="iv_notification_reminder_dialog_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/14208621',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/com.android.contacts.ts b/src/apps/com.android.contacts.ts
index 4bf071f6..0a0740fc 100644
--- a/src/apps/com.android.contacts.ts
+++ b/src/apps/com.android.contacts.ts
@@ -8,10 +8,12 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      fastQuery: true,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
-          fastQuery: true,
           activityIds:
             'com.mobile.businesshall.ui.common.RecommendPopupActivity',
           matches: '[vid="img_close_btn"][clickable=true][visibleToUser=true]',
diff --git a/src/apps/com.android.documentsui.ts b/src/apps/com.android.documentsui.ts
index a63148f4..1ab4c741 100644
--- a/src/apps/com.android.documentsui.ts
+++ b/src/apps/com.android.documentsui.ts
@@ -7,16 +7,25 @@ export default defineGkdApp({
     {
       key: 1,
       name: '功能类-允许第三方应用访问文件夹',
-      activityIds: 'com.android.documentsui.picker.PickActivity',
-      rules: '[text="取消"] + [text="允许"]',
-      snapshotUrls: 'https://i.gkd.li/i/13801468',
+      desc: '点击允许',
+      rules: [
+        {
+          fastQuery: true,
+          activityIds: 'com.android.documentsui.picker.PickActivity',
+          matches: [
+            '[text^="要允许"][visibleToUser=true]',
+            '[text="允许"][visibleToUser=true]',
+          ],
+          snapshotUrls: 'https://i.gkd.li/i/13801468',
+        },
+      ],
     },
     {
       key: 2,
-      fastQuery: true,
       name: '功能类-使用此文件夹',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.android.documentsui.picker.PickActivity',
           matches: '[text="使用此文件夹"]',
           snapshotUrls: 'https://i.gkd.li/i/13916082',
diff --git a/src/apps/com.android.icredit.ts b/src/apps/com.android.icredit.ts
index 21af74c0..a7645c3d 100644
--- a/src/apps/com.android.icredit.ts
+++ b/src/apps/com.android.icredit.ts
@@ -8,11 +8,15 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-VIP弹窗',
       desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'com.android.icredit.ui.MainMenuActivity',
           matches:
-            '[text$="限时返场" || text="首单有礼"] >2 View[childCount=2] > Image[visibleToUser=true]',
+            '@Image[childCount=0][visibleToUser=true] <2 View < View < WebView[text$="限时返场" || text="首单有礼"] < WebView < LinearLayout < LinearLayout < FrameLayout < [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/eb232325-12e4-495f-a9f3-5f853d5e66f9',
           snapshotUrls: [
diff --git a/src/apps/com.android.mediacenter.ts b/src/apps/com.android.mediacenter.ts
index 432e9818..6f05c368 100644
--- a/src/apps/com.android.mediacenter.ts
+++ b/src/apps/com.android.mediacenter.ts
@@ -21,10 +21,6 @@ export default defineGkdApp({
             'https://i.gkd.li/i/12901417',
             'https://i.gkd.li/i/12908742',
           ],
-          exampleUrls: [
-            'https://github.com/gkd-kit/inspect/assets/38517192/6c34cd13-cfda-4462-99ed-2a2534a6fdf5',
-            'https://github.com/gkd-kit/inspect/assets/38517192/c71bb14d-cd1f-4f9e-8ee9-6a1e11e56901',
-          ],
         },
       ],
     },
@@ -36,8 +32,6 @@ export default defineGkdApp({
       fastQuery: true,
       rules: '[id="com.android.mediacenter:id/iv_close"]',
       snapshotUrls: 'https://i.gkd.li/i/12914026',
-      exampleUrls:
-        'https://github.com/gkd-kit/inspect/assets/38517192/433dd71c-4fe5-41c9-a2da-dd3ac29f8dd4',
     },
     {
       key: 2,
@@ -51,8 +45,6 @@ export default defineGkdApp({
           activityIds: 'com.android.mediacenter.MainActivity',
           matches: '[id="com.android.mediacenter:id/ad_more_layout"]',
           snapshotUrls: 'https://i.gkd.li/i/12914077',
-          exampleUrls:
-            'https://github.com/gkd-kit/inspect/assets/38517192/37ee4a9b-2518-41e6-8227-7b204ed1bf61',
         },
         {
           key: 1,
@@ -61,8 +53,6 @@ export default defineGkdApp({
           matches:
             '[id="com.android.mediacenter:id/label_title"][text="直接关闭"]',
           snapshotUrls: 'https://i.gkd.li/i/12914078',
-          exampleUrls:
-            'https://github.com/gkd-kit/inspect/assets/38517192/d098a194-80ff-49a1-b80e-191f7574a816',
         },
       ],
     },
diff --git a/src/apps/com.android.providers.downloads.ui.ts b/src/apps/com.android.providers.downloads.ui.ts
index cd566694..575f190c 100644
--- a/src/apps/com.android.providers.downloads.ui.ts
+++ b/src/apps/com.android.providers.downloads.ui.ts
@@ -7,12 +7,17 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
-      rules: '@[text="以后再说"] + [text="立即更新"]',
-      snapshotUrls: 'https://i.gkd.li/i/13631769',
+      rules: [
+        {
+          activityIds: '.DownloadList',
+          matches: '@[text="以后再说"] + [text="立即更新"]',
+          snapshotUrls: 'https://i.gkd.li/i/13631769',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/com.android.quicksearchbox.ts b/src/apps/com.android.quicksearchbox.ts
index 1efcc485..9eec90de 100644
--- a/src/apps/com.android.quicksearchbox.ts
+++ b/src/apps/com.android.quicksearchbox.ts
@@ -9,10 +9,15 @@ export default defineGkdApp({
       name: '局部广告-卡片广告',
       fastQuery: true,
       matchTime: 10000,
-      resetMatch: 'app',
       actionMaximum: 1,
-      rules: '[vid="ad_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/13897834',
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: '.SearchActivityTransparent',
+          matches: '[vid="ad_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13897834',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/com.android.soundrecorder.ts b/src/apps/com.android.soundrecorder.ts
index e3a1f24d..acce90ee 100644
--- a/src/apps/com.android.soundrecorder.ts
+++ b/src/apps/com.android.soundrecorder.ts
@@ -7,11 +7,17 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="以后再说"] + [text="立即更新"]',
-      snapshotUrls: 'https://i.gkd.li/i/14140552',
+      rules: [
+        {
+          activityIds: '.RecordPreviewActivity',
+          matches: '@[text="以后再说"] + [text="立即更新"]',
+          snapshotUrls: 'https://i.gkd.li/i/14140552',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/com.android.thememanager.ts b/src/apps/com.android.thememanager.ts
index ab0b0c7c..3ad489fa 100644
--- a/src/apps/com.android.thememanager.ts
+++ b/src/apps/com.android.thememanager.ts
@@ -29,14 +29,21 @@ export default defineGkdApp({
       key: 2,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
-      activityIds: [
-        'com.android.thememanager.ThemeResourceTabActivity',
-        'com.android.thememanager.ThemeResourceProxyTabActivity',
-      ],
-      rules: 'ImageView[id="com.android.thememanager:id/cancel"][desc="关闭"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/13215038',
-        'https://i.gkd.li/i/15286330',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: [
+            'com.android.thememanager.ThemeResourceTabActivity',
+            'com.android.thememanager.ThemeResourceProxyTabActivity',
+          ],
+          matches: 'ImageView[vid="cancel"][desc="关闭"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13215038',
+            'https://i.gkd.li/i/15286330',
+          ],
+        },
       ],
     },
     {
diff --git a/src/apps/com.android.tnaant.ts b/src/apps/com.android.tnaant.ts
index 22d22326..d9bfd7d9 100644
--- a/src/apps/com.android.tnaant.ts
+++ b/src/apps/com.android.tnaant.ts
@@ -7,11 +7,17 @@ export default defineGkdApp({
     {
       key: 5,
       name: '通知提示-公告弹窗',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="公告"] +2 [text="我知道了"]',
-      snapshotUrls: 'https://i.gkd.li/i/13713449',
+      rules: [
+        {
+          activityIds: 'com.dd.antss.ui.activity.LaunchActivity',
+          matches: '[text="公告"] +2 [text="我知道了"]',
+          snapshotUrls: 'https://i.gkd.li/i/13713449',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/com.android.updater.ts b/src/apps/com.android.updater.ts
index 1703ee87..5460a21a 100644
--- a/src/apps/com.android.updater.ts
+++ b/src/apps/com.android.updater.ts
@@ -13,6 +13,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.MainActivity',
           matches: [
             '[vid="alertTitle"][text="开启智能更新" || text="Install automatically?"]',
             '[id="android:id/button2"][text="暂不开启" || text="No"]',
diff --git a/src/apps/com.antutu.ABenchMark.ts b/src/apps/com.antutu.ABenchMark.ts
index f13e3d22..bf46d459 100644
--- a/src/apps/com.antutu.ABenchMark.ts
+++ b/src/apps/com.antutu.ABenchMark.ts
@@ -7,9 +7,16 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-卡片广告',
-      activityIds: 'com.android.module.app.ui.test.activity.ActivityTestResult',
-      rules: '[text="广告"] + TextView + View > TextView',
-      snapshotUrls: 'https://i.gkd.li/i/13234012',
+      rules: [
+        {
+          fastQuery: true,
+          activityIds:
+            'com.android.module.app.ui.test.activity.ActivityTestResult',
+          matches:
+            '[text="广告"] +2 View > @TextView[childCount=0][index=1][clickable=true][visibleToUser=true] <<n [id="com.antutu.ABenchMark:id/ksad_container"]',
+          snapshotUrls: 'https://i.gkd.li/i/13234012',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/com.apkpure.aegon.ts b/src/apps/com.apkpure.aegon.ts
index 4a16bbb8..116c7775 100644
--- a/src/apps/com.apkpure.aegon.ts
+++ b/src/apps/com.apkpure.aegon.ts
@@ -8,11 +8,15 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-热门推荐关闭',
       desc: '关闭应用推广',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'com.apkpure.aegon.main.activity.MainTabActivity',
           matches:
-            '[text="精选必备好应用"] + [name="android.widget.RelativeLayout"] > [name="android.widget.ImageView"]',
+            '@RelativeLayout[clickable=true][visibleToUser=true] - [text="精选必备好应用"] <2 RelativeLayout < LinearLayout < [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/13466647',
         },
       ],
diff --git a/src/apps/com.autonavi.minimap.ts b/src/apps/com.autonavi.minimap.ts
index 5c3be4c1..daf69300 100644
--- a/src/apps/com.autonavi.minimap.ts
+++ b/src/apps/com.autonavi.minimap.ts
@@ -23,10 +23,11 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      activityIds: 'com.autonavi.map.activity.NewMapActivity',
       rules: [
         {
           key: 1,
@@ -47,10 +48,15 @@ export default defineGkdApp({
       key: 4,
       name: '功能类-截屏分享',
       desc: '关闭截屏时app弹出的分享弹窗',
-      activityIds: 'com.autonavi.map.activity.NewMapActivity',
-      rules:
-        '[text="分享截图至"] < ViewGroup < ViewGroup + @ViewGroup[clickable=true] > ImageView',
-      snapshotUrls: 'https://i.gkd.li/i/13473388',
+      rules: [
+        {
+          fastQuery: true,
+          activityIds: 'com.autonavi.map.activity.NewMapActivity',
+          matches:
+            '[text="分享截图至"] < ViewGroup < ViewGroup + @ViewGroup[clickable=true] > ImageView <<n [id="com.autonavi.minimap:id/fragment_container"]',
+          snapshotUrls: 'https://i.gkd.li/i/13473388',
+        },
+      ],
     },
     {
       key: 10,