perf: some rules

src/apps/com.babycloud.hanju.ts

@@ -6,18 +6,17 @@ export default defineGkdApp({
   groups: [
     {
       key: 2,
-      name: '局部广告',
+      name: '局部广告-卡片广告',
       rules: [
         {
           key: 0,
+          fastQuery: true,
           activityIds: [
             'com.babycloud.hanju.ui.activity.HanjuSeriesActivity',
             'com.babycloud.hanju.ui.activity.HanjuHomeActivity',
             'com.babycloud.hanju.search.activity.SearchActivity',
           ],
-          fastQuery: true,
+          matches: '[vid="unified_ad_close"][visibleToUser=true]',
-          matches:
-            '[id="com.babycloud.hanju:id/unified_ad_close"][visibleToUser=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/13628282',
             'https://i.gkd.li/i/13670721',
@@ -32,9 +31,10 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          fastQuery: true,
           activityIds: 'com.babycloud.hanju.ui.activity.HanjuSeriesActivity',
           matches:
-            '@RelativeLayout[childCount=1] [vid*="skip_tv" || vid*="close_iv"]',
+            '[vid="close_rl" || vid="only_skip_rl" || vid="skip_rl"][visibleToUser=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/13800123',
             'https://i.gkd.li/i/13972345',

src/apps/com.babytree.apps.pregnancy.ts

@@ -7,6 +7,7 @@ export default defineGkdApp({
     {
       key: 0,
       name: '开屏广告',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -15,14 +16,13 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          fastQuery: true,
           matches: '[text*="跳过"][text.length<10][visibleToUser=true]',
           snapshotUrls: 'https://i.gkd.li/i/12614757',
         },
         {
           key: 1,
           matches:
-            '[id="android:id/content"] >3 FrameLayout[childCount=5] > FrameLayout > RelativeLayout > View[clickable=true]',
+            '@View[childCount=0][clickable=true][visibleToUser=true] < RelativeLayout < FrameLayout + RelativeLayout >2 [text^="摇一摇"]',
           snapshotUrls: 'https://i.gkd.li/i/15566228',
         },
       ],

src/apps/com.badmintoncn.bbs.ts

@@ -7,12 +7,15 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           name: '红包弹窗',
           activityIds: 'net.duohuo.magappx.main.IndexTabActivity',
-          fastQuery: true,
           matches: '[id="com.badmintoncn.bbs:id/iv_close_ad"]',
           snapshotUrls: 'https://i.gkd.li/i/13635224',
         },

src/apps/com.baidu.BaiduMap.ts

@@ -114,20 +114,30 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: 'ImageView[id="com.baidu.BaiduMap:id/cancel_update"]',
+      rules: [
+        {
+          activityIds: 'com.baidu.baidumaps.MapsActivity',
+          matches: 'ImageView[id="com.baidu.BaiduMap:id/cancel_update"]',
           snapshotUrls: 'https://i.gkd.li/i/12909385',
         },
+      ],
+    },
     {
       key: 8,
       name: '权限提示-通知权限',
       desc: '点击关闭',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[vid="push_close"]',
+        {
+          activityIds: 'com.baidu.baidumaps.MapsActivity',
+          matches: '[vid="push_close"]',
           snapshotUrls: 'https://i.gkd.li/i/15284736',
         },
+      ],
+    },
     {
       key: 9,
       name: '功能类-通勤卡添加至桌面',

src/apps/com.baidu.baike.ts

@@ -11,8 +11,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text^="打开推送通知"] +2 [text="不允许"]',
+      rules: [
+        {
+          activityIds: '.component.push.NotificationEnableDialog',
+          matches: '[text^="打开推送通知"] +2 [text="不允许"]',
           snapshotUrls: 'https://i.gkd.li/i/12755717',
         },
       ],
+    },
+  ],
 });

src/apps/com.baidu.input.ts

@@ -29,13 +29,19 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-创作祝福弹窗',
+      desc: '点击关闭',
       fastQuery: true,
       matchTime: 10000,
       resetMatch: 'app',
       actionMaximum: 1,
-      rules: '[id="android:id/content"] >2 [vid="button_close"]',
+      rules: [
+        {
+          activityIds: '.ImeAppMainActivity',
+          matches: '[id="android:id/content"] >2 [vid="button_close"]',
           snapshotUrls: 'https://i.gkd.li/i/14179064',
         },
+      ],
+    },
     {
       key: 2,
       name: '局部广告-底部会员悬浮卡片',

src/apps/com.baidu.netdisk.samsung.ts

@@ -100,6 +100,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.baidu.netdisk.ui.MainActivity',
           matches: '[vid="view_score_style"] > [text="以后再说"]',
           exampleUrls:
             'https://m.gkd.li/57941037/167a8392-23c8-4e84-a55f-4f91e7e560d8',

src/apps/com.baidu.netdisk.ts

@@ -79,29 +79,44 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="立即更新"] -2 [text="下次再说"]', //使用ID会导致误触（例如删除确认https://i.gkd.li/i/13069049）
+      rules: [
+        {
+          activityIds: '.ui.MainActivity',
+          matches: '[text="立即更新"] -2 [text="下次再说"]', //使用ID会导致误触（例如删除确认https://i.gkd.li/i/13069049）
           snapshotUrls: 'https://i.gkd.li/i/16118181',
         },
+      ],
+    },
     {
       key: 8,
       name: '权限提示-通知权限',
-      desc: '自动点击关闭',
+      desc: '点击关闭',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: 'ImageView[id="com.baidu.netdisk:id/dialog_cancel"]', //单独使用ID会导致误触（例如删除确认https://i.gkd.li/i/13069049）
+        {
+          activityIds: '.ui.MainActivity',
+          matches: 'ImageView[id="com.baidu.netdisk:id/dialog_cancel"]', //单独使用ID会导致误触（例如删除确认https://i.gkd.li/i/13069049）
           snapshotUrls: 'https://i.gkd.li/i/12923936',
         },
+      ],
+    },
     {
       key: 9,
       name: '评价提示',
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[vid="view_score_style"] > [text="以后再说"]',
+      activityIds: '.ui.MainActivity',
+      rules: [
+        {
+          matches: '[vid="view_score_style"] > [text="以后再说"]',
           snapshotUrls: 'https://i.gkd.li/i/14317054',
         },
+      ],
+    },
     {
       key: 12,
       name: '局部广告-悬浮广告',

src/apps/com.baidu.newapp.ts

@@ -7,12 +7,13 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
+          activityIds: '.update.UpdateAlertActivity',
           matches: '[text="立即更新"] + [text="暂不升级"]',
           snapshotUrls: 'https://i.gkd.li/i/13360280',
         },

src/apps/com.baidu.searchbox.ts

@@ -8,21 +8,24 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-红包弹窗',
       desc: '点击关闭',
+      fastQuery: true,
       rules: [
         {
           activityIds: 'com.baidu.searchbox.MainActivity',
-          matches: '[text^="看视频"] -2 ImageView[index=4]',
+          matches:
+            '@View[vid="obfuscated"][clickable=true][visibleToUser=false] +3 [text="看视频，领现金"]',
           snapshotUrls: 'https://i.gkd.li/i/13806848',
         },
         {
           activityIds: 'com.baidu.searchbox.MainActivity',
           matches:
-            '[id="android:id/content"] >2 LinearLayout[childCount=2] > ImageView[index=1]',
+            '@ImageView[vid="obfuscated"][text=null][childCount=0][clickable=true][visibleToUser=true][index=1] <2 LinearLayout[childCount=2] < FrameLayout[childCount=1] < [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/13988536',
         },
         {
           activityIds: 'com.baidu.searchbox.MainActivity',
-          matches: 'ViewGroup[childCount=7] > ImageView[index=1]',
+          matches:
+            '@ImageView[vid="obfuscated"][text=null][childCount=0][clickable=true][visibleToUser=true] +4 [text^="继续看视频"]',
           snapshotUrls: 'https://i.gkd.li/i/14034223',
         },
       ],
@@ -31,19 +34,18 @@ export default defineGkdApp({
       key: 2,
       name: '更新提示',
       desc: '点击关闭',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.update.UpdateDialogActivity',
           matches:
-            '[id="android:id/content"] > RelativeLayout > [vid="obfuscated"] + [desc="关闭"]',
+            '@ImageView[desc="关闭"] <2 RelativeLayout < [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/f2712b2e-7327-4068-bcff-92646b3400bd',
-          snapshotUrls: [
+          snapshotUrls: 'https://i.gkd.li/i/14730100',
-            'https://i.gkd.li/i/14730100',
-            'https://i.gkd.li/i/14896700', // 避免误触
-          ],
         },
       ],
     },

src/apps/com.baidu.tieba.ts

@@ -154,9 +154,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="稍后再说"]',
+      rules: [
+        {
+          activityIds: '.UpdateDialog',
+          matches: '[text="稍后再说"]',
           snapshotUrls: 'https://i.gkd.li/i/12496934',
         },
+      ],
+    },
     {
       key: 9,
       name: '全屏广告-弹窗广告',

src/apps/com.baidu.xin.aiqicha.ts

@@ -10,10 +10,12 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.baidu.xin.aiqicha:id/update_cancel"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/12755738',
+          activityIds: 'com.baidu.newbridge.fast.MainFastActivity',
-        'https://i.gkd.li/i/12755762', // activityId: 'com.miui.home.launcher.Launcher'
+          matches: '[id="com.baidu.xin.aiqicha:id/update_cancel"]',
+          snapshotUrls: 'https://i.gkd.li/i/12755738',
+        },
       ],
     },
     {
@@ -27,6 +29,7 @@ export default defineGkdApp({
         {
           key: 0,
           name: '点击不允许',
+          activityIds: 'com.baidu.newbridge.fast.MainFastActivity',
           matches: '[id="com.baidu.xin.aiqicha:id/notice_dialog_cancel_iv"]',
           exampleUrls:
             'https://m.gkd.li/57941037/9c26bb3a-d770-429a-b211-46b97a47f5f0',
@@ -35,6 +38,7 @@ export default defineGkdApp({
         {
           key: 1,
           name: '点击关闭',
+          activityIds: 'com.baidu.newbridge.fast.MainFastActivity',
           matches:
             '@[id="com.baidu.xin.aiqicha:id/close"] +2 [text="打开消息通知"]',
           exampleUrls:

src/apps/com.baidu.youavideo.ts

@@ -13,6 +13,7 @@ export default defineGkdApp({
       fastQuery: true,
       rules: [
         {
+          activityIds: '.home.view.HomeActivity',
           matches:
             '[id="com.baidu.youavideo:id/tv_upgrade"] < LinearLayout +2 [id="com.baidu.youavideo:id/img_close"]',
           snapshotUrls: ['https://i.gkd.li/i/12597916'],
@@ -23,12 +24,12 @@ export default defineGkdApp({
       key: 3,
       name: '局部广告-悬浮窗广告',
       desc: '关闭广告悬浮窗',
-      activityIds: ['com.baidu.youavideo.home.view.HomeActivity'],
-      fastQuery: true,
       rules: [
         {
+          fastQuery: true,
+          activityIds: '.home.view.HomeActivity',
           matches: '[id="com.baidu.youavideo:id/img_operation_close"]',
-          snapshotUrls: ['https://i.gkd.li/i/12970088'],
+          snapshotUrls: 'https://i.gkd.li/i/12970088',
         },
       ],
     },
@@ -42,8 +43,9 @@ export default defineGkdApp({
       fastQuery: true,
       rules: [
         {
+          activityIds: '.home.view.HomeActivity',
           matches: '[id="com.baidu.youavideo:id/tv_next_time"]',
-          snapshotUrls: ['https://i.gkd.li/i/12970094'],
+          snapshotUrls: 'https://i.gkd.li/i/12970094',
         },
       ],
     },
@@ -101,32 +103,45 @@ export default defineGkdApp({
     {
       key: 7,
       name: '权限提示-通知权限',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules:
+        {
+          activityIds: '.app.ui.HomeActivity',
+          matches:
             '[id="com.baidu.youavideo:id/dialog_open_guide_notification_root"] > [id="com.baidu.youavideo:id/img_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13413819',
         },
+      ],
+    },
     {
       key: 8,
       name: '局部广告-照片页底部浮窗广告',
-      activityIds: 'com.baidu.youavideo.home.view.HomeActivity',
+      rules: [
+        {
           fastQuery: true,
-      rules:
+          activityIds: 'com.baidu.youavideo.home.view.HomeActivity',
+          matches:
             '[id="com.baidu.youavideo:id/cl_root"] + [id="com.baidu.youavideo:id/img_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13711475',
         },
+      ],
+    },
     {
       key: 9,
       name: '局部广告-卡片广告',
+      rules: [
+        {
           fastQuery: true,
-      rules: '[vid="riv_banner"] < * > [vid="iv_close"][visibleToUser=true]',
+          matches: '[vid="riv_banner"] + [vid="iv_close"][visibleToUser=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/13874124',
             'https://i.gkd.li/i/15220559', // 避免误触
           ],
         },
       ],
+    },
+  ],
 });

src/apps/com.bankcomm.Bankcomm.ts

@@ -27,9 +27,15 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id = "com.bankcomm.Bankcomm:id/tvNotNow" && text = "暂不更新"]',
+      rules: [
+        {
+          activityIds: 'com.bankcomm.module.biz.webcontainer.BCMHtml5Activity',
+          matches:
+            '[id = "com.bankcomm.Bankcomm:id/tvNotNow" && text = "暂不更新"]',
           snapshotUrls: 'https://i.gkd.li/i/12842484',
         },
+      ],
+    },
     {
       key: 2,
       name: '通知提示-网络代理提示弹窗',

src/apps/com.bilibili.app.in.ts

@@ -19,13 +19,18 @@ export default defineGkdApp({
     {
       key: 6,
       name: '评价提示-APP评分',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[id="com.bilibili.app.in:id/cancel"][text="下次再说"]',
+        {
+          activityIds: 'tv.danmaku.bili.MainActivityV2',
+          matches: '[id="com.bilibili.app.in:id/cancel"][text="下次再说"]',
           snapshotUrls: 'https://i.gkd.li/i/13180746',
         },
+      ],
+    },
     {
       key: 7,
       name: '通知提示-订阅感兴趣的通知',
@@ -51,11 +56,9 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: 'tv.danmaku.bili.MainActivityV2',
           matches: ['[text="打开推送通知"]', '[text="暂不"]'],
-          snapshotUrls: [
+          snapshotUrls: 'https://i.gkd.li/i/15907493',
-            'https://i.gkd.li/i/13600976',
-            'https://i.gkd.li/i/15907493',
-          ],
         },
       ],
     },

src/apps/com.bilibili.studio.ts

@@ -7,11 +7,12 @@ export default defineGkdApp({
     {
       key: 0,
       name: '权限提示-通知权限',
-      desc: '会出现在创作、模板、我的页面，自动点击不开启',
+      desc: '点击[不开启]',
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      activityIds: 'com.bcut.homepage.widget.MainActivity',
       rules: [
         {
           key: 0,
@@ -42,16 +43,16 @@ export default defineGkdApp({
         {
           key: 0,
           name: '勾选"忽略"',
-          matches:
+          matches: '[text="忽略此版本的更新"][checked=false]',
-            '[id="com.bilibili.studio:id/update_cbx_ignore_version"][checked=false]',
+          snapshotUrls: 'https://i.gkd.li/i/13496049',
         },
         {
-          preKeys: 0,
+          preKeys: [0],
           name: '点击"以后再说"',
           matches: '[id="com.bilibili.studio:id/update_btn_cancel"]',
-        },
-      ],
           snapshotUrls: 'https://i.gkd.li/i/13496049',
         },
       ],
+    },
+  ],
 });

src/apps/com.black.unique.ts

@@ -8,9 +8,12 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
-      activityIds: 'com.black.unique.feature.home.HomeActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.black.unique.feature.home.HomeActivity',
           matches: '@ImageView[id="com.black.unique:id/iv_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13499502',
         },

src/apps/com.bokecc.dance.ts

@@ -10,11 +10,12 @@ export default defineGkdApp({
       desc: '点击"以后再说"',
       fastQuery: true,
       matchTime: 10000,
-      resetMatch: 'app',
       actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
-          matches: '[id="com.bokecc.dance:id/tv_cancel"]',
+          activityIds: '.activity.MainActivity',
+          matches: '[text="以后再说"]',
           exampleUrls:
             'https://m.gkd.li/57941037/9156698c-76bb-4921-a39d-96a20c45260b',
           snapshotUrls: 'https://i.gkd.li/i/14071977',

src/apps/com.boohee.one.ts

@@ -10,10 +10,15 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
+        {
+          activityIds: 'com.boohee.library.update.UpdateDialogActivity',
+          matches:
             '@[id="com.boohee.one:id/tv_ignore"] + [id="com.boohee.one:id/tv_update"]',
           snapshotUrls: 'https://i.gkd.li/i/12716918',
         },
+      ],
+    },
     {
       key: 2,
       name: '全屏广告-发现页弹窗广告',
@@ -25,12 +30,17 @@ export default defineGkdApp({
     {
       key: 10,
       name: '权限提示-通知权限',
-      desc: '自动点击x按钮',
+      desc: '点击关闭',
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.boohee.one:id/img_close_push"]',
+      rules: [
+        {
+          activityIds: '.app.account.ui.activity.MsgCategoryActivityV2',
+          matches: '[id="com.boohee.one:id/img_close_push"]',
           snapshotUrls: 'https://i.gkd.li/i/12716950',
         },
       ],
+    },
+  ],
 });

src/apps/com.buyanchuantong.buyanshufa.ts

@@ -11,12 +11,11 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      resetMatch: 'activity',
+      resetMatch: 'app',
-      activityIds: 'com.buyanchuantong.buyanshufa.SplashActivity',
       rules: [
         {
-          matches:
+          activityIds: 'com.buyanchuantong.buyanshufa.SplashActivity',
-            '[id="com.buyanchuantong.buyanshufa:id/next_page_imageview"][text^="点击跳过"]',
+          matches: '[text^="点击跳过"]',
           snapshotUrls: 'https://i.gkd.li/i/13425296',
         },
       ],

src/apps/com.bw30.zsch.ts

@@ -11,8 +11,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.bw30.zsch:id/tv_cancel"]',
+      rules: [
-      snapshotUrls: ['https://i.gkd.li/i/13068699'],
+        {
+          activityIds: 'com.bw.zsch.MainActivityTab',
+          matches: '[id="com.bw30.zsch:id/tv_cancel"]',
+          snapshotUrls: 'https://i.gkd.li/i/13068699',
+        },
+      ],
     },
   ],
 });

src/apps/com.bx.game.dgg.ts

@@ -45,13 +45,15 @@ export default defineGkdApp({
       key: 2,
       name: '通知提示-[温馨提示]弹窗',
       desc: '点击[我知道了]',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
           activityIds: 'com.bx.game.dgg.MainActivity',
-          matches: '[desc="我知道了"]',
+          matches:
+            '@Button[desc="我知道了"][visibleToUser=true] < View <2 View < View < View < View < View < FrameLayout < [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/8a825661-5595-4577-835c-2a0b2d41bc14',
           snapshotUrls: 'https://i.gkd.li/i/15362930',

src/apps/com.byfen.market.ts

@@ -35,9 +35,12 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
-          fastQuery: true,
           activityIds: 'com.byfen.market.ui.activity.MainActivity',
           matches: '[vid="idIvClose"][clickable=true]',
           exampleUrls:
@@ -50,11 +53,12 @@ export default defineGkdApp({
       key: 2,
       name: '更新提示',
       desc: '点击[忽略更新]',
+      fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
+          activityIds: '.ui.activity.MainActivity',
           matches: '[text="忽略更新"][clickable=true][visibleToUser=true]',
           exampleUrls:
             'https://m.gkd.li/57941037/e92b10b8-b0f8-4dc3-95bf-172829996600',

src/apps/com.bz.yilianlife.sd.ts

@@ -7,13 +7,19 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           name: '快手广告',
           activityIds: 'com.deep.search.MainActivity',
-          matches:
+          matches: [
-            '@ImageView[clickable=true] <3 ViewGroup -2 ViewGroup >n [text="广告"]',
+            '[text="广告"]',
+            '@ImageView[clickable=true] - [text="|"] - [text$="s"]',
+          ],
           snapshotUrls: 'https://i.gkd.li/i/13766176',
         },
       ],

src/apps/com.cainiao.wireless.ts

@@ -105,13 +105,18 @@ export default defineGkdApp({
     {
       key: 4,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[text="确认"] - [text="取消"]',
+        {
+          activityIds: '.homepage.view.activity.HomePageActivity',
+          matches: '[text="确认"] - [text="取消"]',
           snapshotUrls: 'https://i.gkd.li/i/13042207',
         },
+      ],
+    },
     {
       key: 5,
       name: '权限提示-通知权限',

src/apps/com.cctv.cctv5ultimate.ts

@@ -23,9 +23,12 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
-      activityIds: 'com.cctv.cctv5ultimate.activity.MainActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.cctv.cctv5ultimate.activity.MainActivity',
           matches: [
             '[text="广告"]',
             '[id="com.cctv.cctv5ultimate:id/iv_close"]',

src/apps/com.cebbank.mobile.cemb.ts

@@ -27,9 +27,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="不再提示"] +2 [text="立即更新"]',
+      rules: [
+        {
+          activityIds: '.view.CustomizedDialog',
+          matches: '@[text="不再提示"] +2 [text="立即更新"]',
           snapshotUrls: 'https://i.gkd.li/i/12727241',
         },
+      ],
+    },
     {
       key: 2,
       name: '全屏广告-首页弹窗广告',
@@ -37,14 +42,19 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      rules: [
+        {
           activityIds: [
             'com.cebbank.mobile.cemb.ui.activity.SplashActivity',
             'com.cebbank.mobile.cemb.ui.activity.HomeActivity',
           ],
-      rules: '[id="com.cebbank.mobile.cemb:id/home_advertising_iv_close"]',
+          matches:
+            '[id="com.cebbank.mobile.cemb:id/home_advertising_iv_close"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12727248',
-        'https://i.gkd.li/i/13471080', // activityIds: 'com.cebbank.mobile.cemb.ui.activity.HomeActivity',
+            'https://i.gkd.li/i/13471080',
+          ],
+        },
       ],
     },
   ],

src/apps/com.cf.dubaji.ts

@@ -7,13 +7,14 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
           key: 0,
+          activityIds: '.module.main.MainActivity',
           matches:
             '[id="com.cf.dubaji:id/dlg_action_positive"][text="立即更新"]',
           action: 'back',

src/apps/com.chan.cwallpaper.ts

@@ -12,16 +12,23 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules: '[vid="activate_button"]',
+      rules: [
+        {
+          matches: '[vid="activate_button"]',
           snapshotUrls: 'https://i.gkd.li/i/14293734',
         },
+      ],
+    },
     {
       key: 1,
       name: '全屏广告-会员回馈弹窗',
       desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
-          fastQuery: true,
           activityIds: 'com.chan.cwallpaper.module.main.MainActivity',
           matches: '[vid="ivClose"]',
           exampleUrls:

src/apps/com.changyou.app.qi.ts

@@ -8,10 +8,13 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
-          fastQuery: true,
           activityIds: 'com.changyou.app.qi.MainActivity',
           matches: '[vid="ksad_auto_close_btn"]',
           exampleUrls:
@@ -20,7 +23,6 @@ export default defineGkdApp({
         },
         {
           key: 1,
-          fastQuery: true,
           activityIds: 'com.changyou.app.qi.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][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]',

src/apps/com.chaoxing.mobile.ts

@@ -7,13 +7,18 @@ export default defineGkdApp({
     {
       key: 10,
       name: '权限提示-通知权限',
-      desc: '自动点击关闭',
+      desc: '点击关闭',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[id="com.chaoxing.mobile:id/vNotificationItemClose"]',
+        {
+          activityIds: '.main.ui.MainTabActivity',
+          matches: '[id="com.chaoxing.mobile:id/vNotificationItemClose"]',
           snapshotUrls: 'https://i.gkd.li/i/13197374',
         },
       ],
+    },
+  ],
 });

src/apps/com.chaozh.iReader.ts

@@ -13,6 +13,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.zhangyue.iReader.read.ui.Activity_BookBrowser_TXT',
           matches: 'Button[text="前往开启"] - Button[text="取消"]',
           snapshotUrls: 'https://i.gkd.li/i/13627649',
         },
@@ -25,12 +26,10 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      excludeActivityIds:
-        'com.zhangyue.iReader.read.ui.Activity_BookBrowser_TXT',
       rules: [
         {
-          matches:
+          activityIds: 'com.zhangyue.iReader.bookshelf.ui.ActivityBookShelf',
-            '@ImageView[clickable=true] +(1,2) TextView[text="开启推送通知"]',
+          matches: '@ImageView[clickable=true] + TextView[text="开启推送通知"]',
           snapshotUrls: 'https://i.gkd.li/i/13837961',
         },
       ],

src/apps/com.chaozh.iReaderFree.ts

@@ -11,8 +11,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[vid="dialog_public_top_bar_title_close"]',
+      rules: [
+        {
+          activityIds: 'com.zhangyue.iReader.bookshelf.ui.ActivityBookShelf',
+          matches: '[vid="dialog_public_top_bar_title_close"]',
           snapshotUrls: 'https://i.gkd.li/i/16549332',
         },
       ],
+    },
+  ],
 });

src/apps/com.cheersedu.app.ts

@@ -11,8 +11,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.cheersedu.app:id/iv_version_close"]',
+      rules: [
+        {
+          activityIds: '.main.MainActivity',
+          matches: '[id="com.cheersedu.app:id/iv_version_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13315712',
         },
       ],
+    },
+  ],
 });

src/apps/com.chinamobile.mcloud.ts

@@ -7,13 +7,14 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
           key: 1,
-          fastQuery: true,
+          activityIds: '.client.ui.setting.UpgradeActivity',
           matches: ['[text="发现新版本"]', '[vid="bn_cancel"]'],
           snapshotUrls: 'https://i.gkd.li/i/14297700',
         },
@@ -26,6 +27,9 @@ export default defineGkdApp({
         {
           key: 0,
           fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
           activityIds: [
             'com.chinamobile.mcloud.client.ui.MenuActivity',
             'com.chinamobile.mcloud.client.ui.CustomScanActivity',
@@ -40,8 +44,10 @@ export default defineGkdApp({
         },
         {
           key: 1,
+          fastQuery: true,
           activityIds: 'com.chinamobile.mcloud.client.ui.MenuActivity',
-          matches: '[text="马上领取"] +3 View > Image[clickable=true]',
+          matches:
+            '@Image[clickable=true] < View -3 [text="马上领取"] < View < View < View < WebView < WebView < FrameLayout < [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/13627832',
         },
       ],
@@ -52,8 +58,10 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          activityIds: 'com.chinamobile.mcloud.client.ui.MenuActivity',
           fastQuery: true,
+          actionMaximum: 1,
+          resetMatch: 'app',
+          activityIds: 'com.chinamobile.mcloud.client.ui.MenuActivity',
           matches:
             '[id="com.chinamobile.mcloud:id/iv_logo"] + [id="com.chinamobile.mcloud:id/iv_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13627834',
@@ -62,14 +70,18 @@ export default defineGkdApp({
     },
     {
       key: 4,
-      name: '功能类-请求开启自动备份弹窗',
+      name: '全屏广告-请求开启自动备份弹窗',
       desc: '点击关闭',
+      rules: [
+        {
           fastQuery: true,
-      activityIds: 'com.chinamobile.mcloud.client.ui.MenuActivity',
+          activityIds: '.client.ui.MenuActivity',
-      rules:
+          matches:
-        '[text="开启自动备份"] +n [id="com.chinamobile.mcloud:id/tv_skip"]',
+            '[text="开启自动备份"] +4 [text="暂不设置"][visibleToUser=true]',
           snapshotUrls: 'https://i.gkd.li/i/13627830',
         },
+      ],
+    },
     {
       key: 5,
       name: '权限提示-通知权限',
@@ -80,6 +92,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.client.ui.MenuActivity',
           matches: '[vid="btn_push_notice_close_dialog"]',
           snapshotUrls: 'https://i.gkd.li/i/14882447',
         },

src/apps/com.chinarailway.globalticketing.ts

@@ -14,8 +14,7 @@ export default defineGkdApp({
       rules: [
         {
           activityIds: 'com.MobileTicket.ui.activity.MainActivity',
-          matches:
+          matches: ['[text^="开启定位权限"]', '[vid="img_close"]'],
-            '[text^="开启定位权限"] +2 [vid="fl_close"] > [vid="img_close"]',
           exampleUrls: 'https://e.gkd.li/95c8443e-babc-4d96-a3cd-00692c2acf30',
           snapshotUrls: 'https://i.gkd.li/i/16987292',
         },

src/apps/com.chinarainbow.tft.ts

@@ -7,17 +7,21 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
-      activityIds:
+      matchTime: 10000,
-        'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
+          activityIds:
+            'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
           matches: 'Image[text=""] < @View +4 [text="反馈"]',
           snapshotUrls: 'https://i.gkd.li/i/13269854',
         },
         {
           key: 1,
           fastQuery: true,
+          activityIds: '.mvp.ui.activity.QrcodeScanCompletedActivity',
           matches:
             '[id="com.byted.pangle.m:id/tt_reward_full_count_down_after_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13468554',

src/apps/com.chinatelecom.bestpayclient.ts

@@ -11,9 +11,15 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.chinatelecom.bestpayclient:id/bupdate_tv_bottom_tip"]',
+      rules: [
+        {
+          activityIds: '.ui.MainActivity',
+          matches:
+            '[id="com.chinatelecom.bestpayclient:id/bupdate_tv_bottom_tip"]',
           snapshotUrls: 'https://i.gkd.li/i/13391544',
         },
+      ],
+    },
     {
       key: 3,
       name: '全屏广告-弹窗广告',
@@ -21,8 +27,8 @@ export default defineGkdApp({
         {
           key: 0,
           name: '权益页',
-          activityIds: 'com.chinatelecom.bestpayclient.ui.MainActivity',
           fastQuery: true,
+          activityIds: 'com.chinatelecom.bestpayclient.ui.MainActivity',
           matches:
             'Dialog >3 View[childCount=2] > @View[clickable=true] > Image[childCount=0] <<n [id="com.chinatelecom.bestpayclient:id/best_h5_container"]',
           snapshotUrls: 'https://i.gkd.li/i/13402692',
@@ -30,8 +36,11 @@ export default defineGkdApp({
         {
           key: 1,
           name: '首页1',
-          activityIds: 'com.chinatelecom.bestpayclient.ui.MainActivity',
           fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
+          activityIds: 'com.chinatelecom.bestpayclient.ui.MainActivity',
           matches: '[vid="iv_dialog_close_one"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13455790',
@@ -41,8 +50,11 @@ export default defineGkdApp({
         {
           key: 2,
           name: '首页2',
-          activityIds: 'com.alipay.mobile.nebulacore.ui.H5Activity',
           fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
+          activityIds: 'com.alipay.mobile.nebulacore.ui.H5Activity',
           matches:
             '[text="甜橙信用卡"] >2  View[childCount=2] > @Image[clickable=true][text!=null] <<n [id="com.chinatelecom.bestpayclient:id/h5_pc_container"]',
           snapshotUrls: 'https://i.gkd.li/i/13626324',
@@ -98,16 +110,21 @@ export default defineGkdApp({
     {
       key: 5,
       name: '全屏广告-年底积分活动弹窗',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      resetMatch: 'activity',
+      rules: [
+        {
           activityIds: 'com.alipay.mobile.nebulacore.ui.H5Activity',
-      rules: 'View > View[index=1][clickable=true][childCount=1] > Image',
+          matches:
+            'View[childCount=2] > @View[index=1][clickable=true][childCount=1] > Image[childCount=0] <<n [id="com.chinatelecom.bestpayclient:id/h5_pc_container"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13543032',
             'https://i.gkd.li/i/13625037', //修改规则，避免在此误触
           ],
         },
+      ],
+    },
     {
       key: 6,
       name: '功能类-自动签到',

src/apps/com.chinatower.tthd.ts

@@ -7,11 +7,14 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           activityIds: 'com.chinatower.fghd.customer.home.HomeNewActivity',
-          fastQuery: true,
           matches:
             '[id="com.chinatower.tthd:id/fl_content_container"] + [id="com.chinatower.tthd:id/iv_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13694901',

src/apps/com.chinaunicom.bol.cloudapp.ts

@@ -14,7 +14,7 @@ export default defineGkdApp({
       desc: '点击取消',
       rules: [
         {
-          matches: '@[text="取消"] < * + * > [text="立即下载"]',
+          matches: '[vid="update_button_cancel"][visibleToUser=true]',
           snapshotUrls: 'https://i.gkd.li/i/13998612',
         },
       ],

src/apps/com.chunqiu.ah.ts

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

src/apps/com.cimoc.haleydu.ts

@@ -8,10 +8,13 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
-          fastQuery: true,
           activityIds: 'com.haleydu.cimoc.ui.activity.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][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]',

src/apps/com.cloudpower.netsale.activity.ts

@@ -14,6 +14,8 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds:
+            'com.picc.aasipods.module.versionupdate.controller.VersionUpdateActivity',
           matches: '[id="com.cloudpower.netsale.activity:id/tvw_cancel"]',
           snapshotUrls: 'https://i.gkd.li/i/14005533',
         },

src/apps/com.cmbchina.ccd.pluto.cmbActivity.ts

@@ -11,12 +11,19 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '[id="com.cmbchina.ccd.pluto.cmbActivity:id/bt_sure_tips"] - [id="com.cmbchina.ccd.pluto.cmbActivity:id/bt_cancel_tips"]',
+        {
+          activityIds: [
+            '.CMBRootActivityV2',
+            '.secplugin.activity.login.fingerprint.cmbR6VH0R',
+          ],
+          matches: '[text="暂不更新"][visibleToUser=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/12647025',
             'https://i.gkd.li/i/12727203',
-        'https://i.gkd.li/i/13345771', //
+            'https://i.gkd.li/i/13345771',
+          ],
+        },
       ],
     },
     {

src/apps/com.cmcc.cmvideo.ts

@@ -15,29 +15,40 @@ export default defineGkdApp({
     {
       key: 3,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[id="com.cmcc.cmvideo:id/btn_update_close"]',
+        {
+          matches: '[id="com.cmcc.cmvideo:id/btn_update_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13276116',
         },
+      ],
+    },
     {
       key: 4,
       name: '权限提示-通知权限',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[id="com.cmcc.cmvideo:id/base_dialog_left_btn"][text="以后再说"]',
+        {
+          matches: '[text="以后再说"]',
           snapshotUrls: 'https://i.gkd.li/i/13276127',
         },
+      ],
+    },
     {
       key: 5,
       name: '全屏广告-弹窗广告',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
-          fastQuery: true,
           matchRoot: true,
           activityIds:
             'com.cmcc.cmvideo.main.application.CompatibleMainActivity',

src/apps/com.cmcc.hebao.ts

@@ -8,12 +8,16 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           activityIds: 'com.cmcc.wallet.mocam.activity.home.WalletHomeActivity',
           matches:
-            '@[clickable=true] > [text="dialog-delete"][visibleToUser=true]',
+            '@[clickable=true] > [visibleToUser=true][text="dialog-delete"] <<n [vid="rl_parent"]',
           exampleUrls:
             'https://m.gkd.li/57941037/cb33c5b5-dd2e-4aa9-80d1-f7013f150305',
           snapshotUrls: 'https://i.gkd.li/i/14567338',

src/apps/com.cmi.jegotrip.ts

@@ -10,8 +10,10 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: '.ui.BottomTabsActivity',
           matches: '[id="com.cmi.jegotrip:id/ig_ad_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13631904',
         },
@@ -24,11 +26,17 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      rules: [
+        {
           activityIds: 'com.cmi.jegotrip.ui.BottomTabsActivity',
-      rules:
+          matches: [
-        '[text="申请定位权限说明"] < LinearLayout +2 LinearLayout [id="com.cmi.jegotrip:id/btn_cancel"]',
+            '[text="申请定位权限说明"]',
+            '[id="com.cmi.jegotrip:id/btn_cancel"]',
+          ],
           snapshotUrls: 'https://i.gkd.li/i/13232766',
         },
+      ],
+    },
     {
       key: 4,
       name: '权限提示-权限申请弹窗',

src/apps/com.cmri.universalapp.ts

@@ -13,6 +13,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.SmartMainProxyActivity',
           matches: '[vid="ivCancelDlg"][visibleToUser=true]',
           snapshotUrls: 'https://i.gkd.li/i/17872852',
         },

src/apps/com.cmstop.shaoxing.ts

@@ -12,8 +12,12 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules: '[id="com.cmstop.shaoxing:id/roundProgressBar"]',
+      rules: [
+        {
+          matches: '[id="com.cmstop.shaoxing:id/roundProgressBar"]',
           snapshotUrls: 'https://i.gkd.li/i/13611775',
         },
       ],
+    },
+  ],
 });

src/apps/com.cn21.ecloud.ts

@@ -8,9 +8,12 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-首页弹窗广告',
       fastQuery: true,
-      activityIds: 'com.cn21.ecloud.activity.MainPageActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.cn21.ecloud.activity.MainPageActivity',
           matches:
             'FrameLayout > View[childCount=1] > View[childCount=1] >(1,4) View[childCount=2][desc=null] > @ImageView[clickable=true][visibleToUser=true] <<n [vid="content_frame"]',
           snapshotUrls: [
@@ -28,8 +31,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.cn21.ecloud:id/ivCancel"]',
+      rules: [
+        {
+          activityIds: '.activity.MainPageActivity',
+          matches: '[id="com.cn21.ecloud:id/ivCancel"]',
           snapshotUrls: 'https://i.gkd.li/i/13399488',
         },
       ],
+    },
+  ],
 });

src/apps/com.cnki.client.ts

@@ -10,8 +10,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.cnki.client:id/update_undo"]',
+      rules: [
+        {
+          activityIds: '.core.tramp.SplashActivity',
+          matches: '[id="com.cnki.client:id/update_undo"]',
           snapshotUrls: 'https://i.gkd.li/i/12854857',
         },
       ],
+    },
+  ],
 });

src/apps/com.cnki.view.ts

@@ -10,10 +10,18 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.cnki.view:id/update_undo"]',
+      rules: [
+        {
+          activityIds: [
+            'com.cnki.view.core.navigator.main.HomeActivity',
+            'com.cnki.view.core.tramp.main.SplashActivity',
+          ],
+          matches: '[id="com.cnki.view:id/update_undo"]',
           snapshotUrls: [
-        'https://i.gkd.li/i/12755689', // activityId: 'com.cnki.view.core.navigator.main.HomeActivity'
+            'https://i.gkd.li/i/12755689',
-        'https://i.gkd.li/i/12755700', // activityId: 'com.cnki.view.core.tramp.main.SplashActivity'
+            'https://i.gkd.li/i/12755700',
+          ],
+        },
       ],
     },
   ],

src/apps/com.cnspeedtest.globalspeed.ts

@@ -1,19 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.cnspeedtest.globalspeed',
-  name: '全球网测',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: [
-        '[id="com.cnspeedtest.globalspeed:id/vision_btn_ok"][text="更新"] +2 [id="com.cnspeedtest.globalspeed:id/vision_btn_cancel"]',
-      ],
-      snapshotUrls: 'https://i.gkd.li/i/12642345',
-    },
-  ],
-});

src/apps/com.coloros.gallery3d.ts

@@ -7,12 +7,13 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
+          activityIds: '.app.MainActivity',
           matches: '[text="更新"] -2 [text="取消"]',
           exampleUrls:
             'https://m.gkd.li/47232102/0dae9f4b-8432-4cf4-b648-07ae17cdece2',
@@ -24,13 +25,18 @@ export default defineGkdApp({
       key: 6,
       name: '功能类-开启相册同步弹窗',
       desc: '点击忽略',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
+        {
           activityIds: 'com.coloros.gallery3d.app.MainActivity',
-      rules: '[text="开启相册自动同步，保障相册数据安全"] + [text="忽略"]',
+          matches:
+            '[text="开启相册自动同步，保障相册数据安全"] + [text="忽略"]',
           snapshotUrls: 'https://i.gkd.li/i/13637185',
         },
       ],
+    },
+  ],
 });

src/apps/com.coolapk.market.ts

@@ -113,23 +113,34 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/12503762',
+        {
-      rules: '[text="立即更新"] - [text="取消"]',
+          action: 'back',
+          activityIds: '.view.main.MainActivity',
+          matches: '[text="立即更新"]',
+          snapshotUrls: 'https://i.gkd.li/i/15511206',
+        },
+      ],
     },
     {
       key: 3,
       name: '权限提示-通知权限',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[text="去开启"] - [text="以后再说"]',
+        {
+          activityIds: '.view.main.MainActivity',
+          matches: '[text="去开启"] - [text="以后再说"]',
           snapshotUrls: 'https://i.gkd.li/i/13296465',
         },
+      ],
+    },
     {
       key: 4,
       name: '局部广告-[大家还下载了]应用推荐',

src/apps/com.copymanga.app.ts

@@ -175,13 +175,14 @@ export default defineGkdApp({
     },
     {
       key: 5,
-      name: '权限提示-通知权限',
+      name: '通知提示-公告弹窗',
       matchTime: 30000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
-          matches: '[desc="系统提示"] +n [desc="确定"]',
+          activityIds: '.MainActivity',
+          matches: '[desc="系统提示"] +2 [desc="确定"]',
           exampleUrls:
             'https://m.gkd.li/57941037/7577dafa-9e3e-44de-bd20-c52f8a30e9c6',
           snapshotUrls: 'https://i.gkd.li/i/13233180',

src/apps/com.cqcsy.ifvod.ts

@@ -1,18 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.cqcsy.ifvod',
-  name: '爱壹帆',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      fastQuery: true,
-      rules: '@[text="以后再说"] +2 [text="立即更新"]',
-      snapshotUrls: 'https://i.gkd.li/i/13798537',
-    },
-  ],
-});

src/apps/com.crgt.ilife.ts

@@ -11,9 +11,10 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          fastQuery: true,
           activityIds: 'com.crgt.ilife.ui.main.MainPageView',
           matches:
-            'FrameLayout[childCount=2] > FrameLayout[childCount=2] > FrameLayout[childCount=3] > @FrameLayout[childCount=1] > ImageView[childCount=0][text=null]',
+            'FrameLayout[childCount=2] > FrameLayout[childCount=2] > FrameLayout[childCount=3] > @FrameLayout[childCount=1][visibleToUser=true] > ImageView[childCount=0][text=null] <<n [vid="home_banner"]',
           exampleUrls: 'https://e.gkd.li/3026504f-acb7-4f58-b171-ab664b2caf27',
           snapshotUrls: 'https://i.gkd.li/i/16450332',
         },
@@ -32,9 +33,12 @@ export default defineGkdApp({
       key: 2,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
-          fastQuery: true,
           activityIds: 'com.crgt.ilife.ui.main.MainPageView',
           matches: '[vid="iv_close"]',
           exampleUrls: 'https://e.gkd.li/43ccfd78-67d7-4dba-a25f-a2f5d62f9c40',

src/apps/com.crirp.zhipu.ts

@@ -20,14 +20,17 @@ export default defineGkdApp({
       ],
     },
     {
-      name: '全屏广告-今日要闻弹窗',
       key: 2,
+      name: '全屏广告-今日要闻弹窗',
       desc: '点击不再提示',
       fastQuery: true,
-      activityIds: 'com.ruipeng.zipu.ui.main.uniauto.UniautoHomeActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
-          matches: '[id$="/cancel_tv"]',
+          activityIds: 'com.ruipeng.zipu.ui.main.uniauto.UniautoHomeActivity',
+          matches: '[text="今日不再提示"]',
           snapshotUrls: 'https://i.gkd.li/i/13725337',
         },
       ],

src/apps/com.csair.mbp.ts

@@ -6,12 +6,21 @@ export default defineGkdApp({
   groups: [
     {
       key: 3,
-      name: '全屏广告-首页弹窗广告',
+      name: '全屏广告-弹窗广告',
+      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
           fastQuery: true,
-      activityIds: 'com.csair.mbp.CSMBPActivity',
+          activityIds: '.CSMBPActivity',
-      rules: '[id="com.csair.mbp:id/close_btn"]',
+          matches: '[id="com.csair.mbp:id/close_btn"]',
+          exampleUrls: 'https://e.gkd.li/c6aeaf1c-e4d6-4b9c-a4bf-ee5b05d2bb30',
           snapshotUrls: 'https://i.gkd.li/i/13197497',
         },
+      ],
+    },
     {
       key: 4,
       name: '功能类-长辈版弹窗',

src/apps/com.csg.palmhall.ts

@@ -10,20 +10,35 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="关闭"] + [text="升级"]',
+      rules: [
+        {
+          activityIds: '.MainActivity',
+          matches: '@[text="关闭"] + [text="升级"]',
           snapshotUrls: 'https://i.gkd.li/i/12700060',
         },
+      ],
+    },
     {
       key: 2,
       name: '全屏广告-首页弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
           activityIds: 'com.csg.palmhall.MainActivity',
-      rules: 'View > Image +(3) [text="不再显示"][clickable=true]',
+          matches: 'View > Image +(3) [text="不再显示"][clickable=true]',
           snapshotUrls: 'https://i.gkd.li/i/12700075',
         },
+      ],
+    },
     {
       key: 3,
       name: '通知提示-公告弹窗',
       desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'com.csg.palmhall.MainActivity',

src/apps/com.ct.client.ts

@@ -26,24 +26,40 @@ export default defineGkdApp({
       key: 1,
       name: '功能类-软件更新/安装后的用户引导',
       fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
           activityIds: 'com.ct.client.activity.UserGuideActivity',
-      rules: '[id="com.ct.client:id/tvSkip"]',
+          matches: '[id="com.ct.client:id/tvSkip"]',
           snapshotUrls: 'https://i.gkd.li/i/12508971',
         },
+      ],
+    },
     {
       key: 2,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: 'LinearLayout > [text="取消升级"]',
+        {
+          activityIds: [
+            '.activity.MainActivity',
+            '.activity.SplashActivity',
+            '.common.ConfirmDialogActivity',
+          ],
+          matches: 'LinearLayout > [text="取消升级"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12819594',
             'https://i.gkd.li/i/13316168',
             'https://i.gkd.li/i/13695096',
           ],
         },
+      ],
+    },
     {
       key: 3,
       name: '全屏广告-浮窗广告',
@@ -51,12 +67,12 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
+      rules: [
+        {
           activityIds: [
             'com.ct.client.common.ConfirmDialogActivity',
             'com.ct.client.activity.MainActivity',
           ],
-      rules: [
-        {
           matches: '[vid="rlActivity"] > [vid="close"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12819676',

src/apps/com.ctm.ts

@@ -6,19 +6,33 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      name: '局部广告-浮窗广告',
+      name: '全屏广告-弹窗广告',
+      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
           fastQuery: true,
-      activityIds: 'com.ctm.home.page.MainActivity',
+          activityIds: '.home.page.MainActivity',
-      rules: '[id="com.ctm:id/iv_close"]',
+          matches: '[id="com.ctm:id/iv_close"]',
+          exampleUrls: 'https://e.gkd.li/fbaa53c3-109d-47b3-b85c-373d93e420d9',
           snapshotUrls: 'https://i.gkd.li/i/13350575',
         },
+      ],
+    },
     {
       key: 2,
       name: '局部广告-底部横幅广告',
+      rules: [
+        {
           fastQuery: true,
           activityIds: 'com.ctm.home.page.MainActivity',
-      rules: '[id="com.ctm:id/btn_close"]',
+          matches:
+            '[id="com.ctm:id/iv_bottom_adv"] + [id="com.ctm:id/btn_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13350612',
         },
       ],
+    },
+  ],
 });

src/apps/com.cubic.autohome.ts

@@ -7,17 +7,24 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
           activityIds: 'com.cubic.autohome.MainActivity',
-      rules: '[id="com.cubic.autohome:id/operate_show_exit_layout"]',
+          matches: '[id="com.cubic.autohome:id/operate_show_exit_layout"]',
           snapshotUrls: 'https://i.gkd.li/i/12836324',
         },
+      ],
+    },
     {
       key: 2,
-      fastQuery: true,
       name: '局部广告-右下角领福利悬浮窗',
-      desc: '点击X',
+      desc: '点击关闭',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.cubic.autohome.MainActivity',
           matches:
             '@ImageView[visibleToUser=true] < * <2 * - [id="android:id/tabhost"]',

src/apps/com.custom.zktimehelp.ts

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

src/apps/com.cyl.musiccy.ou.ts

@@ -41,6 +41,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.MainActivity',
           matches: '[desc="我知道了"]',
           snapshotUrls: 'https://i.gkd.li/i/13063206',
         },
@@ -90,9 +91,9 @@ export default defineGkdApp({
           ],
           matches: '[id="ad_area"] [id="close_btn"][clickable=true]',
           snapshotUrls: [
-            'https://i.gkd.li/i/13759345',
             'https://i.gkd.li/i/12775925',
             'https://i.gkd.li/i/12775924',
+            'https://i.gkd.li/i/13759345',
           ],
         },
         {