diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts
index 0c6f8565..1aaff5bb 100644
--- a/src/appDeprecatedKeys.ts
+++ b/src/appDeprecatedKeys.ts
@@ -40,7 +40,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'air.tv.douyu.android',
     name: '斗鱼',
-    deprecatedKeys: [0, 1],
+    deprecatedKeys: [0, 1, 2],
   },
   {
     id: 'android.zhibo8',
@@ -60,7 +60,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'client.android.yixiaotong',
     name: '乐校通',
-    deprecatedKeys: [0],
+    deprecatedKeys: [0, 3],
   },
   {
     id: 'cmb.pb',
diff --git a/src/apps/ai.ling.luka.app.ts b/src/apps/ai.ling.luka.app.ts
index f2eb1707..c9db09cb 100644
--- a/src/apps/ai.ling.luka.app.ts
+++ b/src/apps/ai.ling.luka.app.ts
@@ -14,6 +14,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.page.activity.MainActivity',
           matches: ['[text="通知服务未开启"]', '[text="取消"]'],
           snapshotUrls: 'https://i.gkd.li/i/15796616',
         },
diff --git a/src/apps/air.tv.douyu.android.ts b/src/apps/air.tv.douyu.android.ts
index d042e1cc..f1908619 100644
--- a/src/apps/air.tv.douyu.android.ts
+++ b/src/apps/air.tv.douyu.android.ts
@@ -4,14 +4,6 @@ export default defineGkdApp({
   id: 'air.tv.douyu.android',
   name: '斗鱼',
   groups: [
-    {
-      key: 2,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: '[text="立即升级"] - [text="忽略"][clickable=true]',
-    },
     {
       key: 3,
       name: '局部广告-直播间广告',
diff --git a/src/apps/bin.mt.plus.canary.ts b/src/apps/bin.mt.plus.canary.ts
index 3ac72c66..537acf03 100644
--- a/src/apps/bin.mt.plus.canary.ts
+++ b/src/apps/bin.mt.plus.canary.ts
@@ -11,8 +11,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: 'LinearLayoutCompat @[text="取消"] + [text="更新"]',
-      snapshotUrls: 'https://i.gkd.li/i/13561226',
+      rules: [
+        {
+          activityIds: 'bin.mt.plus.Main',
+          matches: '@[text="取消"] + [text="更新"]',
+          snapshotUrls: 'https://i.gkd.li/i/13561226',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/bin.mt.plus.ts b/src/apps/bin.mt.plus.ts
index d1ad59f4..f7843b09 100644
--- a/src/apps/bin.mt.plus.ts
+++ b/src/apps/bin.mt.plus.ts
@@ -8,10 +8,12 @@ export default defineGkdApp({
       key: 1,
       name: '更新提示',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.Main',
           matches: ['[text="更新"]', '[text="取消"]'],
           snapshotUrls: 'https://i.gkd.li/i/16050794',
         },
diff --git a/src/apps/bubei.tingshu.ts b/src/apps/bubei.tingshu.ts
index 725d2a24..b6491dbf 100644
--- a/src/apps/bubei.tingshu.ts
+++ b/src/apps/bubei.tingshu.ts
@@ -22,12 +22,17 @@ export default defineGkdApp({
     {
       key: 2,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
-      rules: '[text="发现新版本"] +2 * > [text="暂不升级"]',
-      snapshotUrls: 'https://i.gkd.li/i/13545953',
+      rules: [
+        {
+          activityIds: '.home.ui.HomeActivity',
+          matches: '[text="暂不升级"]',
+          snapshotUrls: 'https://i.gkd.li/i/13545953',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/camera.timestamp.mark.watermark.ts b/src/apps/camera.timestamp.mark.watermark.ts
index a4218a5d..6dfecc36 100644
--- a/src/apps/camera.timestamp.mark.watermark.ts
+++ b/src/apps/camera.timestamp.mark.watermark.ts
@@ -10,8 +10,10 @@ export default defineGkdApp({
       desc: '点击关闭',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.google.android.gms.ads.AdActivity',
-          matches: '[desc="Interstitial close button"][visibleToUser=true]',
+          matches:
+            '@ImageButton[desc="Interstitial close button"][visibleToUser=true] < FrameLayout <2 RelativeLayout < [id="android:id/content"]',
           exampleUrls: 'https://e.gkd.li/1ab940d5-88b8-4088-81fe-9cb72c4cbd53',
           snapshotUrls: 'https://i.gkd.li/i/17058992',
         },
diff --git a/src/apps/chuxin.shimo.shimowendang.ts b/src/apps/chuxin.shimo.shimowendang.ts
index 425c52dc..ed95af3d 100644
--- a/src/apps/chuxin.shimo.shimowendang.ts
+++ b/src/apps/chuxin.shimo.shimowendang.ts
@@ -7,9 +7,15 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-首页顶部横幅广告',
-      activityIds: 'chuxin.shimo.shimowendang.MainActivity',
-      rules: '[desc="banner-desktop-announcement-close"]',
-      snapshotUrls: 'https://i.gkd.li/i/13627960',
+      rules: [
+        {
+          fastQuery: true,
+          activityIds: 'chuxin.shimo.shimowendang.MainActivity',
+          matches:
+            '@[desc="banner-desktop-announcement-close"][visibleToUser=true] - ViewGroup > [text*="免费试用企业版"]',
+          snapshotUrls: 'https://i.gkd.li/i/13627960',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/cisdom.com.bigteaapp.ts b/src/apps/cisdom.com.bigteaapp.ts
index 9efd4dfd..2540ce93 100644
--- a/src/apps/cisdom.com.bigteaapp.ts
+++ b/src/apps/cisdom.com.bigteaapp.ts
@@ -9,9 +9,15 @@ export default defineGkdApp({
       name: '全屏广告-弹窗广告',
       fastQuery: true,
       matchTime: 10000,
-      rules:
-        '[text$="抽奖送大礼"] < WebView - [id="cisdom.com.bigteaapp:id/close"]',
-      snapshotUrls: 'https://i.gkd.li/i/13228579',
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          matches:
+            '[text$="抽奖送大礼"] < WebView - [id="cisdom.com.bigteaapp:id/close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13228579',
+        },
+      ],
     },
   ],
 });
diff --git a/src/apps/client.android.yixiaotong.ts b/src/apps/client.android.yixiaotong.ts
index 6f7ff035..ab0b62ae 100644
--- a/src/apps/client.android.yixiaotong.ts
+++ b/src/apps/client.android.yixiaotong.ts
@@ -30,11 +30,9 @@ export default defineGkdApp({
         {
           key: 2,
           name: '快手广告-2',
-          activityIds: [],
-          matches: [
-            'ViewGroup[childCount=2] > ImageView + [text="广告"]',
-            'ViewGroup[childCount=1] > @ViewGroup[childCount=1] > ImageView[childCount=0]',
-          ],
+          fastQuery: true,
+          matches:
+            'ImageView[childCount=0][text=null] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] < ViewGroup +n ViewGroup[childCount=2] > [text="广告"]',
           snapshotUrls: 'https://i.gkd.li/i/13625511',
         },
       ],
@@ -58,14 +56,16 @@ export default defineGkdApp({
         {
           key: 1,
           name: '快手广告',
+          fastQuery: true,
           matches:
-            '[id="client.android.yixiaotong:id/ksad_container"] >n @TextView + View > [text="广告"]',
+            '@TextView[clickable=true][childCount=0][visibleToUser=true] + View > [visibleToUser=true][text="广告"] <<n [id="client.android.yixiaotong:id/ksad_container"]',
           snapshotUrls: 'https://i.gkd.li/i/13450887',
         },
         {
           key: 2,
+          fastQuery: true,
           matches:
-            'FrameLayout[childCount=3] > FrameLayout > ImageView[visibleToUser=true]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout > [text="领取优惠"]',
           exampleUrls:
             'https://m.gkd.li/57941037/ad8a1bbf-61b5-4a7e-8e16-5e0092f04b8c',
           snapshotUrls: 'https://i.gkd.li/i/14469848',
@@ -88,18 +88,5 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 3,
-      name: '局部广告-底部卡片广告',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'activity',
-      activityIds:
-        'client.android.yixiaotong.v3.ui.appcontrol.bath.BathDetailActivity',
-      rules:
-        '@TextView[clickable=true][text=""] + View [visibleToUser=true][text="广告"] <<n [id="client.android.yixiaotong:id/ksad_container"]',
-      snapshotUrls: 'https://i.gkd.li/i/13448963',
-    },
   ],
 });
diff --git a/src/apps/cmb.pb.ts b/src/apps/cmb.pb.ts
index 1e1e383c..18b3efc8 100644
--- a/src/apps/cmb.pb.ts
+++ b/src/apps/cmb.pb.ts
@@ -8,9 +8,16 @@ export default defineGkdApp({
       key: 3,
       name: '局部广告-首页活动悬浮广告',
       fastQuery: true,
-      activityIds: 'cmb.pb.app.mainframe.container.PBMainActivity',
-      rules: '[vid="float_window"] > [vid="ivCancle"][clickable=true]',
-      snapshotUrls: 'https://i.gkd.li/i/14208669',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'cmb.pb.app.mainframe.container.PBMainActivity',
+          matches: '[vid="float_window"] > [vid="ivCancle"][clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/14208669',
+        },
+      ],
     },
     {
       key: 10,
@@ -25,8 +32,9 @@ export default defineGkdApp({
         },
         {
           key: 1,
+          fastQuery: true,
           activityIds: 'com.pb.marketing.PopupWindowActivity',
-          matches: '[desc^="活动图片"] + [desc="关闭"]',
+          matches: '[desc^="活动图片"] + [vid="ivCancle"][desc="关闭"]',
           snapshotUrls: 'https://i.gkd.li/i/14208693',
         },
       ],
@@ -37,12 +45,16 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[desc="关闭"] - * > [text*="开启"][text*="定位"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/12706029',
-        'https://i.gkd.li/i/13248893',
-        'https://i.gkd.li/i/13897345',
-        'https://i.gkd.li/i/14208717',
+      rules: [
+        {
+          matches: '@[desc="关闭"] - * > [text*="开启"][text*="定位"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12706029',
+            'https://i.gkd.li/i/13248893',
+            'https://i.gkd.li/i/13897345',
+            'https://i.gkd.li/i/14208717',
+          ],
+        },
       ],
     },
   ],
diff --git a/src/apps/cmccwm.mobilemusic.ts b/src/apps/cmccwm.mobilemusic.ts
index 8ba849f4..b7184bab 100644
--- a/src/apps/cmccwm.mobilemusic.ts
+++ b/src/apps/cmccwm.mobilemusic.ts
@@ -14,8 +14,8 @@ export default defineGkdApp({
       rules: [
         {
           action: 'back',
-          matches:
-            '[id="cmccwm.mobilemusic.libraries_feature:id/tv_title"][text="发现新版本"]',
+          activityIds: '.ui.base.MainActivity',
+          matches: '[text="发现新版本"]',
           snapshotUrls: 'https://i.gkd.li/i/13448898',
         },
       ],
diff --git a/src/apps/cn.ccspeed.ts b/src/apps/cn.ccspeed.ts
index 62a64d18..f859f40b 100644
--- a/src/apps/cn.ccspeed.ts
+++ b/src/apps/cn.ccspeed.ts
@@ -7,15 +7,15 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-加速页分享抽奖浮窗',
-      activityIds: 'cn.ccspeed.app.MainActivity',
       fastQuery: true,
       matchTime: 10000,
-      resetMatch: 'activity',
       actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: 'cn.ccspeed.app.MainActivity',
           matches:
-            'FrameLayout[id="cn.ccspeed:id/float_layout"] > ImageView - ImageView',
+            '@ImageView[visibleToUser=true] + [id="cn.ccspeed:id/iv_float"]',
           snapshotUrls: 'https://i.gkd.li/i/13539299',
         },
       ],