perf: some rules

src/appDeprecatedKeys.ts

@@ -110,7 +110,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'cn.wps.moffice_eng',
     name: 'WPS',
-    deprecatedKeys: [0],
+    deprecatedKeys: [0, 7],
   },
   {
     id: 'cn.xiaochuankeji.tieba',
@@ -832,6 +832,16 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
     name: '胖乖生活',
     deprecatedKeys: [0],
   },
+  {
+    id: 'cn.lezhi.speedtest',
+    name: '网速管家',
+    deprecatedKeys: [1],
+  },
+  {
+    id: 'io.iftech.android.box',
+    name: '小组件盒子',
+    deprecatedKeys: [1],
+  },
 ];
 
 const map: Map<string, number[]> = new Map();

src/apps/air.tv.douyu.android.ts

@@ -17,10 +17,8 @@ export default defineGkdApp({
           name: '右下方悬浮广告-1',
           matches:
             'ViewGroup[childCount=8] > ViewGroup[index=5] >4 RelativeLayout[visibleToUser=true] > ImageView[clickable=true][index=1]',
-          snapshotUrls: [
+          snapshotUrls: 'https://i.gkd.li/i/13948990',
-            'https://i.gkd.li/i/13948990',
+          excludeSnapshotUrls: 'https://i.gkd.li/i/14310474',
-            'https://i.gkd.li/i/14310474', // 避免在此页面误触
-          ],
         },
         {
           key: 6,

src/apps/android.zhibo8.ts

@@ -25,6 +25,7 @@ export default defineGkdApp({
           ],
         },
         {
+          preKeys: [0],
           key: 1,
           name: '点击不感兴趣',
           matches: '@[clickable=true] >3 [text="不感兴趣"]',

src/apps/cmb.pb.ts

@@ -47,9 +47,13 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: [
+            '.app.h5container.webviewcontainer.PBWebContainerActivity',
+            '.app.search.PBSearchWebActivity',
+            'com.pb.marketing.PopupWindowActivity',
+          ],
           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',

src/apps/cn.com.hkgt.gasapp.ts

@@ -7,9 +7,17 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
-      activityIds: 'cn.com.hkgt.gasapp.dialog.BannerDialog',
+      fastQuery: true,
-      rules: 'ImageView[id="cn.com.hkgt.gasapp:id/exit"][clickable=true]',
+      matchTime: 10000,
-      snapshotUrls: 'https://i.gkd.li/i/12744270',
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'cn.com.hkgt.gasapp.dialog.BannerDialog',
+          matches: 'ImageView[id="cn.com.hkgt.gasapp:id/exit"][clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/12744270',
+        },
+      ],
     },
   ],
 });

src/apps/cn.com.ruijie.magicbox.ts

@@ -11,9 +11,13 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
-        '@ImageView[id="cn.com.ruijie.magicbox:id/imageView_close"] +(2) RelativeLayout > LinearLayout > [text*="新版本"]',
+        {
+          activityIds: 'cn.com.ruijie.wifibox.activity.MainActivity',
+          matches:
+            '@ImageView[id="cn.com.ruijie.magicbox:id/imageView_close"] +(2) RelativeLayout > LinearLayout > [text*="新版本"]',
+          snapshotUrls: 'https://i.gkd.li/i/12642359',
+        },
       ],
-      snapshotUrls: 'https://i.gkd.li/i/12642359',
     },
   ],
 });

src/apps/cn.com.spdb.mobilebank.per.ts

@@ -11,8 +11,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="去开启"] + View > Image[text.length=0]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13458535',
+        {
+          activityIds: '.activity.web.stage.StageCommonWebActivity',
+          matches: '[text="去开启"] + View > Image[text.length=0]',
+          snapshotUrls: 'https://i.gkd.li/i/13458535',
+        },
+      ],
     },
   ],
 });

src/apps/cn.damai.ts

@@ -26,12 +26,15 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           activityIds: 'cn.damai.homepage.MainActivity',
-          matches:
+          matches: '[id="cn.damai:id/homepage_popup_window_close_btn"]',
-            '[id="cn.damai:id/homepage_popup_window_image"] + [id="cn.damai:id/homepage_popup_window_close_btn"]',
           snapshotUrls: 'https://i.gkd.li/i/13627900',
         },
       ],

src/apps/cn.edu.buaa.wxwork.ts

@@ -10,18 +10,18 @@ export default defineGkdApp({
       desc: '点击[确认登录]',
       matchTime: 10000,
       actionMaximum: 1,
-      activityIds: [
-        'com.tencent.wework.common.web.JsWebActivity',
-        'com.tencent.wework.launch.WwMainActivity',
-      ],
       rules: [
         {
+          activityIds: [
+            'com.tencent.wework.common.web.JsWebActivity',
+            'com.tencent.wework.launch.WwMainActivity',
+          ],
           matches: '[desc="确认登录"][clickable=true]',
+          exampleUrls: 'https://e.gkd.li/501ba684-b4a5-40e8-9e24-c61048569667',
           snapshotUrls: [
             'https://i.gkd.li/i/16784272',
             'https://i.gkd.li/i/16784259',
           ],
-          exampleUrls: 'https://e.gkd.li/501ba684-b4a5-40e8-9e24-c61048569667',
         },
       ],
     },

src/apps/cn.emagsoftware.gamehall.ts

@@ -11,9 +11,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '[id="cn.emagsoftware.gamehall:id/btn_update"] -2 [id="cn.emagsoftware.gamehall:id/btn_cancle"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13448894',
+          activityIds: 'com.migugame.home_module.ui.activity.HomeActivity',
+          matches:
+            '[id="cn.emagsoftware.gamehall:id/btn_update"] -2 [id="cn.emagsoftware.gamehall:id/btn_cancle"]',
+          snapshotUrls: 'https://i.gkd.li/i/13448894',
+        },
+      ],
     },
   ],
 });

src/apps/cn.gov.pbc.dcep.ts

@@ -8,11 +8,17 @@ export default defineGkdApp({
       key: 1,
       name: '更新提示',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[vid="upgrade_dialog_cancel"][text!="退出应用"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13840408',
+        {
-      excludeSnapshotUrls: 'https://i.gkd.li/i/17607391',
+          activityIds: '.main.activity.MainActivity',
+          matches: '[vid="upgrade_dialog_cancel"][text!="退出应用"]',
+          snapshotUrls: 'https://i.gkd.li/i/13840408',
+          excludeSnapshotUrls: 'https://i.gkd.li/i/17607391',
+        },
+      ],
     },
   ],
 });

src/apps/cn.lezhi.speedtest.ts

@@ -32,15 +32,5 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules:
-        '[id="cn.lezhi.speedtest:id/rl_update_dialog_layout"] >2 [id="cn.lezhi.speedtest:id/iv_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/12727619',
-    },
   ],
 });

src/apps/cn.net.shizheng.study.ts

@@ -7,10 +7,17 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
-      activityIds: 'cn.dingwei.cloud_classroom.MainActivity',
+      matchTime: 10000,
-      rules:
+      actionMaximum: 1,
-        'View[childCount=2] > ImageView[id=""] + Button[id=""][clickable=true]',
+      resetMatch: 'app',
-      snapshotUrls: 'https://i.gkd.li/i/12708731',
+      rules: [
+        {
+          activityIds: 'cn.dingwei.cloud_classroom.MainActivity',
+          matches:
+            'View[childCount=2] > ImageView[id=""] + Button[id=""][clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/12708731',
+        },
+      ],
     },
   ],
 });

src/apps/cn.soulapp.android.ts

@@ -26,10 +26,10 @@ export default defineGkdApp({
     {
       key: 2,
       name: '局部广告-广场页卡片广告',
-      fastQuery: true,
-      activityIds: 'cn.soulapp.android.component.startup.main.MainActivity',
       rules: [
         {
+          fastQuery: true,
+          activityIds: 'cn.soulapp.android.component.startup.main.MainActivity',
           matches:
             '[id="cn.soulapp.android:id/sl_ad_root"] >n [id="cn.soulapp.android:id/fl_tag_container"]',
           snapshotUrls: 'https://i.gkd.li/i/12838000',
@@ -39,12 +39,13 @@ export default defineGkdApp({
     {
       key: 3,
       name: '评价提示-app评分',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
+          activityIds: '.component.chat.ConversationActivity',
           matches:
             '[id="cn.soulapp.android:id/score_message"] +3 [id="cn.soulapp.android:id/cancel"]',
           snapshotUrls: 'https://i.gkd.li/i/13425057',
@@ -59,6 +60,7 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       actionMaximumKey: 0,
+      activityIds: '.component.startup.main.MainActivity',
       rules: [
         {
           key: 0,
@@ -77,10 +79,16 @@ export default defineGkdApp({
       key: 5,
       name: '权限提示-通知权限',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="消息通知显示消息内容"] +3 [vid="img_close"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/14332334',
+        {
+          activityIds: '.component.startup.main.MainActivity',
+          matches: '[text="消息通知显示消息内容"] +3 [vid="img_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/14332334',
+        },
+      ],
     },
     {
       key: 6,

src/apps/cn.speedtest.lite.ts

@@ -10,17 +10,29 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '@[id="cn.speedtest.lite:id/iv_close"] - [id="cn.speedtest.lite:id/ll_main_pane"] >2 [id="cn.speedtest.lite:id/tv_upgrade_content"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12715483',
+          activityIds: '.main.MainActivity',
+          matches:
+            '@[id="cn.speedtest.lite:id/iv_close"] - [id="cn.speedtest.lite:id/ll_main_pane"] >2 [id="cn.speedtest.lite:id/tv_upgrade_content"]',
+          snapshotUrls: 'https://i.gkd.li/i/12715483',
+        },
+      ],
     },
     {
       key: 10,
       name: '全屏广告-新人专享优惠弹窗',
-      activityIds: 'cn.speedtest.lite.main.MainActivity',
+      matchTime: 10000,
-      rules:
+      actionMaximum: 1,
-        '@[id="cn.speedtest.lite:id/iv_close"] - RelativeLayout >n [id="cn.speedtest.lite:id/ad_banner"]',
+      resetMatch: 'app',
-      snapshotUrls: 'https://i.gkd.li/i/12715511',
+      rules: [
+        {
+          activityIds: 'cn.speedtest.lite.main.MainActivity',
+          matches:
+            '@[id="cn.speedtest.lite:id/iv_close"] - RelativeLayout >n [id="cn.speedtest.lite:id/ad_banner"]',
+          snapshotUrls: 'https://i.gkd.li/i/12715511',
+        },
+      ],
     },
   ],
 });

src/apps/cn.wps.moffice_eng.ts

@@ -36,15 +36,19 @@ export default defineGkdApp({
     {
       key: 2,
       name: '全屏广告-弹窗广告',
-      fastQuery: true,
+      rules: [
-      activityIds: [
+        {
-        'cn.wps.moffice.main.AfterLoginActivity',
+          fastQuery: true,
-        'com.android.packageinstaller.permission.ui.GrantPermissionsActivity',
+          activityIds: [
-      ],
+            'cn.wps.moffice.main.AfterLoginActivity',
-      rules: '[id="cn.wps.moffice_eng:id/afterlogin_cancel"]',
+            'com.android.packageinstaller.permission.ui.GrantPermissionsActivity',
-      snapshotUrls: [
+          ],
-        'https://i.gkd.li/i/13259097',
+          matches: '[id="cn.wps.moffice_eng:id/afterlogin_cancel"]',
-        'https://i.gkd.li/i/12882712',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13259097',
+            'https://i.gkd.li/i/12882712',
+          ],
+        },
       ],
     },
     {
@@ -54,13 +58,17 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '[id="cn.wps.moffice_eng:id/close_new_func_guide_dialog_imageView"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12882371',
+          matches:
+            '[id="cn.wps.moffice_eng:id/close_new_func_guide_dialog_imageView"]',
+          snapshotUrls: 'https://i.gkd.li/i/12882371',
+        },
+      ],
     },
     {
       key: 4,
-      name: '功能类-开启WPS云服务',
+      name: '功能类-关闭[开启WPS云服务]弹窗',
       desc: '自动点击不开启',
       fastQuery: true,
       activityIds: [
@@ -70,6 +78,7 @@ export default defineGkdApp({
       ],
       rules: [
         {
+          key: 1,
           matches:
             '[id="cn.wps.moffice_eng:id/cloud_protocol_dialog_not_start_btn"]',
           snapshotUrls: [
@@ -79,6 +88,7 @@ export default defineGkdApp({
           ],
         },
         {
+          key: 2,
           matches: '[id="cn.wps.moffice_eng:id/dialog_button_positive"]',
           snapshotUrls: 'https://i.gkd.li/i/12882554',
         },
@@ -97,7 +107,7 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/13513911',
         },
         {
-          preKeys: 1,
+          preKeys: [1],
           key: 2,
           matches: '[text="关闭当前广告"]',
           snapshotUrls: 'https://i.gkd.li/i/13513914',
@@ -107,29 +117,28 @@ export default defineGkdApp({
     {
       key: 6,
       name: '局部广告-首页底部广告',
-      fastQuery: true,
-      activityIds: 'cn.wps.moffice.main.local.HomeRootActivity',
-      rules: '[id="cn.wps.moffice_eng:id/home_banner_ad_spread_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/13804525',
-    },
-    {
-      key: 7,
-      fastQuery: true,
-      name: '局部广告-首页底部升级会员卡片',
       rules: [
         {
+          key: 1,
+          fastQuery: true,
+          matchTime: 10000,
           activityIds: 'cn.wps.moffice.main.local.HomeRootActivity',
-          matches: '[id="cn.wps.moffice_eng:id/phone_message_close_button"]',
+          matches:
-          snapshotUrls: 'https://i.gkd.li/i/13945839',
+            '[id="cn.wps.moffice_eng:id/home_banner_ad_spread_close" || vid="phone_message_close_button" || vid="close_home_ad_banner_iv"][visibleToUser=true]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13804525',
+            'https://i.gkd.li/i/17893252',
+            'https://i.gkd.li/i/18047731',
+          ],
         },
       ],
     },
     {
       key: 8,
       name: '全屏广告-体验超级会员弹窗',
-      fastQuery: true,
       rules: [
         {
+          fastQuery: true,
           activityIds: 'cn.wps.moffice.main.local.HomeRootActivity',
           matches:
             'View[childCount=3] > Image[text!=null] +2 @TextView[clickable=true] <<n [vid="push_tips_ptr_super_webview"]',

src/apps/cn.wps.yun.ts

@@ -16,10 +16,8 @@ export default defineGkdApp({
             '[id="cn.wps.yun:id/rootGroup"][childCount=5] >  [text^="实用技巧"] +3 [id="cn.wps.yun:id/moreIconRight"]',
           exampleUrls:
             'https://m.gkd.li/47232102/bc97cb52-aad0-4114-a548-5831edbe342d',
-          snapshotUrls: [
+          snapshotUrls: 'https://i.gkd.li/i/13495062',
-            'https://i.gkd.li/i/13495062',
+          excludeSnapshotUrls: 'https://i.gkd.li/i/14333322', // 限定 [text^="实用技巧"] 防止误触C
-            'https://i.gkd.li/i/14333322', // 限定 [text^="实用技巧"] 防止误触
-          ],
         },
       ],
     },

src/apps/cn.wsds.gamemaster.ts

@@ -33,7 +33,7 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/13930398',
         },
         {
-          preKeys: 0,
+          preKeys: [0],
           activityIds: 'cn.wsds.gamemaster.ui.gamedetails.ActivityGameDetails',
           matches: '[text="不感兴趣"]',
           snapshotUrls: 'https://i.gkd.li/i/13930399',

src/apps/cn.xiaochuankeji.tieba.ts

@@ -50,6 +50,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.ui.home.setting.SettingActivity',
           matches:
             '[id="cn.xiaochuankeji.tieba:id/btn_ok"][text^="马上升级"] + [id="cn.xiaochuankeji.tieba:id/btn_cancel"][text="取消"]',
           snapshotUrls: 'https://i.gkd.li/i/12660882',
@@ -84,19 +85,21 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      activityIds: '.ui.home.page.PageMainActivity',
       rules: [
         {
+          key: 1,
           matches:
             '[id="cn.xiaochuankeji.tieba:id/confirm"][text="打开通知"] + [id="cn.xiaochuankeji.tieba:id/cancel"][text="暂不开启"]',
           snapshotUrls: 'https://i.gkd.li/i/12660823',
         },
         {
+          key: 2,
           matches:
             '[text^="开启通知"] +(2) [id="cn.xiaochuankeji.tieba:id/tips_close"]',
           snapshotUrls: 'https://i.gkd.li/i/12660851',
         },
       ],
     },
-    // key 11 已弃用
   ],
 });

src/apps/cn.xiaochuankeji.zuiyouLite.ts

@@ -51,13 +51,13 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          name: '点击"x"',
+          name: '点击关闭',
           matches: '[id="cn.xiaochuankeji.zuiyouLite:id/ad_remove"]',
           snapshotUrls: 'https://i.gkd.li/i/13387116',
         },
         {
-          preKeys: 0,
+          preKeys: [0],
-          name: '点击"不喜欢广告主"',
+          name: '点击[不喜欢广告主]',
           matches: '@LinearLayout[clickable=true] > [text="不喜欢广告主"]',
           snapshotUrls: 'https://i.gkd.li/i/13387155',
         },

src/apps/dxwt.questionnaire.ui.ts

@@ -16,10 +16,8 @@ export default defineGkdApp({
         {
           matches:
             '@View[desc^="关闭"][visibleToUser=true] <3 FrameLayout < FrameLayout < FrameLayout < [id="dxwt.questionnaire.ui:id/container"]',
-          snapshotUrls: [
+          snapshotUrls: 'https://i.gkd.li/i/13255491',
-            'https://i.gkd.li/i/13255491',
+          excludeSnapshotUrls: 'https://i.gkd.li/i/13259475', // 限制 visibleToUser=true 防止按钮未出现就触发规则
-            'https://i.gkd.li/i/13259475', // 限制 visibleToUser=true 防止按钮未出现就触发规则
-          ],
         },
       ],
     },

src/apps/fm.qingting.qtradio.ts

@@ -7,14 +7,23 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-播放界面的广告',
-      activityIds: ['fm.qingting.qtradio.QTRadioActivity'],
+      fastQuery: true,
       rules: [
-        '[id="fm.qingting.qtradio:id/view_ad_close"]',
+        {
-        '@[id="fm.qingting.qtradio:id/iv_close"] + RelativeLayout > LinearLayout > TextView[text="广告"]',
+          key: 1,
-      ],
+          activityIds: '.QTRadioActivity',
-      snapshotUrls: [
+          matches: '[id="fm.qingting.qtradio:id/view_ad_close"]',
-        'https://i.gkd.li/i/12640438',
+          exampleUrls: 'https://e.gkd.li/bef1954c-a0c8-441e-ab77-6967089e906c',
-        'https://i.gkd.li/i/12640981',
+          snapshotUrls: 'https://i.gkd.li/i/12640438',
+        },
+        {
+          key: 2,
+          activityIds: '.QTRadioActivity',
+          matches:
+            '@[id="fm.qingting.qtradio:id/iv_close"] + RelativeLayout >2 [text="广告"]',
+          exampleUrls: 'https://e.gkd.li/1562b618-074d-4f10-a1ae-c62c5390fd1a',
+          snapshotUrls: 'https://i.gkd.li/i/12640981',
+        },
       ],
     },
   ],

src/apps/gov.pianzong.androidnga.ts

@@ -29,9 +29,13 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-首页-推荐-卡片广告',
-      activityIds: 'com.donews.nga.activitys.MainActivity',
+      rules: [
-      rules: ['[id="gov.pianzong.androidnga:id/iv_close_ad"]'],
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12482727',
+          activityIds: 'com.donews.nga.activitys.MainActivity',
+          matches: '[id="gov.pianzong.androidnga:id/iv_close_ad"]',
+          snapshotUrls: 'https://i.gkd.li/i/12482727',
+        },
+      ],
     },
     {
       key: 2,
@@ -41,37 +45,46 @@ export default defineGkdApp({
         'gov.pianzong.androidnga.activity.forumdetail.ForumDetailActivity',
       rules: [
         {
+          key: 1,
           matches: 'Image[text="ams_icon_single_close"]',
-          snapshotUrls: ['https://i.gkd.li/i/12655805'],
+          snapshotUrls: 'https://i.gkd.li/i/12655805',
         },
         {
+          key: 2,
           matches:
             'TextView[text!=null] - ImageView < LinearLayout[childCount=2] + FrameLayout[childCount=1] > ImageView[id=null]',
-          snapshotUrls: ['https://i.gkd.li/i/12706140'],
+          snapshotUrls: 'https://i.gkd.li/i/12706140',
         },
         {
+          key: 3,
           matches:
             '[text="广告"] - [id="gov.pianzong.androidnga:id/iv_information_ad_close"]',
-          snapshotUrls: ['https://i.gkd.li/i/13303236'],
+          snapshotUrls: 'https://i.gkd.li/i/13303236',
         },
       ],
     },
     {
       key: 3,
       name: '局部广告-社区-顶部广告',
-      activityIds: 'com.donews.nga.activitys.MainActivity',
+      rules: [
-      rules: '[id="gov.pianzong.androidnga:id/iv_close_community_ad"]',
+        {
-      snapshotUrls: ['https://i.gkd.li/i/12706132'],
+          activityIds: 'com.donews.nga.activitys.MainActivity',
+          matches: '[id="gov.pianzong.androidnga:id/iv_close_community_ad"]',
+          snapshotUrls: ['https://i.gkd.li/i/12706132'],
+        },
+      ],
     },
     {
       key: 4,
       name: '全屏广告-弹窗广告',
-      desc: '点击X',
+      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           fastQuery: true,
-          activityIds: 'com.hihonor.android.launcher.unihome.UniHomeLauncher',
+          matches: '[vid="iv_homedialog_close"]',
-          matches: '[id="gov.pianzong.androidnga:id/iv_homedialog_close"]',
           exampleUrls:
             'https://m.gkd.li/57941037/346f4485-82a7-4cf3-aab3-1fe6c9bb23af',
           snapshotUrls: 'https://i.gkd.li/i/14126934',

src/apps/info.muge.appshare.ts

@@ -86,7 +86,7 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/13931265',
         },
         {
-          preKeys: 0,
+          preKeys: [0],
           activityIds: 'info.muge.appshare.view.main.MainActivity',
           matches: '[id="info.muge.appshare:id/tvClose"][text="确定"]',
           snapshotUrls: 'https://i.gkd.li/i/13931279',
@@ -178,9 +178,10 @@ export default defineGkdApp({
       key: 5,
       name: '通知提示-公告弹窗',
       desc: '点击[收到]',
+      fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
           activityIds: 'info.muge.appshare.view.main.MainActivity',

src/apps/io.iftech.android.box.ts

@@ -11,21 +11,11 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules:
-        '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/14204126',
-    },
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
       rules: [
         {
-          activityIds: '.main.HomeActivity',
+          matches:
-          matches: '[text*="新版本"] +2 [text="取消"]',
+            '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/12706195',
+          snapshotUrls: 'https://i.gkd.li/i/14204126',
         },
       ],
     },
@@ -73,10 +63,17 @@ export default defineGkdApp({
     {
       key: 10,
       name: '全屏广告-会员限时优惠弹窗',
-      activityIds: 'io.iftech.android.box.main.HomeActivity',
+      matchTime: 10000,
-      rules:
+      actionMaximum: 1,
-        '@[id="io.iftech.android.box:id/ivClose"] + [text^="限时"][text$="特惠"]',
+      resetMatch: 'app',
-      snapshotUrls: 'https://i.gkd.li/i/12706226',
+      rules: [
+        {
+          activityIds: 'io.iftech.android.box.main.HomeActivity',
+          matches:
+            '@[id="io.iftech.android.box:id/ivClose"] + [text^="限时"][text$="特惠"]',
+          snapshotUrls: 'https://i.gkd.li/i/12706226',
+        },
+      ],
     },
   ],
 });

src/apps/io.microshow.fm.ts

@@ -8,6 +8,9 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           fastQuery: true,

src/apps/ltd.sky.okay.cn.ts

@@ -7,6 +7,9 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,

src/apps/me.chunyu.ChunyuDoctor.ts

@@ -13,6 +13,10 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: [
+            '.Activities.MainActivity',
+            '.Activities.WelcomeActivity',
+          ],
           matches:
             '[text="给应用评分"] +(2) RelativeLayout > [text="下次再说"]',
           snapshotUrls: [

src/apps/me.ele.ts

@@ -11,11 +11,15 @@ export default defineGkdApp({
       // matchTime: 10000, 部分更新提示不在10s内
       actionMaximum: 1,
       resetMatch: 'app',
-      // matchDelay: 3000, 想不起来为啥加的了，先删掉
+      rules: [
-      rules: ['[text*="更新应用版本"]', '[text="取消"]'],
+        {
-      snapshotUrls: [
+          activityIds: 'com.afollestad.materialdialogs.MaterialDialog',
-        'https://i.gkd.li/i/12650280',
+          matches: ['[text*="更新应用版本"]', '[text="取消"]'],
-        'https://i.gkd.li/i/13206819',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12650280',
+            'https://i.gkd.li/i/13206819',
+          ],
+        },
       ],
     },
     {
@@ -125,18 +129,28 @@ export default defineGkdApp({
     {
       key: 5,
       name: '全屏广告-付款后弹窗广告',
-      fastQuery: true,
+      rules: [
-      activityIds: 'me.ele.component.pops2.TransparentAppWebActivity',
+        {
-      rules: 'bb Button[text="关闭"]',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/13205301',
+          activityIds: 'me.ele.component.pops2.TransparentAppWebActivity',
+          matches:
+            'View[childCount=2] > View[childCount=2] > @Button[text="关闭"][clickable=true] <<n [id="me.ele:id/inside_web_view"]',
+          snapshotUrls: 'https://i.gkd.li/i/13205301',
+        },
+      ],
     },
     {
       key: 6,
       name: '全屏广告-吃货卡续费弹窗',
-      fastQuery: true,
+      rules: [
-      activityIds: 'me.ele.component.webcontainer.view.AppUCWebActivity',
+        {
-      rules: '@View + View >2 [text="买校园版超级吃货卡"]',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/13295007',
+          activityIds: 'me.ele.component.webcontainer.view.AppUCWebActivity',
+          matches:
+            '@View[clickable=true] + View >2 [visibleToUser=true][text*="立即续费"] <<n [id="me.ele:id/inside_web_view"]',
+          snapshotUrls: 'https://i.gkd.li/i/13295007',
+        },
+      ],
     },
     {
       key: 7,
@@ -148,10 +162,8 @@ export default defineGkdApp({
           activityIds: 'me.ele.application.ui.Launcher.LauncherActivity',
           matches:
             '@ViewGroup[childCount=0][clickable=true][visibleToUser=true] - ViewGroup[childCount=3] <<n [id="me.ele:id/id_magex_mist_view"]',
-          snapshotUrls: [
+          snapshotUrls: 'https://i.gkd.li/i/13710588',
-            'https://i.gkd.li/i/13710588',
+          excludeSnapshotUrls: 'https://i.gkd.li/i/16326917',
-            'https://i.gkd.li/i/16326917', // 防止误触
-          ],
         },
         {
           key: 1,
@@ -187,14 +199,15 @@ export default defineGkdApp({
     },
     {
       key: 9,
-      fastQuery: true,
       name: '通知提示-获取订单信息通知',
       desc: '点击关闭',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.message.ui.PushMessageGuideActivity',
           matches:
             '@View[visibleToUser=true] < * <2 [id="me.ele:id/frame_bottom_bg"]',
           snapshotUrls: 'https://i.gkd.li/i/13931205',

src/apps/mikuclub.app.ts

@@ -8,9 +8,9 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-谷歌广告',
       desc: '点击关闭',
-      forcedTime: 10000,
       rules: [
         {
+          forcedTime: 10000,
           activityIds: 'com.google.android.gms.ads.AdActivity',
           matches: '[text^="关闭广告"] + View >2 Image[text=""]',
           exampleUrls:

src/apps/net.csdn.csdnplus.ts

@@ -39,6 +39,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: ['.activity.MainActivity', '.activity.SetActivity'],
           matches:
             '[id="net.csdn.csdnplus:id/update"] -2 [id="net.csdn.csdnplus:id/cancel"]',
           snapshotUrls: [
@@ -52,7 +53,7 @@ export default defineGkdApp({
       key: 2,
       name: '分段广告-信息流广告',
       fastQuery: true,
-      activityIds: ['net.csdn.csdnplus.activity.MainActivity'],
+      activityIds: 'net.csdn.csdnplus.activity.MainActivity',
       rules: [
         {
           key: 1,
@@ -63,7 +64,7 @@ export default defineGkdApp({
           ],
         },
         {
-          preKeys: 1,
+          preKeys: [1],
           key: 2,
           matches:
             '@[clickable=true] > [id="net.csdn.csdnplus:id/img_feedback_title"][text="重复推荐该广告"]',
@@ -77,12 +78,17 @@ export default defineGkdApp({
     {
       key: 3,
       name: '评价提示-软件好评弹窗',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[id="net.csdn.csdnplus:id/tv_cancel"][text="残忍拒绝"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13251085',
+          activityIds: '.activity.MainActivity',
+          matches: '[id="net.csdn.csdnplus:id/tv_cancel"][text="残忍拒绝"]',
+          snapshotUrls: 'https://i.gkd.li/i/13251085',
+        },
+      ],
     },
     {
       key: 10,
@@ -91,33 +97,36 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: {
+      rules: [
-        matches: [
+        {
-          '[text="开启推送通知"]',
+          activityIds: '.activity.MainActivity',
-          '[id="net.csdn.csdnplus:id/iv_close"]',
+          matches: [
-        ],
+            '[text="开启推送通知"]',
-        snapshotUrls: ['https://i.gkd.li/i/12673638'],
+            '[id="net.csdn.csdnplus:id/iv_close"]',
-      },
+          ],
+          snapshotUrls: 'https://i.gkd.li/i/12673638',
+        },
+      ],
     },
     {
       key: 11,
       name: '分段广告-底部广告',
-      desc: '点击X-点击不感兴趣',
+      desc: '点击关闭-点击不感兴趣',
+      fastQuery: true,
       rules: [
         {
           key: 0,
           activityIds: 'net.csdn.csdnplus.mvvm.ui.activity.BlogDetailActivity',
           matches:
-            '[vid$="_container"] > FrameLayout[childCount=3] >(2,3) ViewGroup[childCount=2] >2 ViewGroup[childCount=2] > ImageView[visibleToUser=true]',
+            'ViewGroup > ViewGroup[childCount=2] > @ImageView[index=1][clickable=true][childCount=0][visibleToUser=true] <<n [vid="fl_template_container" || vid="fl_bottom_ad_container"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13830821',
             'https://i.gkd.li/i/14312501',
           ],
         },
         {
-          preKeys: 0,
+          preKeys: [0],
           key: 1,
-          fastQuery: true,
           activityIds: 'net.csdn.csdnplus.mvvm.ui.activity.BlogDetailActivity',
           matches: '@LinearLayout[clickable=true] > [text="不感兴趣"]',
           snapshotUrls: [

src/apps/npgl.jsitcx.xlpqi.ts

@@ -38,7 +38,8 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          matches: '@Image < View + View >2 Image',
+          matches:
+            '@Image[childCount=0][visibleToUser=true][width<80 && height<80] < View[childCount=1] +n View[childCount=2] >(2,3) [text="广告"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12799977',
             'https://i.gkd.li/i/12800107',
@@ -46,11 +47,10 @@ export default defineGkdApp({
         },
         {
           key: 1,
-          matches: 'Image < View < View +n View > Image[visibleToUser=true]',
+          matches:
-          snapshotUrls: [
+            '@Image[childCount=0][visibleToUser=true][width<80 && height<80] < View[childCount=1] -3 View >2 [text="广告"]',
-            'https://i.gkd.li/i/12800034',
+          snapshotUrls: 'https://i.gkd.li/i/12800034',
-            'https://i.gkd.li/i/12800162', // 限定 Image[visibleToUser=true]，防止点击不可见节点
+          excludeSnapshotUrls: 'https://i.gkd.li/i/12800162', // 限定 Image[visibleToUser=true]，防止点击不可见节点
-          ],
         },
         {
           preKeys: [0, 1],

src/apps/org.gushiwen.gushiwen.ts

@@ -9,22 +9,8 @@ export default defineGkdApp({
       name: '分段广告-弹窗广告',
       rules: [
         {
-          actionDelay: 500,
-          key: 0,
-          activityIds: 'org.gushiwen.gushiwen.HomeActivity',
-          matches:
-            '@[width>1 && width<65] < FrameLayout - [name="android.widget.ImageView"||name="android.widget.FrameLayout"||name="android.widget.LinearLayout"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/12813618',
-            'https://i.gkd.li/i/12903835',
-            'https://i.gkd.li/i/12903885',
-            'https://i.gkd.li/i/12876077',
-            'https://i.gkd.li/i/13059294',
-          ],
-        },
-        {
-          actionDelay: 500,
           key: 1,
+          actionDelay: 500,
           activityIds: [
             'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
           ],
@@ -39,15 +25,49 @@ export default defineGkdApp({
           ],
         },
         {
-          actionDelay: 500,
           key: 2,
+          actionDelay: 500,
           activityIds: 'org.gushiwen.gushiwen.HomeActivity',
           matches:
             '@FrameLayout  +2 FrameLayout > LinearLayout > LinearLayout > [text^="摇动"]',
           snapshotUrls: ['https://i.gkd.li/i/13266879'],
         },
         {
-          preKeys: [0, 1, 2],
+          key: 3,
+          actionDelay: 500,
+          fastQuery: true,
+          activityIds: '.HomeActivity',
+          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][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]',
+          exampleUrls: 'https://e.gkd.li/71e9b352-e2a9-427e-bcbb-71510ed066b2',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12813618',
+            'https://i.gkd.li/i/18047950',
+          ],
+        },
+        {
+          key: 4,
+          actionDelay: 500,
+          fastQuery: true,
+          activityIds: '.HomeActivity',
+          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="查看详情"]',
+          exampleUrls: 'https://e.gkd.li/f6d34c18-e426-48dd-8030-4471cded8208',
+          snapshotUrls: 'https://i.gkd.li/i/18047949',
+        },
+        {
+          key: 5,
+          actionDelay: 500,
+          fastQuery: true,
+          activityIds:
+            'com.huawei.permissioncontroller.hwcust.appjump.AppJumpActivity',
+          matches:
+            '@ImageView[childCount=0][text=null][visibleToUser=true] < FrameLayout[childCount=1] <2 FrameLayout[childCount=2] <2 FrameLayout[childCount=2] <2 FrameLayout[childCount=2] - FrameLayout > [text^="扭动或点击"]',
+          exampleUrls: 'https://e.gkd.li/012f64ec-b3ed-4472-8d07-8ed3b4ad6c07',
+          snapshotUrls: 'https://i.gkd.li/i/13059294',
+        },
+        {
+          preKeys: [1, 2, 3, 4, 5],
           key: 10,
           name: '打赏页面-点击返回按钮',
           activityIds: [
@@ -61,7 +81,7 @@ export default defineGkdApp({
           ],
         },
         {
-          preKeys: [0, 1, 2],
+          preKeys: [1, 2, 3, 4, 5],
           key: 11,
           name: '荣誉会员-点击返回按钮',
           activityIds: [

src/apps/org.zwanoo.android.speedtest.ts

@@ -10,8 +10,8 @@ export default defineGkdApp({
       rules: [
         {
           key: 1,
-          activityIds: 'com.ookla.mobile4.screens.main.MainViewActivity',
           fastQuery: true,
+          activityIds: 'com.ookla.mobile4.screens.main.MainViewActivity',
           matches:
             '[id="org.zwanoo.android.speedtest:id/suite_completed_close_ad_button"]',
           snapshotUrls: 'https://i.gkd.li/i/12893175',

src/apps/so.tita.ts

@@ -1,98 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'so.tita',
-  name: 'tita搜索',
-  groups: [
-    {
-      key: 1,
-      name: '全屏广告-弹窗广告',
-      rules: [
-        {
-          key: 0,
-          activityIds: 'so.tita.view.activity.HomeActivity',
-          matches:
-            '[id="so.tita:id/flyt_banner"] >n FrameLayout > FrameLayout +n FrameLayout > ImageView',
-          snapshotUrls: 'https://i.gkd.li/i/12800404',
-        },
-        {
-          key: 1,
-          activityIds: [
-            'so.tita.view.activity.HomeActivity',
-            'so.tita.view.activity.EpisodeActivity',
-            'so.tita.view.activity.SearchActivity',
-          ],
-          matches: [
-            '[id="so.tita:id/flyt_native"] >n LinearLayout > FrameLayout + LinearLayout + FrameLayout[visibleToUser=true]',
-            '[id="so.tita:id/flyt_native"] >n FrameLayout > ImageView +n FrameLayout > ImageView[visibleToUser=true]',
-          ],
-          actionDelay: 1000,
-          snapshotUrls: [
-            'https://i.gkd.li/i/12800504', // so.tita.view.activity.HomeActivity
-            'https://i.gkd.li/i/12800437', // so.tita.view.activity.EpisodeActivity
-            'https://i.gkd.li/i/12800682', // so.tita.view.activity.SearchActivity
-            'https://i.gkd.li/i/12800590', // 限定 ImageView[visibleToUser=true]，防止在节点不可见时触发规则
-            'https://i.gkd.li/i/12800794', // 限定 FrameLayout[visibleToUser=true]，防止广告仅部分可见时触发 clickCenter 事件，误触其他节点
-            'https://i.gkd.li/i/12800914', // 延迟 1000 毫秒触发规则，防止界面切换过程中触发 clickCenter 事件点击到广告区域
-          ],
-        },
-        {
-          key: 2,
-          activityIds: [
-            'so.tita.view.activity.WebVersionActivity',
-            'so.tita.view.activity.RankListActivity',
-            'so.tita.view.activity.CollectActivity',
-            'so.tita.view.activity.HistoryActivity',
-            'so.tita.view.activity.AllDownParentActivity',
-            'so.tita.view.activity.EpisodeActivity',
-            'so.tita.view.activity.KSYPlayerActivity',
-          ],
-          matches: '@ImageView < FrameLayout + ImageView',
-          snapshotUrls: [
-            'https://i.gkd.li/i/12800486', // so.tita.view.activity.WebVersionActivity
-            'https://i.gkd.li/i/12800559', // so.tita.view.activity.RankListActivity
-            'https://i.gkd.li/i/12800633', // so.tita.view.activity.CollectActivity
-            'https://i.gkd.li/i/12800655', // so.tita.view.activity.HistoryActivity
-            'https://i.gkd.li/i/12800673', // so.tita.view.activity.AllDownParentActivity
-            'https://i.gkd.li/i/12800732', // so.tita.view.activity.EpisodeActivity
-            'https://i.gkd.li/i/12800739', // so.tita.view.activity.KSYPlayerActivity
-          ],
-        },
-        {
-          key: 3,
-          activityIds: [
-            'so.tita.view.activity.RankListActivity',
-            'so.tita.utils.cast.ui.CastPlayActivity',
-          ],
-          matches: 'ImageView - FrameLayout > FrameLayout > ImageView',
-          snapshotUrls: [
-            'https://i.gkd.li/i/12800543', // so.tita.view.activity.RankListActivity
-            'https://i.gkd.li/i/12800571', // so.tita.utils.cast.ui.CastPlayActivity
-          ],
-        },
-        {
-          key: 4,
-          activityIds: [
-            'so.tita.view.activity.CollectActivity',
-            'so.tita.view.activity.HistoryActivity',
-            'so.tita.view.activity.AllDownParentActivity',
-          ],
-          matches:
-            'ImageView - FrameLayout > FrameLayout > FrameLayout > ImageView',
-          snapshotUrls: [
-            'https://i.gkd.li/i/12800616', // so.tita.view.activity.CollectActivity
-            'https://i.gkd.li/i/12800642', // so.tita.view.activity.HistoryActivity
-            'https://i.gkd.li/i/12800659', // so.tita.view.activity.AllDownParentActivity
-          ],
-        },
-      ],
-    },
-    {
-      key: 10,
-      name: '其他-观看视频去除广告提示弹窗',
-      activityIds: 'so.tita.view.activity.HomeActivity',
-      rules: '@[text="取 消"] + View + [text="确 定"]',
-      snapshotUrls: 'https://i.gkd.li/i/12800350',
-    },
-  ],
-});

src/apps/tool.seagull.v.ts

@@ -29,10 +29,8 @@ export default defineGkdApp({
             'io.github.trojan_gfw.igniter.MainActivity',
             'com.google.android.gms.ads.AdActivity',
           ],
-          matches: [
+          matches:
-            '[id="mys-wrapper"] + View >n Image',
+            '[desc="OPEN" || desc="開啟"] - @View[clickable=true][visibleToUser=true] > [text="关闭"]',
-            '@View[clickable=true] > [text="关闭"]',
-          ],
           snapshotUrls: [
             'https://i.gkd.li/i/13426255',
             'https://i.gkd.li/i/13459399',
@@ -42,10 +40,8 @@ export default defineGkdApp({
           key: 1,
           name: '谷歌广告-2',
           activityIds: 'com.google.android.gms.ads.AdActivity',
-          matches: [
+          matches:
-            '[id="mys-wrapper"] + View >n Image',
+            '@Button[clickable=true][childCount=0] < View[childCount=1] <2 View[childCount=2] - View >3 [desc="開啟"]',
-            '[id="mys-wrapper"] >n View > View > Button',
-          ],
           snapshotUrls: 'https://i.gkd.li/i/13476799',
         },
         {

src/apps/tv.danmaku.bili.ts

@@ -26,16 +26,20 @@ export default defineGkdApp({
     {
       key: 0,
       name: '局部广告-评论区顶部公告横幅',
-      fastQuery: true,
+      rules: [
-      excludeActivityIds: [
+        {
-        'com.bilibili.bililive.room.ui.roomv3.LiveRoomActivityV3', // 直播间
+          fastQuery: true,
-        'tv.danmaku.bili.MainActivityV2', // 主页
+          excludeActivityIds: [
-      ],
+            'com.bilibili.bililive.room.ui.roomv3.LiveRoomActivityV3',
-      rules:
+            'tv.danmaku.bili.MainActivityV2',
-        'LinearLayout[id="tv.danmaku.bili:id/ad_tint_frame"] > ImageView[id="tv.danmaku.bili:id/close"][desc="关闭"]',
+          ],
-      snapshotUrls: [
+          matches:
-        'https://i.gkd.li/i/12785461',
+            'LinearLayout[id="tv.danmaku.bili:id/ad_tint_frame"] > ImageView[id="tv.danmaku.bili:id/close"][desc="关闭"]',
-        'https://i.gkd.li/i/12775156',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12785461',
+            'https://i.gkd.li/i/12775156',
+          ],
+        },
       ],
     },
     {
@@ -58,7 +62,6 @@ export default defineGkdApp({
         },
       ],
     },
-    // key = 3已弃用
     {
       key: 4,
       name: '分段广告-视频底部与评论区中间卡片广告',
@@ -76,20 +79,20 @@ export default defineGkdApp({
           matches:
             'FrameLayout[id="tv.danmaku.bili:id/ad_tint_frame"] >n [id^="tv.danmaku.bili:id/more"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/12642260', // n = 2
+            'https://i.gkd.li/i/12642260',
-            'https://i.gkd.li/i/12705266', // n = 3
+            'https://i.gkd.li/i/12705266',
-            'https://i.gkd.li/i/12776568', // id="tv.danmaku.bili:id/more_layout"
+            'https://i.gkd.li/i/12776568',
-            'https://i.gkd.li/i/12707070', // 由于 activityId 切换延迟导致规则仍然运行, 使用 FrameLayout 避免误触
           ],
+          excludeSnapshotUrls: 'https://i.gkd.li/i/12707070', // 由于 activityId 切换延迟导致规则仍然运行, 使用 FrameLayout 避免误触
         },
         {
-          preKeys: 0,
+          preKeys: [0],
           key: 1,
           name: '点击屏蔽广告',
           matches:
             '[id="tv.danmaku.bili:id/dislike_reasons"] @RelativeLayout > [text*="不感兴趣"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/12642261', // 屏蔽广告菜单弹窗
+            'https://i.gkd.li/i/12642261',
             'https://i.gkd.li/i/13495649',
           ],
         },
@@ -100,16 +103,29 @@ export default defineGkdApp({
       name: '更新提示',
       fastQuery: true,
       actionMaximum: 1,
-      matchDelay: 5000,
+      resetMatch: 'app',
+      activityIds: [
+        'com.bilibili.app.preferences.BiliPreferencesActivity',
+        'tv.danmaku.bili.ui.splash.ad.page.HotSplashActivity',
+        '.MainActivityV2',
+      ],
       rules: [
         {
           key: 1,
+          matches: '[text="忽略此版本的更新"][checked=false]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12649689',
+            'https://i.gkd.li/i/13212209',
+            'https://i.gkd.li/i/13228977',
+          ],
+        },
+        {
+          preKeys: [1],
           matches: '[id="tv.danmaku.bili:id/update_btn_cancel"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/12649689', // com.bilibili.app.preferences.BiliPreferencesActivity
+            'https://i.gkd.li/i/12649689',
-            'https://i.gkd.li/i/13212209', // tv.danmaku.bili.ui.splash.ad.page.HotSplashActivity
+            'https://i.gkd.li/i/13212209',
             'https://i.gkd.li/i/13228977',
-            'https://i.gkd.li/i/13334963',
           ],
         },
       ],
@@ -121,18 +137,20 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      activityIds: [
+      rules: [
-        'com.bilibili.ship.theseus.detail.UnitedBizDetailsActivity',
+        {
-        'com.bilibili.video.videodetail.VideoDetailsActivity',
+          activityIds: [
+            'com.bilibili.ship.theseus.detail.UnitedBizDetailsActivity',
+            'com.bilibili.video.videodetail.VideoDetailsActivity',
+          ],
+          matches: '[id="tv.danmaku.bili:id/toast_x"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12892611',
+            'https://i.gkd.li/i/13308344',
+            'https://i.gkd.li/i/13538048',
+          ],
+        },
       ],
-      rules: '[id="tv.danmaku.bili:id/toast_x"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/12892611',
-        'https://i.gkd.li/i/13308344',
-        'https://i.gkd.li/i/13538048', // activityIds: 'com.bilibili.video.videodetail.VideoDetailsActivity',
-      ],
-      exampleUrls:
-        'https://github.com/gkd-kit/inspect/assets/38517192/110db806-3f8b-4cd2-a445-06c5f5eb21eb',
     },
     {
       key: 8,
@@ -167,10 +185,18 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text$="通知"] +2 * > [id="tv.danmaku.bili:id/close"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/13229159',
+          activityIds: [
-        'https://i.gkd.li/i/13614090',
+            '.MainActivityV2',
+            'com.bilibili.video.story.StoryTransparentActivity',
+          ],
+          matches: '[text$="通知"] +2 * > [id="tv.danmaku.bili:id/close"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13229159',
+            'https://i.gkd.li/i/13614090',
+          ],
+        },
       ],
     },
     {
@@ -224,10 +250,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'tv.danmaku.bili.MainActivityV2',
+      rules: [
-      rules:
+        {
-        '[text="开启个性化内容推荐"] +3 [id="tv.danmaku.bili:id/close_button"]',
+          activityIds: 'tv.danmaku.bili.MainActivityV2',
-      snapshotUrls: 'https://i.gkd.li/i/13448905',
+          matches:
+            '[text="开启个性化内容推荐"] +3 [id="tv.danmaku.bili:id/close_button"]',
+          snapshotUrls: 'https://i.gkd.li/i/13448905',
+        },
+      ],
     },
     {
       key: 12,

src/apps/tv.danmaku.bilibilihd.ts

@@ -12,8 +12,12 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules: '[id="tv.danmaku.bilibilihd:id/count_down"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13031261',
+        {
+          matches: '[id="tv.danmaku.bilibilihd:id/count_down"]',
+          snapshotUrls: 'https://i.gkd.li/i/13031261',
+        },
+      ],
     },
     {
       key: 2,

src/apps/youqu.android.todesk.ts

@@ -8,21 +8,21 @@ export default defineGkdApp({
       key: 1,
       name: '局部广告-卡片广告',
       desc: '关闭卡片广告',
-      fastQuery: true,
-      activityIds: [
-        'youqu.android.todesk.activity.WelcomeActivity',
-        'youqu.android.todesk.activity.MainActivity', //新增activityIds
-      ],
       rules: [
         {
           key: 0,
+          fastQuery: true,
+          activityIds: [
+            'youqu.android.todesk.activity.WelcomeActivity',
+            'youqu.android.todesk.activity.MainActivity',
+          ],
           matches:
             '[id="youqu.android.todesk:id/ivAdClose" || id="youqu.android.todesk:id/llClose"]',
           exampleUrls:
             'https://m.gkd.li/57941037/7535a849-b4a7-4dd5-a6c1-4d3def042d70',
           snapshotUrls: [
-            'https://i.gkd.li/i/14175556', // id="youqu.android.todesk:id/ivAdClose"
+            'https://i.gkd.li/i/14175556',
-            'https://i.gkd.li/i/13228546', // id="youqu.android.todesk:id/llClose"
+            'https://i.gkd.li/i/13228546',
           ],
         },
       ],

src/apps/zhongxinjiantou.szkingdom.android.newphone.ts

@@ -14,6 +14,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.szkingdom.android.phone.ZXJTUserMainActivity',
           matches:
             '[id="zhongxinjiantou.szkingdom.android.newphone:id/tv_notify_confirm_off"][text="放弃通知"]',
           exampleUrls: