perf: some rules

src/appDeprecatedKeys.ts

@@ -460,12 +460,12 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.ss.android.ugc.aweme',
     name: '抖音',
-    deprecatedKeys: [0, 2],
+    deprecatedKeys: [0, 2, 5],
   },
   {
     id: 'com.taobao.taobao',
     name: '淘宝',
-    deprecatedKeys: [0],
+    deprecatedKeys: [0, 10, 11],
   },
   {
     id: 'com.taptap',
@@ -535,7 +535,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.unionpay',
     name: '云闪付',
-    deprecatedKeys: [11],
+    deprecatedKeys: [1, 11, 14],
   },
   {
     id: 'com.netease.newsreader.activity',
@@ -570,7 +570,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.ximalaya.ting.android',
     name: '喜马拉雅',
-    deprecatedKeys: [9],
+    deprecatedKeys: [6, 9],
   },
   {
     id: 'com.zjwh.android_wh_physicalfitness',
@@ -720,7 +720,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.umetrip.android.msky.app',
     name: '航旅纵横',
-    deprecatedKeys: [8],
+    deprecatedKeys: [8, 9],
   },
   {
     id: 'cn.mil.junhao',
@@ -792,6 +792,41 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
     name: 'youtube',
     deprecatedKeys: [2],
   },
+  {
+    id: 'com.qinlin.edoor',
+    name: '亲邻开门',
+    deprecatedKeys: [10, 11, 12],
+  },
+  {
+    id: 'com.quark.browser',
+    name: '夸克浏览器',
+    deprecatedKeys: [0],
+  },
+  {
+    id: 'com.taobao.etao',
+    name: '一淘',
+    deprecatedKeys: [1],
+  },
+  {
+    id: 'com.wm.dmall',
+    name: '多点',
+    deprecatedKeys: [4],
+  },
+  {
+    id: 'com.ximalaya.ting.lite',
+    name: '喜马拉雅极速版',
+    deprecatedKeys: [0],
+  },
+  {
+    id: 'com.yunzhi.tiyu',
+    name: '云运动',
+    deprecatedKeys: [1],
+  },
+  {
+    id: 'com.zhengnengliang.precepts',
+    name: '正气',
+    deprecatedKeys: [1],
+  },
 ];
 
 const map: Map<string, number[]> = new Map();

src/apps/client.android.yixiaotong.ts

@@ -65,7 +65,7 @@ export default defineGkdApp({
           key: 2,
           fastQuery: true,
           matches:
-            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序"]',
           exampleUrls:
             'https://m.gkd.li/57941037/ad8a1bbf-61b5-4a7e-8e16-5e0092f04b8c',
           snapshotUrls: 'https://i.gkd.li/i/14469848',

src/apps/com.UCMobile.ts

@@ -69,18 +69,25 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@ImageView - LinearLayout >n [text="开启消息通知"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/12880812',
+          activityIds: 'com.uc.browser.InnerUCMobile',
-        'https://i.gkd.li/i/12880802',
+          matches: '@ImageView - LinearLayout >n [text="开启消息通知"]',
+          snapshotUrls: 'https://i.gkd.li/i/12880812',
+        },
       ],
     },
     {
       key: 11,
-      name: '功能类-请求添加桌面快捷方式权限弹窗',
+      name: '其他-请求添加桌面快捷方式弹窗',
-      activityIds: 'com.uc.browser.InnerUCMobile',
+      desc: '点击关闭',
-      rules: '@ImageView + [text^="添加"][text$="到桌面"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/12880983',
+        {
+          activityIds: 'com.uc.browser.InnerUCMobile',
+          matches: '@ImageView + [text^="添加"][text$="到桌面"]',
+          snapshotUrls: 'https://i.gkd.li/i/12880983',
+        },
+      ],
     },
   ],
 });

src/apps/com.duoduo.cimoc.su.ts

@@ -44,7 +44,7 @@ export default defineGkdApp({
           fastQuery: true,
           activityIds: 'com.duoduo.cimoc.su.MainActivity',
           matches:
-            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13999284',
             'https://i.gkd.li/i/13999376',

src/apps/com.feiyu.morin.ts

@@ -60,7 +60,7 @@ export default defineGkdApp({
             'com.feiyu.morin.view.main.PlayerBottomControlActivity',
           ],
           matches:
-            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13521680',
             'https://i.gkd.li/i/13625476',

src/apps/com.klcxkj.zqxy.ts

@@ -64,7 +64,7 @@ export default defineGkdApp({
           activityIds:
             'com.klcxkj.zqxy.ui.device.drink.ble.DrinkingBleActivity',
           matches:
-            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序"]',
           snapshotUrls: 'https://i.gkd.li/i/13488870',
         },
       ],

src/apps/com.p1.mobile.putong.ts

@@ -8,12 +8,13 @@ export default defineGkdApp({
       key: 2,
       name: '更新提示',
       desc: '点击[取消]',
-      matchTime: 10000,
       fastQuery: true,
-      resetMatch: 'app',
+      matchTime: 10000,
       actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: '.core.newui.main.NewMainAct',
           matches:
             '@[vid="buttonDefaultNeutral"][clickable=true] > [text="取消"]',
           exampleUrls:
@@ -27,10 +28,12 @@ export default defineGkdApp({
       name: '权限提示-通知权限',
       desc: '点击[暂不设置]',
       fastQuery: true,
-      resetMatch: 'app',
+      matchTime: 10000,
       actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: '.core.ui.seepage.likers.FakeLikersAct',
           matches: '[text="打开通知"] + [text="暂不设置"]',
           exampleUrls:
             'https://m.gkd.li/57941037/137e9907-9767-4acf-b803-034182346ef3',

src/apps/com.panaceasoft.pswallpaper.ts

@@ -11,9 +11,19 @@ export default defineGkdApp({
       matchTime: 10000,
       resetMatch: 'app',
       actionMaximum: 1,
+      activityIds: '.xiao.MainActivity',
       rules: [
         {
-          matches: ['[text="下一条"]', '[vid="iv_close"]'],
+          key: 0,
+          matches: '[vid="cb_ignore"][checked=false]',
+          exampleUrls: 'https://e.gkd.li/b92e4e94-fafc-47b1-9774-3126cfaed981',
+          snapshotUrls: 'https://i.gkd.li/i/14141561',
+        },
+        {
+          preKeys: [0],
+          key: 1,
+          matches: '[vid="iv_close"][visibleToUser=true]',
+          exampleUrls: 'https://e.gkd.li/b92e4e94-fafc-47b1-9774-3126cfaed981',
           snapshotUrls: 'https://i.gkd.li/i/14141561',
         },
       ],

src/apps/com.pandabus.android.zb.ts

@@ -11,8 +11,12 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.pandabus.android.zb:id/iv_native_dislike"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13400177',
+        {
+          matches: '[id="com.pandabus.android.zb:id/iv_native_dislike"]',
+          snapshotUrls: 'https://i.gkd.li/i/13400177',
+        },
+      ],
     },
   ],
 });

src/apps/com.paokeji.yiqu.ts

@@ -40,6 +40,8 @@ export default defineGkdApp({
       actionMaximum: 1,
       rules: [
         {
+          activityIds:
+            'com.aster.comic.app.view.bookdetails.BookdetailsActivity',
           matches: '[id="com.paokeji.yiqu:id/btnCancel"]',
           exampleUrls:
             'https://m.gkd.li/57941037/2ce54292-bfc6-41c6-b2e5-e7d8302fc522',

src/apps/com.pcs.knowing_weather.ts

@@ -1,18 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.pcs.knowing_weather',
-  name: '知天气-决策',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: '[text="立即升级"] +2 [text="以后再说"]',
-      snapshotUrls: 'https://i.gkd.li/i/13378992', // activityIds: 'com.huawei.android.launcher.unihome.UniHomeLauncher',
-    },
-  ],
-});

src/apps/com.picacomic.fregata.ts

@@ -31,7 +31,7 @@ export default defineGkdApp({
       rules: [
         {
           matches:
-            '[id="com.picacomic.fregata:id/button_dialog_announcement_negative"][text="確定"]',
+            '[id="com.picacomic.fregata:id/button_dialog_announcement_positive"]',
           exampleUrls:
             'https://m.gkd.li/83610194/a5cbd7ce-79b4-49da-ba01-2b7db907d1f1',
           snapshotUrls: 'https://i.gkd.li/i/13422767',
@@ -45,10 +45,9 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      resetMatch: 'activity',
-      activityIds: 'com.picacomic.fregata.activities.MainActivity',
       rules: [
         {
+          activityIds: 'com.picacomic.fregata.activities.MainActivity',
           matches: '[id="com.picacomic.fregata:id/imageButton_banner_close"]',
           exampleUrls:
             'https://m.gkd.li/83610194/92feb979-d75a-4ee5-a880-da2e4250d1e3',
@@ -63,10 +62,11 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      resetMatch: 'activity',
+      resetMatch: 'app',
       activityIds: 'com.picacomic.fregata.activities.MainActivity',
       rules: [
         {
+          key: 0,
           matches:
             '[id="com.picacomic.fregata:id/textView_profile_punch_in"][text="打嗶卡"]',
           exampleUrls:
@@ -74,6 +74,8 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/13422844',
         },
         {
+          preKeys: [0],
+          key: 1,
           matches:
             '[id="com.picacomic.fregata:id/button_dialog_custom_positive"][text="確定"]',
           exampleUrls:
@@ -89,10 +91,9 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      resetMatch: 'activity',
-      activityIds: 'com.picacomic.fregata.activities.ComicViewerActivity',
       rules: [
         {
+          activityIds: 'com.picacomic.fregata.activities.ComicViewerActivity',
           matches:
             'RelativeLayout > Button[text="確定"][id="com.picacomic.fregata:id/button_dialog_custom_positive"]',
           snapshotUrls: 'https://i.gkd.li/i/13466492',

src/apps/com.ping.cimoc.ts

@@ -9,10 +9,17 @@ export default defineGkdApp({
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
       fastQuery: true,
-      activityIds: 'com.ping.cimoc.ui.activity.MainActivity',
+      matchTime: 10000,
-      rules:
+      actionMaximum: 1,
-        '@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="跳转微信"]',
+      resetMatch: 'app',
-      snapshotUrls: 'https://i.gkd.li/i/13187751',
+      rules: [
+        {
+          activityIds: 'com.ping.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="跳转微信"]',
+          snapshotUrls: 'https://i.gkd.li/i/13187751',
+        },
+      ],
     },
   ],
 });

src/apps/com.pleasure.trace_wechat.ts

@@ -13,13 +13,13 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          name: '点击"x"',
+          name: '点击关闭',
           matches:
             'View < @FrameLayout[desc^="dislike"] <<n [id="com.pleasure.trace_wechat:id/adsuyi_id_view_response"]',
           snapshotUrls: 'https://i.gkd.li/i/13479466',
         },
         {
-          preKeys: 0,
+          preKeys: [0],
           name: '关闭原因"不感兴趣"',
           matches:
             '@LinearLayout > [id="com.byted.pangle:id/tt_item_tv"][text="不感兴趣"]',
@@ -29,11 +29,15 @@ export default defineGkdApp({
     },
     {
       key: 11,
-      name: '全屏广告-"字节"弹窗广告',
+      name: '全屏广告-弹窗广告',
-      activityIds:
+      rules: [
-        'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
+        {
-      rules: '[text="反馈"] -2 @View > Image',
+          activityIds:
-      snapshotUrls: 'https://i.gkd.li/i/13479468',
+            'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
+          matches: '[text="反馈"] -2 @View > Image',
+          snapshotUrls: 'https://i.gkd.li/i/13479468',
+        },
+      ],
     },
   ],
 });

src/apps/com.pmph.irenwei.ts

@@ -6,9 +6,12 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      fastQuery: true,
       name: '全屏广告-抽奖弹窗',
-      desc: '点击X',
+      desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'com.pmph.main.ad.AdActivity',

src/apps/com.pywm.fund.ts

@@ -1,23 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.pywm.fund',
-  name: '普益基金',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: [
-        {
-          matches: 'TextView[text="立即更新"]',
-          action: 'back',
-          snapshotUrls: 'https://i.gkd.li/i/13327271',
-        },
-      ],
-    },
-  ],
-});

src/apps/com.qcymall.earphonesetup.ts

@@ -8,12 +8,15 @@ export default defineGkdApp({
       key: 1,
       name: '局部广告-我的-卡片广告',
       fastQuery: true,
-      matchTime: 10000,
-      resetMatch: 'activity',
-      activityIds: 'com.qcymall.earphonesetup.v2ui.activity.V2MainActivity',
       actionMaximum: 1,
-      rules: '[vid="close_img_banner"]',
+      resetMatch: 'app',
-      snapshotUrls: 'https://i.gkd.li/i/13874219',
+      rules: [
+        {
+          activityIds: 'com.qcymall.earphonesetup.v2ui.activity.V2MainActivity',
+          matches: '[vid="close_img_banner"]',
+          snapshotUrls: 'https://i.gkd.li/i/13874219',
+        },
+      ],
     },
   ],
 });

src/apps/com.qidian.QDReader.ts

@@ -13,13 +13,17 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          key: 1,
+          activityIds: '.framework.widget.dialog.judian',
           matches:
             '[text$="新版本"] +2 * >2 [id="com.qidian.QDReader:id/cancel"]',
-          snapshotUrls: ['https://i.gkd.li/i/12641026'],
+          snapshotUrls: 'https://i.gkd.li/i/12641026',
         },
         {
+          key: 2,
+          activityIds: 'com.tencent.upgrade.ui.UpgradeDialogActivity',
           matches: '[id="com.qidian.QDReader:id/upgrade_dialog_close_btn"]',
-          snapshotUrls: ['https://i.gkd.li/i/13116821'],
+          snapshotUrls: 'https://i.gkd.li/i/13116821',
         },
       ],
     },
@@ -29,64 +33,79 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '[id="com.qidian.QDReader:id/btnEnterTeen"] + [id="com.qidian.QDReader:id/btnCancel"]',
+        {
-      snapshotUrls: [
+          activityIds: [
-        'https://i.gkd.li/i/12640241',
+            '.bll.helper.z0',
-        'https://i.gkd.li/i/12709168',
+            '.ui.activity.MainGroupActivity',
-        'https://i.gkd.li/i/12905817',
+            '.framework.widget.dialog.judian',
-        'https://i.gkd.li/i/17879416',
+          ],
+          matches: '[vid="btnEnterTeen"] + [vid="btnCancel"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12640241',
+            'https://i.gkd.li/i/12709168',
+            'https://i.gkd.li/i/12905817',
+            'https://i.gkd.li/i/17879416',
+          ],
+        },
       ],
     },
     {
       key: 3,
       name: '全屏广告-活动弹窗',
-      activityIds: [
+      fastQuery: true,
-        'com.qidian.QDReader.ui.activity.MainGroupActivity',
+      rules: [
-        'com.tencent.mm.plugin.webview.ui.tools.SDKOAuthUI',
+        {
-        'com.qidian.QDReader.framework.widget.dialog.judian',
+          activityIds: [
-        'com.qidian.QDReader.ui.activity.BookLastPageNewActivity',
+            'com.qidian.QDReader.ui.activity.MainGroupActivity',
-      ],
+            'com.tencent.mm.plugin.webview.ui.tools.SDKOAuthUI',
-      rules:
+            'com.qidian.QDReader.framework.widget.dialog.judian',
-        '[id="com.qidian.QDReader:id/imgBKT"] + [id="com.qidian.QDReader:id/imgClose"]',
+            'com.qidian.QDReader.ui.activity.BookLastPageNewActivity',
-      snapshotUrls: [
+          ],
-        'https://i.gkd.li/i/12640195',
+          matches:
-        'https://i.gkd.li/i/12640158',
+            '[id="com.qidian.QDReader:id/imgBKT"] + [id="com.qidian.QDReader:id/imgClose"]',
-        'https://i.gkd.li/i/12818198',
+          snapshotUrls: [
-        'https://i.gkd.li/i/13469004', // .ui.activity.BookLastPageNewActivity
+            'https://i.gkd.li/i/12640195',
+            'https://i.gkd.li/i/12640158',
+            'https://i.gkd.li/i/12818198',
+            'https://i.gkd.li/i/13469004',
+          ],
+        },
       ],
     },
     {
       key: 4,
       name: '权限提示-通知权限',
-      desc: '点击顶部提醒左侧x按钮',
+      desc: '点击顶部提醒左侧关闭按钮',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '@[id="com.qidian.QDReader:id/ivClose"] + [text^="开启推送"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12640242',
+          activityIds: 'com.afollestad.materialdialogs.MaterialDialog',
+          matches:
+            '@[id="com.qidian.QDReader:id/ivClose"] + [text^="开启推送"]',
+          snapshotUrls: 'https://i.gkd.li/i/12640242',
+        },
+      ],
     },
     {
       key: 5,
       name: '局部广告-悬浮广告',
       rules: [
-        {
-          key: 0,
-          name: '书架页面右侧悬浮广告',
-          activityIds: 'com.qidian.QDReader.ui.activity.MainGroupActivity',
-          fastQuery: true,
-          matches:
-            '[id="com.qidian.QDReader:id/ivAd"] + [id="com.qidian.QDReader:id/ivAdClose"]',
-          snapshotUrls: 'https://i.gkd.li/i/12717032',
-        },
         {
           key: 1,
-          name: '详情页右侧悬浮广告',
+          fastQuery: true,
-          activityIds: 'com.qidian.QDReader.ui.activity.QDBookDetailActivity',
+          activityIds: [
-          matches:
+            'com.qidian.QDReader.ui.activity.QDBookDetailActivity',
-            '[id="com.qidian.QDReader:id/floatingView"] + [id="com.qidian.QDReader:id/ivAdClose"]',
+            'com.qidian.QDReader.ui.activity.MainGroupActivity',
-          snapshotUrls: 'https://i.gkd.li/i/13459031',
+          ],
+          matches: '[id="com.qidian.QDReader:id/ivAdClose"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12717032',
+            'https://i.gkd.li/i/13459031',
+          ],
         },
       ],
     },
@@ -94,36 +113,50 @@ export default defineGkdApp({
       key: 10,
       name: '功能类-起点中文网登录自动确认',
       desc: '自动点击"登录"',
-      activityIds: 'com.qidian.QDReader.ui.activity.QDBrowserActivity',
+      rules: [
-      rules: '[id="scanLogin"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12903081',
+          activityIds: 'com.qidian.QDReader.ui.activity.QDBrowserActivity',
+          matches: '[id="scanLogin"]',
+          snapshotUrls: 'https://i.gkd.li/i/12903081',
+        },
+      ],
     },
     {
       key: 11,
       name: '局部广告-信息流广告',
-      desc: '自动点击"x"',
+      desc: '点击关闭',
-      activityIds: 'com.qidian.QDReader.flutter.DailyReadingMainPageActivity',
+      rules: [
-      rules: 'View[desc="更多游戏"] - ImageView[clickable=true]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13406169',
+          activityIds:
+            'com.qidian.QDReader.flutter.DailyReadingMainPageActivity',
+          matches: 'View[desc="更多游戏"] - ImageView[clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/13406169',
+        },
+      ],
     },
     {
       key: 12,
-      name: '功能类-福利中心看视频后获得奖励',
+      name: '其他-福利中心看视频后获得奖励',
-      desc: '自动点击“我知道了”',
+      desc: '点击[我知道了]',
-      activityIds: 'com.qidian.QDReader.ui.activity.QDBrowserActivity',
+      fastQuery: true,
-      actionMaximum: 1,
-      resetMatch: 'activity',
       matchTime: 10000,
-      rules: 'View[desc="我知道了"]',
+      actionMaximum: 1,
-      snapshotUrls: 'https://i.gkd.li/i/13606901',
+      rules: [
+        {
+          activityIds: 'com.qidian.QDReader.ui.activity.QDBrowserActivity',
+          matches:
+            '@View[desc="我知道了"][clickable=true] <<n [id="com.qidian.QDReader:id/webViewContainer"]',
+          snapshotUrls: 'https://i.gkd.li/i/13606901',
+        },
+      ],
     },
     {
       key: 13,
-      fastQuery: true,
       name: '全屏广告-红包弹窗',
       desc: '点击X',
       rules: [
         {
+          fastQuery: true,
           activityIds:
             'com.qidian.QDReader.ui.activity.hongbao_square.NewHongBaoSquareActivity',
           matches:
@@ -139,7 +172,10 @@ export default defineGkdApp({
         {
           fastQuery: true,
           activityIds: 'com.qidian.QDReader.ui.activity.QDBrowserActivity',
-          matches: '[text^="当前处于移动网络"]',
+          matches: [
+            '[text^="当前处于移动网络"]',
+            '@[clickable=true] >2 [text="播放"]',
+          ],
           exampleUrls:
             'https://m.gkd.li/57941037/ea612e44-12a9-405f-aa03-60a19cebef57',
           snapshotUrls: 'https://i.gkd.li/i/15857381',

src/apps/com.qiekj.user.ts

@@ -44,6 +44,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          activityIds: '.MainActivity',
           matches:
             '[id="com.qiekj.user:id/btn_cancelUpdate"][text*="暂不更新"]',
           snapshotUrls: 'https://i.gkd.li/i/13435011',

src/apps/com.qihoo.camera.ts

@@ -9,11 +9,10 @@ export default defineGkdApp({
       name: '局部广告-卡片广告',
       rules: [
         {
+          name: '云收藏弹窗广告',
           actionMaximum: 1,
           activityIds: 'com.qihoo.jia.playpage.RecordPlayActivity',
-          name: '云收藏弹窗广告',
+          matches: '@ImageView[clickable=true] +4 TextView[text="去开通"]',
-          matches:
-            'ViewGroup > @ImageView[clickable=true] -n TextView[text="云收藏"]',
           snapshotUrls: 'https://i.gkd.li/i/13630755',
         },
       ],

src/apps/com.qihoo.srouter.n300.ts

@@ -7,11 +7,16 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[vid="app_update_later_button"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13800011',
+          activityIds: 'com.ifenglian.superapp.ui.firewall.SAMainActivity',
+          matches: '[vid="app_update_later_button"]',
+          snapshotUrls: 'https://i.gkd.li/i/13800011',
+        },
+      ],
     },
   ],
 });

src/apps/com.qingdaonews.bus.ts

@@ -7,10 +7,10 @@ export default defineGkdApp({
     {
       key: 0,
       name: '全屏广告-弹窗广告',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
           matches: '[id="com.qingdaonews.bus:id/iv_native_dislike"]',

src/apps/com.qingwatq.weather.ts

@@ -10,6 +10,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          fastQuery: true,
           activityIds: 'com.qingwatq.weather.home.HomeActivity',
           matches:
             '[id="com.qingwatq.weather:id/titleArea"] + [id="com.qingwatq.weather:id/closeImg"]',

src/apps/com.qinlin.edoor.ts

@@ -24,34 +24,31 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          name: '穿山甲SDK',
           fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
+          activityIds: '.MainActivity',
+          matches: [
+            '[text="广告" || vid="interact_ad_root"]',
+            '[vid="iv_close"]',
+          ],
+          snapshotUrls: [
+            'https://i.gkd.li/i/13771774',
+            'https://i.gkd.li/i/13932707',
+          ],
+        },
+        {
+          key: 1,
+          activityIds: '.MainActivity',
           matches:
-            '@[id="com.qinlin.edoor:id/iv_close"] - LinearLayout >n [text*="广告"]',
+            '@ImageView[clickable=true] - [desc="立即领取" || desc="开心收下"]',
-          snapshotUrls: 'https://i.gkd.li/i/13771774',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12707736',
+            'https://i.gkd.li/i/12707738',
+          ],
         },
       ],
     },
-    {
-      key: 10,
-      name: '全屏广告-开门有奖弹窗',
-      activityIds: 'com.qinlin.edoor.MainActivity',
-      rules: '[desc="开门有奖"] +2 [desc="立即领取"] + ImageView',
-      snapshotUrls: 'https://i.gkd.li/i/12707736',
-    },
-    {
-      key: 11,
-      name: '全屏广告-获得金币弹窗',
-      activityIds: 'com.qinlin.edoor.MainActivity',
-      rules: ['[desc="获得金币"] +3 [desc="开心收下"] + ImageView'],
-      snapshotUrls: ['https://i.gkd.li/i/12707738'],
-    },
-    {
-      key: 12,
-      name: '全屏广告-开门成功后弹窗广告',
-      desc: '来自"腾讯广告sdk"',
-      rules: '[vid="interact_ad_root"] >2 [vid="iv_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/13932707',
-    },
   ],
 });

src/apps/com.qiyi.video.lite.ts

@@ -12,8 +12,12 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules: '@[clickable=true] >2 [text="关闭"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13797162',
+        {
+          matches: '@[clickable=true] >2 [text="关闭"]',
+          snapshotUrls: 'https://i.gkd.li/i/13797162',
+        },
+      ],
     },
   ],
 });

src/apps/com.qiyi.video.ts

@@ -12,10 +12,14 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules: '@LinearLayout > [text="关闭"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/13160866',
+          matches: '@LinearLayout > [text="关闭"]',
-        'https://i.gkd.li/i/13379565',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13160866',
+            'https://i.gkd.li/i/13379565',
+          ],
+        },
       ],
     },
     {
@@ -39,12 +43,17 @@ export default defineGkdApp({
     {
       key: 3,
       name: '权限提示-通知权限',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/12838152',
+        {
-      rules: '[id="com.qiyi.video:id/cancel_btn"][text="暂时不要"]',
+          activityIds: 'org.qiyi.android.video.MainActivity',
+          matches: '[id="com.qiyi.video:id/cancel_btn"][text="暂时不要"]',
+          snapshotUrls: 'https://i.gkd.li/i/12838152',
+        },
+      ],
     },
     {
       key: 4,
@@ -53,19 +62,27 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.qiyi.video:id/cancel_btn"][text="暂不升级"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/12838158',
+          activityIds: [
-        'https://i.gkd.li/i/13684912', //activityIds: 'org.qiyi.android.search.view.PhoneSearchActivity',
+            'org.qiyi.android.video.MainActivity',
+            'org.qiyi.android.search.view.PhoneSearchActivity',
+          ],
+          matches: '[id="com.qiyi.video:id/cancel_btn"][text="暂不升级"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12838158',
+            'https://i.gkd.li/i/13684912',
+          ],
+        },
       ],
     },
     {
       key: 5,
       name: '全屏广告-播放页-插入广告',
-      desc: '视频播放前或播放中途插入的广告。默认关闭。',
+      desc: '视频播放前或播放中途插入的广告',
-      activityIds: 'org.iqiyi.video.activity.PlayerActivity',
       rules: [
         {
+          activityIds: 'org.iqiyi.video.activity.PlayerActivity',
           matches:
             '@RelativeLayout[id="com.qiyi.video:id/unused_res_a"] > TextView[text="关闭广告"]',
           snapshotUrls: [

src/apps/com.qjy.youqulife.io.ts

@@ -7,14 +7,16 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 1,
           name: '快手广告',
-          activityIds: 'com.qjy.youqulife.io.MainActivity',
           fastQuery: true,
-          matches:
+          activityIds: 'com.qjy.youqulife.io.MainActivity',
-            '[text="广告"] <2 ViewGroup -n ViewGroup > ViewGroup > [text="跳过"]',
+          matches: ['[text="广告"] ', '[text="跳过"]'],
           snapshotUrls: 'https://i.gkd.li/i/13378653',
         },
       ],

src/apps/com.qq.ac.android.ts

@@ -7,10 +7,14 @@ export default defineGkdApp({
     {
       key: 2,
       name: '局部广告-漫画阅读页面-左侧悬浮广告',
-      activityIds: 'com.qq.ac.android.reader.comic.ComicReaderActivity',
+      rules: [
-      rules:
+        {
-        '[id="com.qq.ac.android:id/operation_ad_view"] > [id="com.qq.ac.android:id/btn_close"]',
+          activityIds: 'com.qq.ac.android.reader.comic.ComicReaderActivity',
-      snapshotUrls: 'https://i.gkd.li/i/12707756',
+          matches:
+            '[id="com.qq.ac.android:id/operation_ad_view"] > [id="com.qq.ac.android:id/btn_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12707756',
+        },
+      ],
     },
     {
       key: 3,

src/apps/com.qq.reader.ts

@@ -51,11 +51,13 @@ export default defineGkdApp({
     {
       key: 4,
       name: '更新提示-内测邀请弹窗',
+      fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
+          activityIds: 'com.tencent.upgrade.ui.UpgradeDialogActivity',
           matches: '[vid="upgrade_dialog_close_btn"][clickable=true]',
           exampleUrls:
             'https://m.gkd.li/57941037/03e35d57-5f40-4ccb-911a-5f9061eab46e',

src/apps/com.quark.browser.ts

@@ -4,24 +4,20 @@ export default defineGkdApp({
   id: 'com.quark.browser',
   name: '夸克浏览器',
   groups: [
-    {
-      key: 0,
-      name: '局部广告-小说阅读页面底部广告',
-      activityIds: 'com.ucpro.BrowserActivity',
-      rules: [
-        '[id="com.quark.browser:id/tv_close_ad"][text="关闭广告"]',
-        '[id="com.quark.browser:id/ad_close_layout_container"]',
-      ],
-    },
     {
       key: 2,
-      name: '功能类-设置默认浏览器提示',
+      name: '其他-设置默认浏览器提示',
       desc: '点击取消',
       fastQuery: true,
       actionMaximum: 1,
-      activityIds: 'com.ucpro.BrowserActivity',
+      resetMatch: 'app',
-      rules: '@Button[text="取消"] + Button[text="去设置"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13249469',
+        {
+          activityIds: 'com.ucpro.BrowserActivity',
+          matches: '@Button[text="取消"] + Button[text="去设置"]',
+          snapshotUrls: 'https://i.gkd.li/i/13249469',
+        },
+      ],
     },
     {
       key: 3,
@@ -33,6 +29,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          activityIds: 'com.ucpro.BrowserActivity',
           matches: ['[text*="版本更新" || text^="优化升级"]', '[text="取消"]'],
           snapshotUrls: [
             'https://i.gkd.li/i/13292512',
@@ -45,11 +42,16 @@ export default defineGkdApp({
     {
       key: 4,
       name: '全屏广告-弹窗广告',
-      fastQuery: true,
+      rules: [
-      actionMaximum: 1,
+        {
-      activityIds: 'com.ucpro.BrowserActivity',
+          fastQuery: true,
-      rules: 'ImageView[id="com.quark.browser:id/close_img"][clickable=true]',
+          actionMaximum: 1,
-      snapshotUrls: 'https://i.gkd.li/i/13292571',
+          activityIds: 'com.ucpro.BrowserActivity',
+          matches:
+            'ImageView[id="com.quark.browser:id/close_img"][clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/13292571',
+        },
+      ],
     },
   ],
 });

src/apps/com.quqi.quqioffice.ts

@@ -8,29 +8,29 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-私人云看图弹窗广告',
       desc: '在线私人云看图片自动弹出自动播放可跳过广告',
-      activityIds: [
-        'com.qq.e.ads.PortraitADActivity',
-        'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
-      ],
       rules: [
         {
+          key: 1,
+          activityIds: 'com.qq.e.ads.PortraitADActivity',
           matches:
-            'LinearLayout > FrameLayout > FrameLayout > ImageView[id=null]',
+            'TextView[text*="应用名称"] < LinearLayout -(2,3) [childCount=1] > FrameLayout[childCount=1] >(1,2) ImageView[childCount=0][id=null]',
           snapshotUrls: [
             'https://i.gkd.li/i/12854650',
             'https://i.gkd.li/i/12854723',
+            'https://i.gkd.li/i/12854664',
           ],
         },
         {
+          key: 2,
+          activityIds:
+            'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
           matches: 'TextView[text$="s"] + TextView[text$="跳过"]',
-          snapshotUrls: ['https://i.gkd.li/i/12877535'],
+          snapshotUrls: 'https://i.gkd.li/i/12877535',
-        },
-        {
-          matches:
-            'TextView[text*="应用名称"] < LinearLayout -2n FrameLayout > FrameLayout > ImageView[id=null]',
-          snapshotUrls: 'https://i.gkd.li/i/12854664',
         },
         {
+          key: 3,
+          activityIds:
+            'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
           matches:
             'ImageView[id="com.byted.pangle:id/tt_reward_full_count_down_after_close"]',
           snapshotUrls: 'https://i.gkd.li/i/12877540',

src/apps/com.rarlab.rar.ts

@@ -7,14 +7,18 @@ export default defineGkdApp({
     {
       key: 10,
       name: '全屏广告-订购 RAR 弹窗',
-      desc: '自动点击"放弃"',
+      desc: '点击[放弃]',
-      fastQuery: true,
+      rules: [
-      activityIds: 'com.rarlab.rar.MainActivity',
+        {
-      rules:
+          fastQuery: true,
-        '[text~="(订购|訂閱)"] + [id="android:id/button1"][text~="(放弃|解除)"]',
+          activityIds: 'com.rarlab.rar.MainActivity',
-      snapshotUrls: [
+          matches:
-        'https://i.gkd.li/i/12781596',
+            '[text="订购" || text="訂閱"] + [text="放弃" || text="解除"]',
-        'https://i.gkd.li/i/15801328',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12781596',
+            'https://i.gkd.li/i/15801328',
+          ],
+        },
       ],
     },
   ],

src/apps/com.realmecomm.app.ts

@@ -7,9 +7,11 @@ export default defineGkdApp({
     {
       key: 1,
       name: '功能类-自动签到',
+      fastQuery: true,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
-          fastQuery: true,
           activityIds: 'com.android.realme2.home.view.MainActivity',
           matches: '[text="签到"][clickable=true][visibleToUser=true]',
           exampleUrls:

src/apps/com.realtech.xiaocan.ts

@@ -38,6 +38,9 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
@@ -51,11 +54,17 @@ export default defineGkdApp({
     {
       key: 2,
       name: '功能类-签到成功弹窗',
-      desc: '自动点击[关闭]按钮',
+      desc: '点击[关闭]按钮',
-      activityIds: 'com.realtech.xiaocan.MainActivity',
+      actionMaximum: 1,
-      rules:
+      resetMatch: 'app',
-        '[id="android:id/content"] >5 View[childCount=6] > ImageView[index=5][clickable=true]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/14290847',
+        {
+          activityIds: 'com.realtech.xiaocan.MainActivity',
+          matches:
+            '[id="android:id/content"] >5 View[childCount=6] > ImageView[index=5][clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/14290847',
+        },
+      ],
     },
   ],
 });

src/apps/com.reddit.frontpage.ts

@@ -14,17 +14,17 @@ export default defineGkdApp({
           activityIds: 'com.reddit.launch.main.MainActivity',
           matches:
             '[vid="sheet_container"] > [vid="cancel_button"][text="Not Now"][clickable=true]',
+          exampleUrls: 'https://e.gkd.li/b640f2c9-4564-420f-8a2f-20f461032f3d',
           snapshotUrls: [
             'https://i.gkd.li/i/13649914',
             'https://i.gkd.li/i/17269009',
           ],
-          exampleUrls: 'https://e.gkd.li/b640f2c9-4564-420f-8a2f-20f461032f3d',
         },
       ],
     },
     {
       key: 4,
-      name: '功能类-NSFW 内容提示',
+      name: '其他-NSFW 内容提示',
       desc: '自动点击 continue',
       fastQuery: true,
       rules: [

src/apps/com.redfinger.app.ts

@@ -11,18 +11,26 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       fastQuery: true,
-      rules:
+      rules: [
-        '[id="com.redfinger.app:id/btn_update"] + [id="com.redfinger.app:id/iv_close"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13761821',
+          activityIds: '.activity.MainActivity',
+          matches:
+            '[id="com.redfinger.app:id/btn_update"] + [id="com.redfinger.app:id/iv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13761821',
+        },
+      ],
     },
     {
       key: 2,
       name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
-          activityIds: 'com.redfinger.app.activity.MainActivity',
           fastQuery: true,
+          activityIds: 'com.redfinger.app.activity.MainActivity',
           matches: '[id="com.redfinger.app:id/rl_screen_ad_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13761825',
         },

src/apps/com.rocoplayer.app.nm.ts

@@ -7,21 +7,32 @@ export default defineGkdApp({
     {
       key: 1,
       name: '通知提示-温馨提示弹窗',
+      fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="温馨提示"] +2 [text="确定"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/14304132',
+        {
+          activityIds: 'com.e4a.runtime.android.mainActivity',
+          matches: '[text="温馨提示"] +2 [text="确定"]',
+          snapshotUrls: 'https://i.gkd.li/i/14304132',
+        },
+      ],
     },
     {
       key: 2,
       name: '全屏广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           name: '腾讯广告',
+          fastQuery: true,
           activityIds: 'com.e4a.runtime.android.mainActivity',
           matches:
-            'ImageView - LinearLayout - FrameLayout > FrameLayout[index=2][childCount=1] > ImageView[childCount=0]',
+            '@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="跳转微信"]',
           snapshotUrls: 'https://i.gkd.li/i/14304134',
         },
       ],

src/apps/com.romielf.mrsc.ts

@@ -6,16 +6,19 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      name: '局部广告-新闻页面摇一摇广告',
+      name: '分段广告-新闻页面摇一摇广告',
       desc: '点击准确率灵敏度不太高',
       activityIds: 'com.romielf.mrsc.MainActivity',
       rules: [
         {
+          key: 1,
           matches: '@Image < View -n View >2 View[text="广告"]',
           snapshotUrls: 'https://i.gkd.li/i/12667539',
         },
         {
-          matches: '[id="com.byted.pangle:id/tt_item_tv"][text="不感兴趣"]', // 字节SDK广告
+          preKeys: [1],
+          key: 2,
+          matches: '[id="com.byted.pangle:id/tt_item_tv"][text="不感兴趣"]',
           snapshotUrls: 'https://i.gkd.li/i/12667549',
         },
       ],

src/apps/com.rytong.hnair.ts

@@ -7,9 +7,16 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
-      activityIds: 'com.hnair.airlines.ui.main.MainActivity',
+      matchTime: 10000,
-      rules: 'ImageView[id*="com.rytong.hnair:id/iv_cloes"]',
+      actionMaximum: 1,
-      snapshotUrls: 'https://i.gkd.li/i/12846381',
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.hnair.airlines.ui.main.MainActivity',
+          matches: 'ImageView[id*="com.rytong.hnair:id/iv_cloes"]',
+          snapshotUrls: 'https://i.gkd.li/i/12846381',
+        },
+      ],
     },
   ],
 });

src/apps/com.samsung.android.packageinstaller.ts

@@ -8,17 +8,18 @@ export default defineGkdApp({
       key: 2,
       name: '功能类-跳过安全使用协议',
       desc: '自动点击略过并关闭反恶意软件协议',
+      fastQuery: true,
       rules: [
-        {
-          key: 1,
-          matches: '[text *="略过"]',
-          snapshotUrls: 'https://i.gkd.li/i/13255641',
-        },
         {
           key: 0,
           matches: ['[text^="是否打开反恶意软件"]', '[text="取消"]'],
           snapshotUrls: 'https://i.gkd.li/i/13233686',
         },
+        {
+          key: 1,
+          matches: '[text="略过"]',
+          snapshotUrls: 'https://i.gkd.li/i/13255641',
+        },
         {
           key: 2,
           matches: ['[text^="打开应用程序保护?"]', '[text="取消"]'],

src/apps/com.sankuai.meituan.dispatch.crowdsource.ts

@@ -25,7 +25,7 @@ export default defineGkdApp({
     },
     {
       key: 2,
-      name: '功能类-[保级成功]弹窗',
+      name: '其他-[保级成功]弹窗',
       desc: '点击关闭',
       rules: [
         {

src/apps/com.sankuai.meituan.takeoutnew.ts

@@ -11,27 +11,23 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.sankuai.meituan.takeoutnew:id/wm_upgrade_force_cancel"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/13415044',
+          activityIds: 'com.sankuai.waimai.business.page.homepage.MainActivity',
-        'https://i.gkd.li/i/13276882',
+          matches:
+            '[id="com.sankuai.meituan.takeoutnew:id/wm_upgrade_force_cancel"]',
+          snapshotUrls: 'https://i.gkd.li/i/13415044',
+        },
       ],
     },
     {
       key: 3,
       name: '全屏广告-弹窗广告',
-      activityIds:
-        'com.sankuai.waimai.bussiness.order.detail.WMOrderDetailActivity',
       rules: [
-        {
-          key: 0,
-          name: '美团买药弹窗-点击[暂时放弃]',
-          matches:
-            '[text="送亲友"] <2 FrameLayout[childCount=2] > [text="暂时放弃"][clickable=true]',
-        },
         {
           key: 1,
-          name: '领取外卖神卷-点击底部"x"',
+          activityIds:
+            'com.sankuai.waimai.bussiness.order.detail.WMOrderDetailActivity',
           matches:
             '@ImageView[clickable=true] - FrameLayout > FrameLayout > FrameLayout TextView[text="点我领取"]',
           snapshotUrls: 'https://i.gkd.li/i/13175526',

src/apps/com.sankuai.meituan.ts

@@ -7,16 +7,25 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules:
+        {
-        'TextView[text^="新版本"] - Button[id="com.sankuai.meituan:id/btn_close"]',
+          activityIds: [
-      snapshotUrls: [
+            'com.meituan.android.upgrade.ui.f',
-        'https://i.gkd.li/i/12614559',
+            'com.meituan.android.upgrade.UpgradeDialogActivity',
-        'https://i.gkd.li/i/12673132',
+            'com.meituan.android.pt.homepage.activity.MainActivity',
-        'https://i.gkd.li/i/13292635',
+          ],
+          matches:
+            'TextView[text^="新版本"] - Button[id="com.sankuai.meituan:id/btn_close"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12614559',
+            'https://i.gkd.li/i/12673132',
+            'https://i.gkd.li/i/13292635',
+          ],
+        },
       ],
     },
     {
@@ -90,19 +99,24 @@ export default defineGkdApp({
     {
       key: 3,
       name: '评价提示-订单调查弹窗',
-      matchTime: 10000,
-      actionMaximum: 1,
       fastQuery: true,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          key: 1,
           name: '我的页面-小调查',
           action: 'back',
+          activityIds: 'com.meituan.retail.c.android.mrn.mrn.MallMrnModal',
           matches: 'TextView[text="小调查"]',
           snapshotUrls: 'https://i.gkd.li/i/12639723',
         },
         {
+          key: 2,
           name: '订单详情页匿名调查',
           action: 'back',
+          activityIds:
+            'com.sankuai.waimai.bussiness.order.detail.WMOrderDetailActivity',
           matches: '[id="com.sankuai.meituan:id/questionnaireTitle"]',
           snapshotUrls: 'https://i.gkd.li/i/13682336',
         },
@@ -189,6 +203,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.meituan.android.pt.homepage.activity.MainActivity',
           matches: '@[vid="iv_close" || text="跳过"] -(1,2) [text^="开启通知"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13439134',
@@ -200,11 +215,15 @@ export default defineGkdApp({
     {
       key: 10,
       name: '全屏广告-新人返场特惠',
-      desc: '点击右上角返回',
+      desc: '点击左上角返回',
-      activityIds: 'com.meituan.android.base.knb.KNBWebViewActivity',
+      rules: [
-      matchTime: 10000,
+        {
-      rules: '[id="shareNav"] > [text=""]',
+          matchTime: 10000,
-      snapshotUrls: 'https://i.gkd.li/i/13800691',
+          activityIds: 'com.meituan.android.base.knb.KNBWebViewActivity',
+          matches: '[id="shareNav"] > [text=""]',
+          snapshotUrls: 'https://i.gkd.li/i/13800691',
+        },
+      ],
     },
     {
       key: 11,

src/apps/com.sankuai.movie.ts

@@ -1,22 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.sankuai.movie',
-  name: '猫眼',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      fastQuery: true,
-      rules: '[text^="更新"] +(3) LinearLayout > [text="取消"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/12649942',
-        'https://i.gkd.li/i/12649938',
-        'https://i.gkd.li/i/13799885',
-      ],
-    },
-  ],
-});

src/apps/com.schunshang.bij.niuniu.ts

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

src/apps/com.sdhs.easy.high.road.ts

@@ -11,11 +11,10 @@ export default defineGkdApp({
         {
           key: 0,
           name: '腾讯广告',
+          fastQuery: true,
           activityIds: 'com.sdhs.easy.main.activity.MainActivity',
-          matches: [
+          matches:
-            '[desc^="logoad"]',
+            '[desc^="dislike"] > @View[clickable=true][visibleToUser=true] <<n [id="com.sdhs.easy.high.road:id/express_container"]',
-            '[desc^="dislike"] > View[clickable=true]',
-          ],
           snapshotUrls: 'https://i.gkd.li/i/13670340',
         },
       ],

src/apps/com.sdu.didi.gsui.ts

@@ -6,11 +6,11 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      fastQuery: true,
       name: '全屏广告-弹窗广告',
-      desc: '点击X',
+      desc: '点击关闭',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.sdu.didi.gsui.main.MainActivity',
           matches: '[id="com.sdu.didi.gsui:id/main_dialog_banner_image_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13958887',

src/apps/com.sdu.didi.psnger.ts

@@ -10,6 +10,7 @@ export default defineGkdApp({
       desc: '点击卡片广告左上角x',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.didi.sdk.app.MainActivity',
           matches:
             'ImageView[id="com.sdu.didi.psnger:id/second_entrance_img"] + @ImageView[id="com.sdu.didi.psnger:id/left_close_img"]',
@@ -26,6 +27,7 @@ export default defineGkdApp({
       rules: [
         {
           fastQuery: true,
+          activityIds: 'com.didi.sdk.app.MainActivity',
           matches: '[vid="iv_upgrade_btn_ignore"]',
           exampleUrls:
             'https://m.gkd.li/57941037/ba2a4ef6-d63d-4d67-ab89-222085ea3b3f',

src/apps/com.sec.android.app.samsungapps.ts

@@ -22,7 +22,7 @@ export default defineGkdApp({
     },
     {
       key: 1,
-      name: '功能类-[您是否年满 18 岁？]弹窗',
+      name: '其他-[您是否年满 18 岁？]弹窗',
       desc: '点击[是]',
       rules: [
         {

src/apps/com.seebaby.ts

@@ -10,8 +10,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[id="com.seebaby:id/btn_later"] + [text$="新版本"]',
+      rules: [
-      snapshotUrls: ['https://i.gkd.li/i/12705351'],
+        {
+          activityIds: '.login.ui.activity.LauncherActivity',
+          matches: '@[id="com.seebaby:id/btn_later"] + [text$="新版本"]',
+          snapshotUrls: 'https://i.gkd.li/i/12705351',
+        },
+      ],
     },
     {
       key: 2,
@@ -26,21 +31,21 @@ export default defineGkdApp({
           matches:
             '[id="com.seebaby:id/tv_ad_detail"] + [id="com.seebaby:id/ic_delad"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/12705353', // activityId: 'com.seebaby.login.ui.activity.LauncherActivity'
+            'https://i.gkd.li/i/12705353',
-            'https://i.gkd.li/i/12705363', // activityIds: 'com.seebaby.parent.article.ui.activity.NativeArticleDetailActivity'
+            'https://i.gkd.li/i/12705363',
           ],
         },
         {
           key: 2,
           matches:
             '[id="com.seebaby:id/ad_tv_advertiser"] + [id="com.seebaby:id/ad_iv_close"]',
-          snapshotUrls: ['https://i.gkd.li/i/12705372'],
+          snapshotUrls: 'https://i.gkd.li/i/12705372',
         },
         {
           preKeys: [1, 2],
           key: 3,
           matches: '[id="com.seebaby:id/tv_un_instrest"]',
-          snapshotUrls: ['https://i.gkd.li/i/12705358'],
+          snapshotUrls: 'https://i.gkd.li/i/12705358',
         },
       ],
     },

src/apps/com.sf.activity.ts

@@ -26,6 +26,7 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      activityIds: '.MainActivity',
       rules: [
         {
           key: 0,
@@ -37,14 +38,14 @@ export default defineGkdApp({
           key: 1,
           fastQuery: true,
           matches:
-            '@Button[desc="取消"] - ViewGroup >3 [text="立即升级"] <2 Button <2 ViewGroup < ViewGroup <3 ViewGroup <2 ViewGroup < ViewGroup <2 ViewGroup < ViewGroup < FrameLayout < [id="com.sf.activity:id/rnRootLayout"]',
+            '@Button[desc="取消"] - ViewGroup >3 [visibleToUser=true][text="立即升级"] <<n [id="com.sf.activity:id/rnRootLayout"]',
           snapshotUrls: 'https://i.gkd.li/i/13291144',
         },
       ],
     },
     {
       key: 2,
-      name: '功能类-专属月报弹窗',
+      name: '其他-专属月报弹窗',
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',

src/apps/com.sgcc.evs.echarge.ts

@@ -6,9 +6,12 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      fastQuery: true,
       name: '全屏广告-首页弹窗广告',
-      desc: '点击X',
+      desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: [
@@ -17,8 +20,8 @@ export default defineGkdApp({
           ],
           matches: '[id="com.sgcc.evs.echarge:id/iv_close"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/13958838', //com.evs.echarge.dev.ui.advertisement.SplashActivity
+            'https://i.gkd.li/i/13958838',
-            'https://i.gkd.li/i/14005508', //com.evs.echarge.dev.ui.MainActivity
+            'https://i.gkd.li/i/14005508',
           ],
         },
       ],

src/apps/com.sgcc.wsgw.cn.ts

@@ -23,7 +23,7 @@ export default defineGkdApp({
           ],
         },
         {
-          preKeys: 1,
+          preKeys: [1],
           key: 2,
           actionDelay: 300, //测试时没有delay点击失效
           matches:
@@ -34,13 +34,13 @@ export default defineGkdApp({
           ],
         },
         {
-          preKeys: 1,
+          preKeys: [1],
           key: 3,
           actionDelay: 300,
           fastQuery: true,
           matches:
             '[id="com.sgcc.wsgw.cn:id/news_remind_laytout"] >n [id="com.sgcc.wsgw.cn:id/btn_remind_close"]',
-          snapshotUrls: ['https://i.gkd.li/i/12745042'],
+          snapshotUrls: 'https://i.gkd.li/i/12745042',
         },
       ],
     },
@@ -51,8 +51,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@ImageView < ViewGroup -3 [text="有新版本啦!"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13501638',
+        {
+          activityIds: 'com.sgcc.wsgw.rnbundle.activity.HomeReactActivity',
+          matches: '@ImageView < ViewGroup -3 [text="有新版本啦!"]',
+          snapshotUrls: 'https://i.gkd.li/i/13501638',
+        },
+      ],
     },
   ],
 });

src/apps/com.shangfang.gylm.ts

@@ -7,12 +7,17 @@ export default defineGkdApp({
     {
       key: 2,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[id="com.shangfang.gylm:id/iv_upgrade_close"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13643599',
+          activityIds: '.mvp.ui.home.activity.UpdateActivityV2',
+          matches: '[id="com.shangfang.gylm:id/iv_upgrade_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13643599',
+        },
+      ],
     },
   ],
 });

src/apps/com.shanghaionstar.ts

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

src/apps/com.shark.jizhang.ts

@@ -6,17 +6,31 @@ export default defineGkdApp({
   groups: [
     {
       key: 0,
-      name: '局部广告-新用户特惠广告',
+      name: '局部广告-悬浮广告',
-      desc: '弹窗广告,右下角浮动广告',
-      activityIds: 'com.shark.jizhang.module.main.MainActivity',
       rules: [
         {
+          activityIds: '.module.main.MainActivity',
           matches:
-            '[id="com.shark.jizhang:id/buy_later_view"||id="com.shark.jizhang:id/tv_count_down"] - [id="com.shark.jizhang:id/close_view"]',
+            '[id="com.shark.jizhang:id/float_btn"] >2 [id="com.shark.jizhang:id/close_view"]',
-          snapshotUrls: [
+          exampleUrls: 'https://e.gkd.li/b64da622-2632-4140-930b-89d0f8cbdee1',
-            'https://i.gkd.li/i/12518500',
+          snapshotUrls: 'https://i.gkd.li/i/12518517',
-            'https://i.gkd.li/i/12518517',
+        },
-          ],
+      ],
+    },
+    {
+      key: 1,
+      name: '全屏广告-弹窗广告',
+      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: '.module.main.MainActivity',
+          matches:
+            '[id="com.shark.jizhang:id/sdv_image"] + [id="com.shark.jizhang:id/close_view"]',
+          exampleUrls: 'https://e.gkd.li/1cad4c8f-fdb0-4608-8398-2c22d81d435d',
+          snapshotUrls: 'https://i.gkd.li/i/12518500',
         },
       ],
     },

src/apps/com.shinyv.cnr.ts

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

src/apps/com.shizhuang.duapp.ts

@@ -6,14 +6,18 @@ export default defineGkdApp({
   groups: [
     {
       key: 4,
-      name: '功能类-截屏分享',
+      name: '其他-截屏分享',
       desc: '关闭截屏时app弹出的分享弹窗',
-      fastQuery: true,
+      rules: [
-      activityIds:
+        {
-        'com.shizhuang.duapp.modules.product_detail.detailv4.ui.ProductDetailActivityV4',
+          fastQuery: true,
-      rules:
+          activityIds:
-        '[id="com.shizhuang.duapp:id/ivClose"] +2 [id="com.shizhuang.duapp:id/ivSave"]',
+            'com.shizhuang.duapp.modules.product_detail.detailv4.ui.ProductDetailActivityV4',
-      snapshotUrls: 'https://i.gkd.li/i/13473449',
+          matches:
+            '[id="com.shizhuang.duapp:id/ivClose"] +2 [id="com.shizhuang.duapp:id/ivSave"]',
+          snapshotUrls: 'https://i.gkd.li/i/13473449',
+        },
+      ],
     },
   ],
 });

src/apps/com.showstartfans.activity.ts

@@ -7,12 +7,15 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
+          fastQuery: true,
           activityIds:
             'com.showstartfans.activity.activitys.maintab.newmain.MainNewActivity',
-          fastQuery: true,
           matches: '[id="com.showstartfans.activity:id/img_close_coupon"]',
           snapshotUrls: 'https://i.gkd.li/i/13670432',
         },

src/apps/com.shuqi.controller.ts

@@ -7,16 +7,29 @@ export default defineGkdApp({
     {
       key: 0,
       name: '局部广告-内部右侧浮动广告',
-      activityIds: 'com.shuqi.home.MainActivity',
+      actionMaximum: 1,
-      rules: '[id="com.shuqi.controller:id/promotion_close"]',
+      resetMatch: 'app',
-      snapshotUrls: 'https://i.gkd.li/i/12513811',
+      rules: [
+        {
+          activityIds: 'com.shuqi.home.MainActivity',
+          matches: '[id="com.shuqi.controller:id/promotion_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12513811',
+        },
+      ],
     },
     {
       key: 1,
       name: '全屏广告-关闭打卡红包弹窗',
-      activityIds: 'com.shuqi.common',
+      matchTime: 10000,
-      rules: '[id="com.shuqi.controller:id/bottomCloseImg"]',
+      actionMaximum: 1,
-      snapshotUrls: 'https://i.gkd.li/i/12513822',
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.shuqi.common',
+          matches: '[id="com.shuqi.controller:id/bottomCloseImg"]',
+          snapshotUrls: 'https://i.gkd.li/i/12513822',
+        },
+      ],
     },
     {
       key: 2,
@@ -61,10 +74,12 @@ export default defineGkdApp({
       activityIds: 'com.shuqi.audio.online.view.AudioBookActivity',
       rules: [
         {
+          key: 1,
           matches: '[id="com.shuqi.controller:id/remove_current_ad"]',
           snapshotUrls: 'https://i.gkd.li/i/12513959',
         },
         {
+          key: 2,
           matches: '[id="com.shuqi.controller:id/ad_close_but"]',
           snapshotUrls: 'https://i.gkd.li/i/12513944',
         },

src/apps/com.sina.oasis.ts

@@ -19,7 +19,7 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/13434468',
         },
         {
-          preKeys: 0,
+          preKeys: [0],
           matches: '@LinearLayout > [text*="关闭此广告"][text.length<=10]',
           snapshotUrls: 'https://i.gkd.li/i/13498631',
         },

src/apps/com.sina.weibo.ts

@@ -9,30 +9,49 @@ export default defineGkdApp({
       name: '全屏广告-兴趣领域推荐',
       desc: '出现在长久未登录的账户再次登录时',
       fastQuery: true,
-      activityIds: 'com.sina.weibo.account.interest.InterestActivity',
+      matchTime: 10000,
-      rules:
+      actionMaximum: 1,
-        '[id="com.sina.weibo:id/rl_account_title_bar"] > [id="com.sina.weibo:id/tv_title_bar_skip"][text="跳过"]',
+      resetMatch: 'app',
-      snapshotUrls: 'https://i.gkd.li/i/12531405',
+      rules: [
+        {
+          activityIds: 'com.sina.weibo.account.interest.InterestActivity',
+          matches:
+            '[id="com.sina.weibo:id/rl_account_title_bar"] > [id="com.sina.weibo:id/tv_title_bar_skip"][text="跳过"]',
+          snapshotUrls: 'https://i.gkd.li/i/12531405',
+        },
+      ],
     },
     {
       key: 4,
       name: '全屏广告-精选博主推荐',
       desc: '出现在长久未登录的账户再次登录时',
       fastQuery: true,
-      activityIds: 'com.sina.weibo.account.recommend.RecommendActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
-        '[id="com.sina.weibo:id/tv_option"&&text="取消勾选"]',
+        {
-        '[id="com.sina.weibo:id/new_next_btn"&&text="进入微博（已选0个）"]',
+          key: 1,
-      ],
+          activityIds: '.account.recommend.RecommendActivity',
-      snapshotUrls: [
+          matches: '[text="取消勾选"]',
-        'https://i.gkd.li/i/12531433',
+          exampleUrls: 'https://e.gkd.li/a0602466-0f1e-4ab9-8a0d-27a4364d1ff8',
-        'https://i.gkd.li/i/12531434',
+          snapshotUrls: 'https://i.gkd.li/i/12531433',
+        },
+        {
+          preKeys: [1],
+          key: 2,
+          activityIds:
+            'com.oplusos.systemui.volume.VolumeDialogImplEx$CustomDialog',
+          matches: '[text="跳过"]',
+          exampleUrls: 'https://e.gkd.li/c20bec5d-f4e1-4765-9ba0-ca645b27e434',
+          snapshotUrls: 'https://i.gkd.li/i/12531434',
+        },
       ],
     },
     {
       key: 5,
       name: '局部广告-博文内容区与评论区中间卡片广告',
-      desc: '点击右上角x',
+      desc: '点击右上角关闭',
       fastQuery: true,
       rules: [
         {
@@ -66,7 +85,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          activityIds: ['com.sina.weibo.feed.DetailWeiboActivity'],
+          activityIds: 'com.sina.weibo.feed.DetailWeiboActivity',
           matches:
             'RelativeLayout[visibleToUser=true] - RelativeLayout >n @[id="com.sina.weibo:id/ll_close"] > [id="com.sina.weibo:id/tv_tips"] + [id="com.sina.weibo:id/iv_close_icon"]',
           snapshotUrls: [
@@ -91,11 +110,15 @@ export default defineGkdApp({
     {
       key: 7,
       name: '局部广告-首页顶部话题分享窗口',
-      fastQuery: true,
+      rules: [
-      activityIds: 'com.sina.weibo.MainTabActivity',
+        {
-      rules:
+          fastQuery: true,
-        '[id="com.sina.weibo:id/tvGuide"] + [id="com.sina.weibo:id/v_close"] + [id="com.sina.weibo:id/iv_close"]',
+          activityIds: 'com.sina.weibo.MainTabActivity',
-      snapshotUrls: 'https://i.gkd.li/i/12705972',
+          matches:
+            '[id="com.sina.weibo:id/tvGuide"] + [id="com.sina.weibo:id/v_close"] + [id="com.sina.weibo:id/iv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12705972',
+        },
+      ],
     },
     {
       key: 8,
@@ -147,18 +170,19 @@ export default defineGkdApp({
       name: '权限提示-通知权限',
       desc: '自动点击暂不开启',
       fastQuery: true,
-      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
           key: 0,
+          activityIds: '.notifyguidev2.NotifyGuideV2Activity',
           matches:
             '@[id="com.sina.weibo:id/bt_cancel"][text="暂不开启"] + [id="com.sina.weibo:id/bt_confirm"]',
           snapshotUrls: 'https://i.gkd.li/i/12705979',
         },
         {
           key: 1,
+          activityIds: '.MainTabActivity',
           matches:
             '[text^="打开通知"] < LinearLayout + ImageView[id="com.sina.weibo:id/right_icon"]',
           snapshotUrls: 'https://i.gkd.li/i/12705986',
@@ -170,10 +194,17 @@ export default defineGkdApp({
       name: '局部广告-首页顶部签到卡片',
       desc: '自动点击x按钮',
       fastQuery: true,
-      activityIds: 'com.sina.weibo.MainTabActivity',
+      matchTime: 10000,
-      rules:
+      actionMaximum: 1,
-        '[id="com.sina.weibo:id/ll_check_in_container"] < FrameLayout - FrameLayout > TextView + [id="com.sina.weibo:id/v_close"]',
+      resetMatch: 'app',
-      snapshotUrls: 'https://i.gkd.li/i/12749876',
+      rules: [
+        {
+          activityIds: 'com.sina.weibo.MainTabActivity',
+          matches:
+            '[id="com.sina.weibo:id/ll_check_in_container"] < FrameLayout - FrameLayout > TextView + [id="com.sina.weibo:id/v_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12749876',
+        },
+      ],
     },
     {
       key: 13,
@@ -228,6 +259,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          activityIds: ['.MainTabActivity', '.utils.WeiboDialog$CustomDialog'],
           matches: '@[text="以后再说"] +2 [text="去开启"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13218093',
@@ -236,6 +268,7 @@ export default defineGkdApp({
         },
         {
           key: 1,
+          activityIds: '.MainTabActivity',
           matches:
             '@[id="com.sina.weibo:id/btn_close"] +2 [text="使用您的位置信息"]',
           snapshotUrls: 'https://i.gkd.li/i/13255595',
@@ -324,15 +357,20 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="不了，谢谢"] +4 [text="喜欢，给好评"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13620220',
+        {
+          activityIds: '.MainTabActivity',
+          matches: '@[text="不了，谢谢"] +4 [text="喜欢，给好评"]',
+          snapshotUrls: 'https://i.gkd.li/i/13620220',
+        },
+      ],
     },
     {
       key: 19,
-      fastQuery: true,
       name: '功能类-自动点击查看原图',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.sina.weibo.photoalbum.imageviewer.ImageViewer',
           matches: '@LinearLayout >3 [vid="tv_dialog_item"][text^="原图"]',
           snapshotUrls: 'https://i.gkd.li/i/13929119',

src/apps/com.sina.weibocare.ts

@@ -8,10 +8,14 @@ export default defineGkdApp({
       key: 1,
       name: '功能类-流量继续播放视频',
       desc: '点击[播放]',
-      fastQuery: true,
+      rules: [
-      activityIds: 'com.weico.international.activity.MainFragmentActivity',
+        {
-      rules: '[id="com.sina.weibocare:id/ed_btn_positive"][text="播放"]',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/13253223',
+          activityIds: 'com.weico.international.activity.MainFragmentActivity',
+          matches: '[id="com.sina.weibocare:id/ed_btn_positive"][text="播放"]',
+          snapshotUrls: 'https://i.gkd.li/i/13253223',
+        },
+      ],
     },
   ],
 });

src/apps/com.sina.weibolite.ts

@@ -43,8 +43,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.sina.weibolite:id/ed_btn_negative"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13727728',
+        {
+          activityIds: 'com.weico.international.activity.MainFragmentActivity',
+          matches: '[id="com.sina.weibolite:id/ed_btn_negative"]',
+          snapshotUrls: 'https://i.gkd.li/i/13727728',
+        },
+      ],
     },
   ],
 });

src/apps/com.sinovatech.unicom.ui.ts

@@ -10,14 +10,18 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: [
+      rules: [
-        'com.sinovatech.unicom.basic.ui.activity.MainActivity',
+        {
-        'com.sinovatech.unicom.basic.ui.activity.WelcomeClient',
+          activityIds: [
-      ],
+            'com.sinovatech.unicom.basic.ui.activity.MainActivity',
-      rules: '[text="去开启"] - [vid="custom_dialog_cancel_button"]',
+            'com.sinovatech.unicom.basic.ui.activity.WelcomeClient',
-      snapshotUrls: [
+          ],
-        'https://i.gkd.li/i/13331268',
+          matches: '[text="去开启"] - [vid="custom_dialog_cancel_button"]',
-        'https://i.gkd.li/i/14751210',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13331268',
+            'https://i.gkd.li/i/14751210',
+          ],
+        },
       ],
     },
     {
@@ -27,13 +31,22 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id="com.sinovatech.unicom.ui:id/custom_dialog_cancel_button"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13511386',
+        {
+          activityIds: 'com.sinovatech.unicom.basic.ui.activity.MainActivity',
+          matches:
+            '[id="com.sinovatech.unicom.ui:id/custom_dialog_cancel_button"]',
+          snapshotUrls: 'https://i.gkd.li/i/13511386',
+        },
+      ],
     },
     {
       key: 3,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
@@ -54,11 +67,11 @@ export default defineGkdApp({
     },
     {
       key: 4,
-      fastQuery: true,
       name: '局部广告-首页右下角卡片悬浮窗',
-      desc: '点击X',
+      desc: '点击关闭',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.sinovatech.unicom.basic.ui.activity.MainActivity',
           matches: '[id="com.sinovatech.unicom.ui:id/home_xuanfu_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13930543',

src/apps/com.sjm.xiaodesecond.mw.ts

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

src/apps/com.sjm.zhuanzhuan.mcy.ts

@@ -7,16 +7,15 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
           key: 1,
-          name: '更新弹窗',
-          matches:
-            '[id="com.sjm.zhuanzhuan.mcy:id/tv_new_version"] < LinearLayoutCompat +n [text="立即升级"]',
           action: 'back',
+          matches: '[text="立即升级"][visibleToUser=true]',
           snapshotUrls: 'https://i.gkd.li/i/13392514',
         },
       ],

src/apps/com.sjmly.sjmtask.xsh.ts

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

src/apps/com.smile.gifmaker.ts

@@ -7,10 +7,14 @@ export default defineGkdApp({
     {
       key: 10,
       name: '全屏广告-首页红包弹窗',
-      desc: '自动点击x按钮',
+      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       activityIds: 'com.yxcorp.gifshow.HomeActivity',
       rules: [
         {
+          key: 1,
           name: '老友回归红包弹窗',
           matches:
             '@ImageView[id=null][clickable=true] + ViewGroup > [text!=null] + [text!=null]',
@@ -20,17 +24,18 @@ export default defineGkdApp({
           ],
         },
         {
+          key: 2,
           name: '限时高额奖励弹窗',
           matches:
             '@ImageView[id=null][clickable=true] < ViewGroup + ViewGroup >2 [text="立即领取"]',
-          snapshotUrls: ['https://i.gkd.li/i/12708681'],
+          snapshotUrls: 'https://i.gkd.li/i/12708681',
         },
       ],
     },
     {
       key: 11,
       name: '局部广告-首页左侧红包悬浮控件',
-      desc: '自动点击x按钮',
+      desc: '点击关闭',
       activityIds: 'com.yxcorp.gifshow.HomeActivity',
       rules: [
         {
@@ -75,11 +80,12 @@ export default defineGkdApp({
     {
       key: 13,
       name: '评价提示',
+      fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
+          activityIds: 'com.yxcorp.gifshow.HomeActivity',
           matches: '@[vid="close"] +2 * > [text="喜欢就给个好评吧"]',
           exampleUrls:
             'https://m.gkd.li/57941037/da412e0f-47db-4cc0-8821-184c6ba42882',

src/apps/com.smk.ts

@@ -11,14 +11,18 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: [
+      rules: [
-        'com.smk.activity.MainActivity',
+        {
-        'com.smk.activity.LaunchActivity',
+          activityIds: [
-      ],
+            'com.smk.activity.MainActivity',
-      rules: '[id="com.smk:id/iv_close_ad"]',
+            'com.smk.activity.LaunchActivity',
-      snapshotUrls: [
+          ],
-        'https://i.gkd.li/i/13402584',
+          matches: '[id="com.smk:id/iv_close_ad"]',
-        'https://i.gkd.li/i/13425013', // activityIds: 'com.smk.activity.LaunchActivity',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13402584',
+            'https://i.gkd.li/i/13425013',
+          ],
+        },
       ],
     },
   ],

src/apps/com.smzdm.client.android.ts

@@ -6,32 +6,50 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      fastQuery: true,
       name: '全屏广告-弹窗广告',
-      activityIds: 'com.smzdm.client.android.app.HomeActivity',
+      fastQuery: true,
-      rules: '[id="com.smzdm.client.android:id/dialog_home_close"]',
+      matchTime: 10000,
-      snapshotUrls: 'https://i.gkd.li/i/12695751',
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.smzdm.client.android.app.HomeActivity',
+          matches: '[id="com.smzdm.client.android:id/dialog_home_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12695751',
+        },
+      ],
     },
     {
       key: 2,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules:
+        {
-        '[id="com.smzdm.client.android:id/tv_version"] +2 [id="com.smzdm.client.android:id/iv_close"]',
+          activityIds: '.app.HomeActivity',
-      snapshotUrls: 'https://i.gkd.li/i/13198016',
+          matches:
+            '[id="com.smzdm.client.android:id/tv_version"] +2 [id="com.smzdm.client.android:id/iv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13198016',
+        },
+      ],
     },
     {
       key: 10,
       name: '权限提示-请求读取剪贴板权限弹窗',
+      desc: '点击暂不允许',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.smzdm.client.android.app.HomeActivity',
+      rules: [
-      rules: '@[text="暂不允许"] + [text="允许"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13198020',
+          activityIds: 'com.smzdm.client.android.app.HomeActivity',
+          matches: '@[text="暂不允许"] + [text="允许"]',
+          snapshotUrls: 'https://i.gkd.li/i/13198020',
+        },
+      ],
     },
     {
       key: 3,
@@ -40,10 +58,18 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: 'ImageView[id="com.smzdm.client.android:id/ib_close"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/13438810', //com.smzdm.client.android.module.community.module.bask.BaskDetailActivity
+          activityIds: [
-        'https://i.gkd.li/i/13626746', //com.smzdm.client.android.module.haojia.detail.HaojiaDetailActivity
+            '.module.haojia.detail.HaojiaDetailActivity',
+            '.module.community.module.bask.BaskDetailActivity',
+          ],
+          matches: 'ImageView[id="com.smzdm.client.android:id/ib_close"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13438810',
+            'https://i.gkd.li/i/13626746',
+          ],
+        },
       ],
     },
   ],

src/apps/com.snda.wifilocating.ts

@@ -51,8 +51,8 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          activityIds: 'com.wifitutu.ui.tools.SpeedUpBActivity',
           fastQuery: true,
+          activityIds: 'com.wifitutu.ui.tools.SpeedUpBActivity',
           matches: '[vid="native_express_close_proxy"]',
           snapshotUrls: 'https://i.gkd.li/i/14622506',
         },
@@ -93,7 +93,7 @@ export default defineGkdApp({
           key: 0,
           fastQuery: true,
           activityIds: 'com.wifitutu.ui.main.MainActivity',
-          matches: '@* - [vid="native_express_ad_logo_tv"]',
+          matches: '[vid="native_express_ad_close"]',
           snapshotUrls: 'https://i.gkd.li/i/15284730',
         },
       ],

src/apps/com.sobo.app.ts

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

src/apps/com.sodalife.sodax.ts

@@ -19,6 +19,9 @@ export default defineGkdApp({
         {
           key: 10,
           name: '双十一广告',
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
           activityIds:
             'com.sodalife.sodax.libraries.ads.gromore.GroMoreSplashActivity',
           matches:

src/apps/com.soft.blued.ts

@@ -20,7 +20,7 @@ export default defineGkdApp({
           snapshotUrls: [
             'https://i.gkd.li/i/12777097',
             'https://i.gkd.li/i/13694950',
-            'https://i.gkd.li/i/13699455', // activityIds: 'com.soft.blued.ui.home.HomeActivity',
+            'https://i.gkd.li/i/13699455',
           ],
         },
         {
@@ -60,11 +60,14 @@ export default defineGkdApp({
     {
       key: 3,
       name: '全屏广告-会员活动弹窗',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           activityIds: 'com.blued.android.core.ui.TransparentActivity',
-          fastQuery: true,
           matches: '[vid="blued_ad_layout"] + [vid="img_close"]',
           snapshotUrls: 'https://i.gkd.li/i/14310618',
         },

src/apps/com.sohu.sohuvideo.ts

@@ -11,9 +11,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '@[id="com.sohu.sohuvideo:id/ivClose"] + LinearLayout [text="新版本上线啦"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13435504',
+          activityIds: '.ui.homepage.MainActivity',
+          matches:
+            '@[id="com.sohu.sohuvideo:id/ivClose"] + LinearLayout [text="新版本上线啦"]',
+          snapshotUrls: 'https://i.gkd.li/i/13435504',
+        },
+      ],
     },
   ],
 });

src/apps/com.sqsp.movie.ts

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

src/apps/com.ss.android.article.lite.ts

@@ -1,75 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.ss.android.article.lite',
-  name: '头条搜索极速版',
-  groups: [
-    {
-      key: 10,
-      name: '全屏广告-首页-红包弹窗',
-      activityIds: 'com.ss.android.article.lite.activity.SplashActivity',
-      rules: '@[desc="关闭"] + [text$="现金红包"]',
-      snapshotUrls: 'https://i.gkd.li/i/12705414',
-    },
-    {
-      key: 11,
-      name: '局部广告-首页-右侧悬浮广告',
-      activityIds: 'com.ss.android.article.lite.activity.SplashActivity',
-      rules:
-        'FrameLayout[id!=null] > @ImageView[id!=null][clickable=true] + ImageView[id!=null]',
-      snapshotUrls: 'https://i.gkd.li/i/12705452',
-    },
-    {
-      key: 12,
-      name: '功能类-首页-你可能感兴趣的人',
-      activityIds: 'com.ss.android.article.lite.activity.SplashActivity',
-      rules: '[text="你可能感兴趣的人"] + [desc="关闭"]',
-      snapshotUrls: 'https://i.gkd.li/i/12705427',
-    },
-    {
-      key: 20,
-      name: '功能类-任务页面-签到弹窗',
-      activityIds: 'com.ss.android.article.lite.activity.SplashActivity',
-      rules: [
-        {
-          matches:
-            'UIView[clickable=false] + LynxFlattenUI[clickable=true][visibleToUser=true]',
-          action: 'clickCenter',
-          snapshotUrls: 'https://i.gkd.li/i/12705439',
-        },
-      ],
-    },
-    {
-      key: 21,
-      name: '局部广告-任务页面-右侧悬浮红包',
-      activityIds: 'com.ss.android.article.lite.activity.SplashActivity',
-      rules: 'UIScrollView + UIView + UISvg',
-      snapshotUrls: 'https://i.gkd.li/i/12705447',
-    },
-    {
-      key: 22,
-      name: '全屏广告-任务页面-答题弹窗',
-      activityIds: 'com.ss.android.article.lite.activity.SplashActivity',
-      rules: [
-        {
-          matches:
-            '[text^="答对"][text$="金币"] + FlattenUIImage[clickable=true]',
-          action: 'clickCenter',
-          snapshotUrls: 'https://i.gkd.li/i/12705456',
-        },
-      ],
-    },
-    {
-      key: 30,
-      name: '全屏广告-搜索页面-搜索得金币弹窗',
-      activityIds: 'com.android.bytedance.search.SearchActivity',
-      rules: [
-        {
-          matches: '[text^="搜索"][text$="金币"] + LynxFlattenUI + UISvg',
-          action: 'clickCenter',
-          snapshotUrls: 'https://i.gkd.li/i/12705468',
-        },
-      ],
-    },
-  ],
-});

src/apps/com.ss.android.article.news.ts

@@ -23,6 +23,7 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -69,6 +70,7 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      activityIds: '.activity.MainActivity',
       rules: [
         {
           key: 0,
@@ -89,15 +91,6 @@ export default defineGkdApp({
       desc: '点击右上角[更多]图标按钮,点击不感兴趣',
       activityIds: 'com.ss.android.ugc.detail.activity.TikTokActivity',
       rules: [
-        {
-          key: -1,
-          preKeys: 0,
-          actionCd: 35000, //APP更新后点击不感兴趣不会跳过当前视频了，所以需要冷却一下等下一次重新跳过广告视频
-          name: '点击不感兴趣',
-          matches:
-            '@LinearLayout[clickable=true] > RelativeLayout + TextView[text="不感兴趣"]',
-          snapshotUrls: 'https://i.gkd.li/i/12679277',
-        },
         {
           key: 0,
           name: '点击右上角[更多]图标按钮',
@@ -113,6 +106,15 @@ export default defineGkdApp({
             'https://i.gkd.li/i/13930050',
           ],
         },
+        {
+          key: -1,
+          preKeys: [0],
+          actionCd: 35000, //APP更新后点击不感兴趣不会跳过当前视频了，所以需要冷却一下等下一次重新跳过广告视频
+          name: '点击不感兴趣',
+          matches:
+            '@LinearLayout[clickable=true] > RelativeLayout + TextView[text="不感兴趣"]',
+          snapshotUrls: 'https://i.gkd.li/i/12679277',
+        },
       ],
     },
     {
@@ -153,9 +155,9 @@ export default defineGkdApp({
     {
       key: 13,
       name: '局部广告-底部话题推荐弹窗',
-      activityIds: 'com.ss.android.article.news.activity.MainActivity',
       rules: [
         {
+          activityIds: 'com.ss.android.article.news.activity.MainActivity',
           name: '话题谈论',
           matches:
             'FlattenUIText[text="参与讨论"] + FlattenUIImage[clickable=true]',
@@ -178,6 +180,7 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/13402468',
         },
         {
+          preKeys: [0],
           name: '等待30s点击"关闭"',
           actionDelay: 30000,
           activityIds: 'com.ss.android.excitingvideo.ExcitingVideoActivity',
@@ -192,7 +195,6 @@ export default defineGkdApp({
       desc: '点击X',
       rules: [
         {
-          fastQuery: true,
           activityIds: 'com.ss.android.article.news.activity.MainActivity',
           matches: 'FrameLayout[childCount=8] > FlattenUIImage[index=7]',
           snapshotUrls: 'https://i.gkd.li/i/13828331',

src/apps/com.ss.android.article.video.ts

@@ -27,17 +27,28 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[desc="关闭"] - LinearLayout > [text="立即升级"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13328430',
+        {
+          activityIds: '.activity.SplashActivity',
+          matches: '@[desc="关闭"] - LinearLayout > [text="立即升级"]',
+          snapshotUrls: 'https://i.gkd.li/i/13328430',
+        },
+      ],
     },
     {
       key: 2,
       name: '权限提示-通知权限',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
-      rules:
+      resetMatch: 'app',
-        '@TextView[id="com.ss.android.article.video:id/sj"][text="暂不开启"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13456568',
+        {
+          activityIds: '.activity.SplashActivity',
+          matches: ['[text="开启推送通知"]', '[text="暂不开启"]'],
+          snapshotUrls: 'https://i.gkd.li/i/13456568',
+        },
+      ],
     },
     {
       key: 6,
@@ -46,9 +57,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.ss.android.article.video.activity.SplashActivity',
+      rules: [
-      rules: '@FlattenUIImage[clickable=true] -2 [text="开心收下"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13620299',
+          activityIds: 'com.ss.android.article.video.activity.SplashActivity',
+          matches: '@FlattenUIImage[clickable=true] -2 [text="开心收下"]',
+          snapshotUrls: 'https://i.gkd.li/i/13620299',
+        },
+      ],
     },
   ],
 });

src/apps/com.ss.android.auto.ts

@@ -16,7 +16,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          name: '点击"x"',
+          name: '点击关闭',
           matches:
             'TextView[text.length=1][id=null][clickable=false] < @FrameLayout[clickable=true][id!=null] - LinearLayout > [text="广告"]',
           // 貌似快照存在延迟导致屏幕与节点不对应
@@ -27,18 +27,18 @@ export default defineGkdApp({
         },
         {
           // 不与旧版本合并，尽量使用[clickable=true]，保证速度避免误触
-          preKeys: 0,
+          preKeys: [0],
-          name: '点击"不感兴趣"1', // 懂车帝v7.8.4样式
+          name: '点击"不感兴趣"1',
           matches: '@ViewGroup[clickable=true] TextView[text="不感兴趣"]',
           snapshotUrls: 'https://i.gkd.li/i/13538627',
         },
         {
-          preKeys: 0,
+          preKeys: [0],
-          name: '点击"不感兴趣"2', // 懂车帝v7.7.4样式、v7.8.0样式
+          name: '点击"不感兴趣"2',
           matches: '[text="不感兴趣"][clickable=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/12711589',
-            'https://i.gkd.li/i/13959613', //v7.8.0样式
+            'https://i.gkd.li/i/13959613',
           ],
         },
       ],
@@ -49,56 +49,71 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '@TextView[text="以后再说"] - FrameLayout >2 TextView[text$="升级"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13534445',
+          activityIds: '.activity.SplashActivity',
+          matches:
+            '@TextView[text="以后再说"] - FrameLayout >2 TextView[text$="升级"]',
+          snapshotUrls: 'https://i.gkd.li/i/13534445',
+        },
+      ],
     },
     {
       key: 3,
       name: '局部广告-右下角悬浮窗',
-      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      resetMatch: 'activity',
+      rules: [
-      activityIds: [
+        {
-        'com.ss.android.auto.activity.SplashActivity',
+          activityIds: [
-        'com.ss.android.auto.activity.ConcernDetailActivity',
+            'com.ss.android.auto.activity.SplashActivity',
-      ],
+            'com.ss.android.auto.activity.ConcernDetailActivity',
-      rules:
+          ],
-        'FrameLayout > RelativeLayout[childCount=2] > RelativeLayout + ImageView[clickable=true]',
+          matches:
-      snapshotUrls: [
+            'FrameLayout > RelativeLayout[childCount=2] > RelativeLayout + ImageView[clickable=true]',
-        'https://i.gkd.li/i/12798338',
+          snapshotUrls: [
-        'https://i.gkd.li/i/13535531',
+            'https://i.gkd.li/i/12798338',
-        'https://i.gkd.li/i/13535933',
+            'https://i.gkd.li/i/13535531',
-        'https://i.gkd.li/i/13535932',
+            'https://i.gkd.li/i/13535933',
+            'https://i.gkd.li/i/13535932',
+          ],
+        },
       ],
     },
     {
       key: 4,
       name: '局部广告-文章底部卡片广告',
-      fastQuery: true,
+      rules: [
-      activityIds:
+        {
-        'com.ss.android.article.base.feature.detail2.view.NewDetailActivity',
+          fastQuery: true,
-      rules:
+          activityIds:
-        'FrameLayout > RelativeLayout > @ImageView[clickable=true] + [text="广告"]',
+            'com.ss.android.article.base.feature.detail2.view.NewDetailActivity',
-      snapshotUrls: 'https://i.gkd.li/i/12811597',
+          matches:
+            'FrameLayout > RelativeLayout > @ImageView[clickable=true] + [text="广告"]',
+          snapshotUrls: 'https://i.gkd.li/i/12811597',
+        },
+      ],
     },
     {
       key: 5,
       name: '局部广告-评论区信息流广告',
       desc: '点击关闭',
       fastQuery: true,
-      activityIds: [
+      rules: [
-        'com.ss.android.article.base.feature.detail2.view.NewDetailActivity',
+        {
-        'com.ss.android.auto.ugc.video.activity.UgcLongPostActivity',
+          activityIds: [
-        'com.ss.android.auto.ugc.video.activity.UgcNewDetailActivity',
+            'com.ss.android.article.base.feature.detail2.view.NewDetailActivity',
-      ],
+            'com.ss.android.auto.ugc.video.activity.UgcLongPostActivity',
-      rules: '@ImageView[clickable=true] - LinearLayout > [text="广告"]',
+            'com.ss.android.auto.ugc.video.activity.UgcNewDetailActivity',
-      snapshotUrls: [
+          ],
-        'https://i.gkd.li/i/12811459',
+          matches: '@ImageView[clickable=true] - LinearLayout > [text="广告"]',
-        'https://i.gkd.li/i/12825865',
+          snapshotUrls: [
-        'https://i.gkd.li/i/12900666',
+            'https://i.gkd.li/i/12811459',
-        'https://i.gkd.li/i/14321293',
+            'https://i.gkd.li/i/12825865',
+            'https://i.gkd.li/i/12900666',
+            'https://i.gkd.li/i/14321293',
+          ],
+        },
       ],
     },
     {
@@ -109,8 +124,11 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
-          name: '调用返回',
           action: 'back',
+          activityIds: [
+            '.activity.SplashActivity',
+            'com.bytedance.im.auto.conversation.activity.ConversationListActivity',
+          ],
           matches: 'TextView[text*="推送通知"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12840664',
@@ -123,19 +141,22 @@ export default defineGkdApp({
     {
       key: 7,
       name: '局部广告-选车页卡片广告',
-      fastQuery: true,
+      rules: [
-      activityIds: 'com.ss.android.auto.activity.ConcernDetailActivity',
+        {
-      rules:
+          fastQuery: true,
-        'TextView[text.length=1][id=null][clickable=false] < @FrameLayout[clickable=true][id!=null] -2 [text="广告"]',
+          activityIds: 'com.ss.android.auto.activity.ConcernDetailActivity',
-      snapshotUrls: 'https://i.gkd.li/i/13686928',
+          matches: '@FrameLayout[clickable=true][id!=null] -2 [text="广告"]',
+          snapshotUrls: 'https://i.gkd.li/i/13686928',
+        },
+      ],
     },
     {
       key: 8,
       name: '局部广告-车型页面右下角直播悬浮窗',
-      desc: '点击X',
+      desc: '点击关闭',
-      fastQuery: true,
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.ss.android.auto.activity.ConcernDetailActivity',
           matches: 'FrameLayout[childCount=8] > TextView[text=""]',
           snapshotUrls: 'https://i.gkd.li/i/14034740',
@@ -151,6 +172,7 @@ export default defineGkdApp({
       rules: [
         {
           action: 'back',
+          activityIds: '.activity.SplashActivity',
           matches: '[text="去评价"]',
           snapshotUrls: 'https://i.gkd.li/i/14810042',
         },

src/apps/com.ss.android.lark.ts

@@ -7,22 +7,30 @@ export default defineGkdApp({
     {
       key: 1,
       name: '功能类-桌面端登录确认',
-      fastQuery: true,
+      rules: [
-      activityIds:
+        {
-        'com.ss.lark.android.passport.biz.feature.sso.suite.SuiteConfirmActivity',
+          fastQuery: true,
-      rules:
+          activityIds:
-        '[text="飞书 桌面端登录确认"] +2 [id="com.ss.android.lark:id/login_button"]',
+            'com.ss.lark.android.passport.biz.feature.sso.suite.SuiteConfirmActivity',
-      snapshotUrls: 'https://i.gkd.li/i/13494960',
+          matches:
+            '[text="飞书 桌面端登录确认"] +2 [id="com.ss.android.lark:id/login_button"]',
+          snapshotUrls: 'https://i.gkd.li/i/13494960',
+        },
+      ],
     },
     {
       key: 10,
       name: '功能类-自动查看原图',
       desc: '查看图片时自动点击"查看原图"',
-      activityIds:
+      rules: [
-        'com.ss.android.lark.widget.photo.preview.PhotoPagerActivity',
+        {
-      fastQuery: true,
+          activityIds:
-      rules: '[id="com.ss.android.lark:id/look_origin_icon"]',
+            'com.ss.android.lark.widget.photo.preview.PhotoPagerActivity',
-      snapshotUrls: 'https://i.gkd.li/i/12840528',
+          fastQuery: true,
+          matches: '[id="com.ss.android.lark:id/look_origin_icon"]',
+          snapshotUrls: 'https://i.gkd.li/i/12840528',
+        },
+      ],
     },
     {
       key: 11,

src/apps/com.ss.android.ugc.aweme.lite.ts

@@ -10,11 +10,14 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          name: '"首页商城"体验邀请弹窗',
+          name: '[首页商城]体验邀请弹窗',
+          fastQuery: true,
           activityIds:
             'com.ss.android.ugc.aweme.commerce.sdk.MallContainerActivity',
-          matches:
+          matches: [
-            '[text="不再提示"] + @ECCustomUiImage[clickable=true] +n LynxFlattenUI[text^="立即体验"]',
+            'UIText[text^="立即体验"]',
+            'FlattenUIText[text="不再提示"][visibleToUser=true]',
+          ],
           snapshotUrls: 'https://i.gkd.li/i/13684791',
         },
       ],
@@ -25,37 +28,40 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: ['com.ss.android.ugc.aweme.main.MainActivity'],
+      rules: [
-      rules:
+        {
-        '[text="朋友推荐"] +2 [id="com.ss.android.ugc.aweme.lite:id/close"][clickable=true]',
+          activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
-      snapshotUrls: 'https://i.gkd.li/i/13650523',
+          matches:
+            '[text="朋友推荐"] +2 [id="com.ss.android.ugc.aweme.lite:id/close"][clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/13650523',
+        },
+      ],
     },
     {
       key: 9,
-      fastQuery: true,
       name: '权限提示-通知权限',
       desc: '点击暂不开启',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
-          matches:
+          activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
-            '[id="com.ss.android.ugc.aweme.lite:id/gl7"] > [id="com.ss.android.ugc.aweme.lite:id/h5q"]',
+          matches: '[text="及时获得消息提醒"] +2 [text="暂不开启"]',
           snapshotUrls: 'https://i.gkd.li/i/13888485',
         },
       ],
     },
     {
       key: 10,
-      fastQuery: true,
       name: '功能类-选择图片时自动勾选原图',
       rules: [
         {
+          fastQuery: true,
           activityIds:
             'com.ss.android.ugc.aweme.im.sdk.media.choose.MediaChooseActivity',
-          matches:
+          matches: '[text="原图"][desc^="未选中"]',
-            '[id="com.ss.android.ugc.aweme.lite:id/amh"][desc^="未选中"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13946092', //未勾选原图
             'https://i.gkd.li/i/13946033', //已勾选原图

src/apps/com.ss.android.ugc.aweme.ts

@@ -92,6 +92,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.main.MainActivity',
           matches: ['[text="立即升级"]', '[text="以后再说"]'],
           snapshotUrls: [
             'https://i.gkd.li/i/12534016',
@@ -104,19 +105,14 @@ export default defineGkdApp({
     {
       key: 4,
       name: '局部广告-首页左上角广告',
-      activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
+      rules: [
-      rules:
+        {
-        'ViewGroup + FrameLayout[id=null] > FrameLayout[childCount=2][id!=null] > ImageView[desc="关闭"][clickable=true][id!=null]',
+          activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
-      snapshotUrls: 'https://i.gkd.li/i/12749276',
+          matches:
-    },
+            'ViewGroup + FrameLayout[id=null] > FrameLayout[childCount=2][id!=null] > ImageView[desc="关闭"][clickable=true][id!=null]',
-    {
+          snapshotUrls: 'https://i.gkd.li/i/12749276',
-      key: 5,
+        },
-      name: '全屏广告-弹窗广告',
+      ],
-      activityIds: 'com.android.launcher.Launcher',
-      fastQuery: true,
-      rules:
-        '[id="android:id/content"] >2 RelativeLayout[childCount<=5] > @ImageView[clickable=true][id!=null] - TextView[text="广告"][id!=null]',
-      snapshotUrls: 'https://i.gkd.li/i/12769137',
     },
     {
       key: 6,
@@ -125,32 +121,40 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="取消"] +2 [text="五星好评"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13053628',
+        {
-      exampleUrls:
+          activityIds: '.main.MainActivity',
-        'https://github.com/gkd-kit/inspect/assets/38517192/4554c785-39e0-4eac-9cfb-f1b1c2976008',
+          matches: '@[text="取消"] +2 [text="五星好评"]',
+          snapshotUrls: 'https://i.gkd.li/i/13053628',
+        },
+      ],
     },
     {
       key: 7,
-      fastQuery: true,
       name: '功能类-设置无声进入抖音弹窗',
       desc: '点击[拒绝]',
-      activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
+      rules: [
-      rules: '@[text="拒绝"] + [text="去设置"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13256087',
+          fastQuery: true,
+          activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
+          matches: '@[text="拒绝"] + [text="去设置"]',
+          snapshotUrls: 'https://i.gkd.li/i/13256087',
+        },
+      ],
     },
     {
       key: 10,
       name: '权限提示-通知权限',
-      desc: '自动点击“暂不”',
+      desc: '点击[暂不]',
+      fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      activityIds: '.main.MainActivity',
       rules: [
         {
           key: 0,
           matches:
-            '@[text="暂不"][focusable=true] < LinearLayout - LinearLayout >(2) [text="开启朋友通知"]',
+            '@[text="暂不"][focusable=true] < LinearLayout - LinearLayout >2 [text="开启朋友通知"]',
           snapshotUrls: 'https://i.gkd.li/i/12675129',
         },
         {
@@ -164,13 +168,17 @@ export default defineGkdApp({
       key: 11,
       name: '功能类-自动勾选原图',
       desc: '聊天发送图片时自动勾选原图',
-      fastQuery: true,
+      rules: [
-      activityIds:
+        {
-        'com.ss.android.ugc.aweme.im.sdk.media.choose.MediaChooseActivity',
+          fastQuery: true,
-      rules: '[text="原图"][desc="未选中/复选框 原图"]',
+          activityIds:
-      snapshotUrls: [
+            'com.ss.android.ugc.aweme.im.sdk.media.choose.MediaChooseActivity',
-        'https://i.gkd.li/i/12846036', // 未选中
+          matches: '[text="原图"][desc="未选中/复选框 原图"]',
-        'https://i.gkd.li/i/12846040', // 已选中
+          snapshotUrls: [
+            'https://i.gkd.li/i/12846036', // 未选中
+            'https://i.gkd.li/i/12846040', // 已选中
+          ],
+        },
       ],
     },
     {
@@ -179,6 +187,7 @@ export default defineGkdApp({
       fastQuery: true,
       rules: [
         {
+          key: 1,
           matches: '@[text="取消"] + [text*="提醒我"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13241564',
@@ -187,6 +196,8 @@ export default defineGkdApp({
           ],
         },
         {
+          key: 2,
+          activityIds: '.main.MainActivity',
           matches: '[text="管理使用时间"] + Button[text="忽略提醒"]',
           snapshotUrls: 'https://i.gkd.li/i/13372725',
         },
@@ -247,25 +258,37 @@ export default defineGkdApp({
     {
       key: 14,
       name: '全屏广告-视频播放中途插入的打招呼界面',
-      activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
+      rules: [
-      rules: 'FrameLayout > @[desc="关闭"] + ViewGroup > [text$="打个招呼"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13379307',
+          fastQuery: true,
+          activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
+          matches:
+            'FrameLayout > @[desc="关闭"] + ViewGroup > [text$="打个招呼"]',
+          snapshotUrls: 'https://i.gkd.li/i/13379307',
+        },
+      ],
     },
     {
       key: 15,
       name: '全屏广告-关闭商城推荐',
       desc: '点击"不感兴趣"',
-      activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
+      rules: [
-      rules: '@[text="不感兴趣"][clickable=true] + [text="去商城搜索更多"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13800207',
+          fastQuery: true,
+          activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
+          matches:
+            '@[text="不感兴趣"][clickable=true] + [text="去商城搜索更多"]',
+          snapshotUrls: 'https://i.gkd.li/i/13800207',
+        },
+      ],
     },
     {
       key: 16,
-      fastQuery: true,
       name: '局部广告-拍同款弹窗',
       desc: '点击不感兴趣',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
           matches: '@LynxFlattenUI[text="不感兴趣"] +4 [text="拍同款"]',
           snapshotUrls: 'https://i.gkd.li/i/13996724',
@@ -325,6 +348,7 @@ export default defineGkdApp({
       rules: [
         {
           fastQuery: true,
+          activityIds: '.main.MainActivity',
           matches: ['[text*="通讯录"]', '[text="拒绝"]'],
           exampleUrls:
             'https://m.gkd.li/57941037/8f70418d-92f0-4264-83fd-a680350c478e',
@@ -347,12 +371,11 @@ export default defineGkdApp({
           excludeActivityIds: '.setting.ui.SettingCommonProtocolActivity',
           matches: [
             '[text*="青少年" || text*="未成年"][text*="模式"]',
-            '[text="关闭" || desc="关闭"]',
+            '[text="关闭"]',
           ],
           snapshotUrls: [
             'https://i.gkd.li/i/14321107',
             'https://i.gkd.li/i/14473006',
-            'https://i.gkd.li/i/14567078',
             'https://i.gkd.li/i/17726070',
           ],
           excludeSnapshotUrls: [
@@ -370,6 +393,7 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      activityIds: '.search.activity.SearchResultActivity',
       rules: [
         {
           key: 0,

src/apps/com.ss.android.yumme.video.ts

@@ -13,6 +13,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.main.MainActivity',
           matches: ['[text="立即升级"]', '[text="以后再说"]'],
           snapshotUrls: [
             'https://i.gkd.li/i/12534016',
@@ -30,6 +31,7 @@ export default defineGkdApp({
       rules: [
         {
           action: 'back',
+          activityIds: 'com.ss.android.ugc.aweme.main.MainActivity',
           matches: 'TextView[text="去商店评分"]',
           snapshotUrls: 'https://i.gkd.li/i/15858132',
         },

src/apps/com.steampy.app.ts

@@ -11,9 +11,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '@[id="com.steampy.app:id/imgClose"] - RelativeLayout [id="com.steampy.app:id/tv_update"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13695519',
+          activityIds: '.activity.common.MainActivity',
+          matches:
+            '@[id="com.steampy.app:id/imgClose"] - RelativeLayout [id="com.steampy.app:id/tv_update"]',
+          snapshotUrls: 'https://i.gkd.li/i/13695519',
+        },
+      ],
     },
     {
       key: 2,

src/apps/com.sup.android.superb.ts

@@ -25,8 +25,14 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       fastQuery: true,
-      rules: '[text$="青少年模式"] + [text="我知道了"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13796869',
+        {
+          activityIds:
+            'com.sup.superb.m_teenager.view.EnterTeenagerModeDialogActivity',
+          matches: '[text$="青少年模式"] + [text="我知道了"]',
+          snapshotUrls: 'https://i.gkd.li/i/13796869',
+        },
+      ],
     },
     {
       key: 5,
@@ -34,8 +40,12 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="开启推送通知"] +2 * > [text="以后再说"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13691081',
+        {
+          matches: '[text="开启推送通知"] +2 * > [text="以后再说"]',
+          snapshotUrls: 'https://i.gkd.li/i/13691081',
+        },
+      ],
     },
     {
       key: 6,
@@ -43,16 +53,21 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.sup.android.base.MainActivity',
+      rules: [
-      rules:
+        {
-        'FrameLayout > RelativeLayout > @ImageView[clickable=true] + ImageView',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/13624220',
+          activityIds: 'com.sup.android.base.MainActivity',
+          matches:
+            '@ImageView[clickable=true][visibleToUser=true][childCount=0] < RelativeLayout[childCount=2] < FrameLayout - [id="com.sup.android.superb:id/tab_container"]',
+          snapshotUrls: 'https://i.gkd.li/i/13624220',
+        },
+      ],
     },
     {
       key: 7,
-      fastQuery: true,
       name: '更新提示',
-      desc: '点击我再想想',
+      desc: '点击[我再想想]',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
@@ -73,6 +88,10 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: [
+            'com.sup.android.base.MainActivity',
+            'com.sup.android.base.praise.PraiseDialogActivity',
+          ],
           matches: ['[text^="喜欢皮皮虾吗"]', '[text="取消"]'],
           snapshotUrls: [
             'https://i.gkd.li/i/14005608',
@@ -85,11 +104,15 @@ export default defineGkdApp({
       key: 9,
       name: '全屏广告-集五福弹窗',
       desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           fastQuery: true,
           activityIds: 'com.sup.android.base.MainActivity',
-          matches: '[id="com.sup.android.superb:id/afa"]',
+          matches:
+            '@ImageView[clickable=true][visibleToUser=true][childCount=0] <2 RelativeLayout[childCount=2] < [id="android:id/content"]',
           exampleUrls:
             'https://m.gkd.li/57941037/246d1d0b-d493-4d40-bbb7-9c04ae6b457d',
           snapshotUrls: 'https://i.gkd.li/i/14151026',
@@ -115,18 +138,18 @@ export default defineGkdApp({
       key: 11,
       name: '分段广告-信息流广告',
       desc: '点击展开-点击[不感兴趣]',
+      fastQuery: true,
       activityIds: 'com.sup.android.base.MainActivity',
       rules: [
         {
           key: 0,
           matches:
-            'RecyclerView > FrameLayout[id!=null] >6 ImageView[clickable=true]',
+            'RecyclerView > FrameLayout[id!=null] >4 FrameLayout[childCount=5] > ViewGroup[childCount=1] > @ImageView[clickable=true][childCount=0] <<n [vid="view_pager"]',
           snapshotUrls: 'https://i.gkd.li/i/14886478',
         },
         {
           preKeys: [0],
           key: 1,
-          fastQuery: true,
           matches: '@[clickable=true] > [text="不感兴趣"]',
           snapshotUrls: 'https://i.gkd.li/i/14886477',
         },

src/apps/com.svm.hbyy.ts

@@ -9,6 +9,9 @@ export default defineGkdApp({
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
       fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'com.svm.core.pro.view.activity.MainActivityEx',

src/apps/com.taobao.etao.ts

@@ -5,21 +5,11 @@ export default defineGkdApp({
   name: '一淘',
   groups: [
     {
-      key: 1,
+      key: 2,
-      name: '更新提示',
+      name: '全屏广告-弹窗广告',
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="取消"] < * > [text="好,升级"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/12684250',
-        'https://i.gkd.li/i/12727457',
-        'https://i.gkd.li/i/12684244',
-      ],
-    },
-    {
-      key: 2,
-      name: '全屏广告-弹窗广告',
       rules: [
         {
           key: 0,
@@ -49,18 +39,19 @@ export default defineGkdApp({
       key: 10,
       name: '权限提示-通知权限',
       desc: '点击关闭',
-      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
           key: 0,
+          activityIds: 'com.taobao.sns.app.message.MessageActivity',
           matches:
             '[text^="打开消息通知"] + [text="去开启"] + ImageView[clickable=true]',
           snapshotUrls: 'https://i.gkd.li/i/12684278',
         },
         {
           key: 1,
+          activityIds: '.mine.MetaXMineActivity',
           matches:
             '[text^="打开消息通知"] + FrameLayout > [text="去开启"] < FrameLayout + ImageView[clickable=true]',
           snapshotUrls: 'https://i.gkd.li/i/12684351',

src/apps/com.taobao.htao.android.ts

@@ -7,10 +7,10 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-关闭顶部[打开淘宝]横幅',
-      fastQuery: true,
-      activityIds: 'com.taobao.htao.android.detail.DetailActivity',
       rules: [
         {
+          fastQuery: true,
+          activityIds: 'com.taobao.htao.android.detail.DetailActivity',
           matches:
             'WebView[text$="天猫Tmall.com"] >2 View[id=null][childCount=1] > @TextView[visibleToUser=true][text=""] <<n [vid="detail_swipe_to_refresher"]',
           exampleUrls: 'https://e.gkd.li/661fca21-45e3-4e89-8ccc-b8bafb1bab02',

src/apps/com.taobao.idlefish.ts

@@ -10,18 +10,31 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[desc^="开启系统通知"] > ImageView[clickable=true][desc=null]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13538351',
+        {
+          activityIds:
+            'com.idlefish.flutterbridge.flutterboost.boost.FishFlutterBoostTransparencyActivity',
+          matches:
+            '@ImageView[clickable=true][desc=null] < [desc^="开启系统通知"]',
+          snapshotUrls: 'https://i.gkd.li/i/13538351',
+        },
+      ],
     },
     {
       key: 2,
-      name: '权限提示',
+      name: '权限提示-手机信息权限',
+      fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.taobao.idlefish.maincontainer.activity.MainActivity',
+      rules: [
-      rules:
+        {
-        '@Button[visibleToUser=true][text="取消"] <<n FrameLayout >n TextView[text*="手机信息"]',
+          activityIds: '.maincontainer.activity.MainActivity',
-      snapshotUrls: 'https://i.gkd.li/i/13620277',
+          matches: ['[text*="手机信息权限"]', '[text="取消"]'],
+          exampleUrls: 'https://e.gkd.li/81e3e4d8-f297-4476-b22c-73f0b97879ee',
+          snapshotUrls: 'https://i.gkd.li/i/13620277',
+        },
+      ],
     },
     {
       key: 3,
@@ -30,13 +43,19 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="立即升级"] -2 [text="暂不升级"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13832272',
+        {
+          activityIds: '.maincontainer.activity.MainActivity',
+          matches: '[text="立即升级"] -2 [text="暂不升级"]',
+          snapshotUrls: 'https://i.gkd.li/i/13832272',
+        },
+      ],
     },
     {
       key: 4,
       name: '全屏广告-红包弹窗',
       desc: '点击关闭',
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
@@ -56,19 +75,17 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          action: 'longClick',
           activityIds:
             'com.idlefish.flutterbridge.flutterboost.boost.FishFlutterBoostActivity',
-          matches: '@[clickable=true] > [desc$="广告"]',
           excludeMatches: '@[clickable=true] > [desc^="反馈成功"]',
-          action: 'longClick',
+          matches: '@[clickable=true] > [desc$="广告"]',
-          snapshotUrls: [
+          snapshotUrls: 'https://i.gkd.li/i/14723597',
-            'https://i.gkd.li/i/14723597',
+          excludeSnapshotUrls: 'https://i.gkd.li/i/14723718',
-            'https://i.gkd.li/i/14723718', // excludeMatches
-          ],
         },
         {
+          preKeys: [0],
           key: 1,
-          preKeys: 0,
           activityIds:
             'com.idlefish.flutterbridge.flutterboost.boost.FishFlutterBoostActivity',
           matches:

src/apps/com.taobao.litetao.ts

@@ -11,9 +11,13 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules:
+      rules: [
-        '[id="com.taobao.litetao:id/root_layout"] > TextView[text^="还剩"&&text$="秒"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12774851',
+          matches:
+            '[id="com.taobao.litetao:id/root_layout"] > TextView[text^="还剩"&&text$="秒"]',
+          snapshotUrls: 'https://i.gkd.li/i/12774851',
+        },
+      ],
     },
     {
       key: 1,
@@ -21,10 +25,18 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[id = "com.taobao.litetao:id/update_imageview_cancel_v2"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/12843615',
+          activityIds: [
-        'https://i.gkd.li/i/12843614',
+            'com.taobao.ltao.maintab.MainFrameActivity',
+            '.launcher.ALiFlutterActivityCompat',
+          ],
+          matches: '[id = "com.taobao.litetao:id/update_imageview_cancel_v2"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12843615',
+            'https://i.gkd.li/i/12843614',
+          ],
+        },
       ],
     },
   ],

src/apps/com.taobao.taobao.ts

@@ -54,12 +54,16 @@ export default defineGkdApp({
     {
       key: 2,
       name: '局部广告-消息页面热门活动卡片',
-      fastQuery: true,
+      rules: [
-      activityIds: 'com.taobao.tao.welcome.Welcome',
+        {
-      rules: 'View[desc.length>0] +2n FrameLayout > TextView[text="퀺"]',
+          fastQuery: true,
-      snapshotUrls: [
+          activityIds: 'com.taobao.tao.welcome.Welcome',
-        'https://i.gkd.li/i/12642795',
+          matches: 'View[desc.length>0] +2n FrameLayout > TextView[text="퀺"]',
-        'https://i.gkd.li/i/13197877',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12642795',
+            'https://i.gkd.li/i/13197877',
+          ],
+        },
       ],
     },
     {
@@ -83,43 +87,41 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '[text^="开启系统通知"] + @Image[visibleToUser=true] <<n [vid="poplayer_inner_view"]',
+        {
-      snapshotUrls: [
+          activityIds: [
-        'https://i.gkd.li/i/13446901',
+            'com.taobao.android.tbabilitykit.pop.StdPopContainerActivity',
-        'https://i.gkd.li/i/13455424',
+            'com.taobao.tao.TBMainActivity',
-        'https://i.gkd.li/i/15104645',
+            'com.taobao.tao.welcome.Welcome',
+          ],
+          matches:
+            '[text^="开启系统通知"] + @Image[visibleToUser=true] <<n [vid="poplayer_inner_view"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13446901',
+            'https://i.gkd.li/i/13455424',
+            'https://i.gkd.li/i/15104645',
+          ],
+        },
       ],
     },
     {
       key: 9,
       name: '功能类-各级页面添加到首页弹窗',
-      desc: '自动点击退出',
+      desc: '点击退出',
-      fastQuery: true,
+      rules: [
-      activityIds: [
+        {
-        'com.taobao.themis.container.app.TMSActivity',
+          fastQuery: true,
-        'com.alibaba.triver.container.TriverMainActivity',
+          activityIds: [
+            'com.taobao.themis.container.app.TMSActivity',
+            'com.alibaba.triver.container.TriverMainActivity',
+          ],
+          matches: 'TextView[text="去首页"] + TextView[text="退出"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13197553',
+            'https://i.gkd.li/i/13197546',
+          ],
+        },
       ],
-      rules: 'TextView[text="去首页"] + TextView[text="退出"]',
-      snapshotUrls: [
-        'https://i.gkd.li/i/13197553',
-        'https://i.gkd.li/i/13197546',
-      ],
-    },
-    {
-      key: 10,
-      name: '全屏广告-视频页面活动弹窗',
-      activityIds: 'com.taobao.tao.welcome.Welcome',
-      rules:
-        'View[id=null] > [text="立即参加"] + TextView[id=null][clickable=true]',
-      snapshotUrls: 'https://i.gkd.li/i/12642813',
-    },
-    {
-      key: 11,
-      name: '全屏广告-视频页面签到弹窗',
-      activityIds: 'com.taobao.tao.welcome.Welcome',
-      rules: '@View[clickable=true] - View > View > TextView[text="立即签到"]',
-      snapshotUrls: 'https://i.gkd.li/i/12642798',
     },
     {
       key: 12,
@@ -127,11 +129,19 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[vid="update_imageview_cancel_v2"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/13336760',
+          activityIds: [
-        'https://i.gkd.li/i/13695520',
+            'com.taobao.android.detail.wrapper.activity.DetailActivity',
-        'https://i.gkd.li/i/14899863',
+            'com.taobao.android.order.bundle.TBOrderListActivity',
+          ],
+          matches: '[vid="update_imageview_cancel_v2"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13336760',
+            'https://i.gkd.li/i/13695520',
+            'https://i.gkd.li/i/14899863',
+          ],
+        },
       ],
     },
     {
@@ -178,19 +188,16 @@ export default defineGkdApp({
     },
     {
       key: 15,
-      name: '权限提示-开启悬浮窗权限',
+      name: '权限提示-悬浮窗权限',
-      desc: '点击“否”',
+      desc: '点击[否]',
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds:
-        'com.taobao.android.detail2.core.framework.floatwindow.permission.PermissionActivity',
       rules: [
         {
-          matches: [
+          activityIds:
-            '[id="android:id/message"][text*="悬浮窗权限"]',
+            'com.taobao.android.detail2.core.framework.floatwindow.permission.PermissionActivity',
-            '[id="android:id/button2"][text="否"]',
+          matches: ['[text*="悬浮窗权限"]', '[text="否"]'],
-          ],
           snapshotUrls: 'https://i.gkd.li/i/13588165',
         },
       ],
@@ -232,7 +239,7 @@ export default defineGkdApp({
     },
     {
       key: 18,
-      name: '功能类-"「0元下单」权益"弹窗',
+      name: '其他-[「0元下单」权益]弹窗',
       desc: '点击关闭',
       rules: [
         {

src/apps/com.taptap.ts

@@ -7,7 +7,8 @@ export default defineGkdApp({
     {
       key: 2,
       name: '分段广告-游戏浏览页面推荐广告',
-      desc: '自动点击"对此内容不感兴趣"',
+      desc: '点击[]对此内容不感兴趣]',
+      fastQuery: true,
       rules: [
         {
           key: 0,
@@ -29,7 +30,7 @@ export default defineGkdApp({
           matches: '@LinearLayout > [text="对此内容不感兴趣"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12840904',
-            'https://i.gkd.li/i/13258679', //other.basic.impl.TapMainActivity
+            'https://i.gkd.li/i/13258679',
           ],
         },
       ],
@@ -42,6 +43,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.upgrade.library.dialog.UpgradeDialogAct',
           matches: '@[vid="btn_dismiss"] -2 * >2 [text="发现新版本"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13387479',
@@ -57,8 +59,12 @@ export default defineGkdApp({
       fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text*="青少年模式"] + [vid="iv_close"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/14209309',
+        {
+          matches: '[text*="青少年模式"] + [vid="iv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/14209309',
+        },
+      ],
     },
   ],
 });

src/apps/com.tencent.androidqqmail.ts

@@ -11,9 +11,13 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules:
+      rules: [
-        'RelativeLayout[childCount=3] > ImageView + @ImageView[clickable=true][visibleToUser=true] + FrameLayout[childCount>0]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12775855',
+          matches:
+            'RelativeLayout[childCount=3] > ImageView + @ImageView[clickable=true][visibleToUser=true] + FrameLayout[childCount>0]',
+          snapshotUrls: 'https://i.gkd.li/i/12775855',
+        },
+      ],
     },
     {
       key: 0,
@@ -63,12 +67,13 @@ export default defineGkdApp({
     {
       key: 1,
       name: '权限提示-通知权限',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
+          activityIds: 'com.tencent.qqmail.fragment.base.MailFragmentActivity',
           matches: '[text="立刻开启"] - [text="以后再说"]',
           snapshotUrls: 'https://i.gkd.li/i/13043069',
         },

src/apps/com.tencent.cmocmna.ts

@@ -7,23 +7,32 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-悬浮广告',
-      activityIds: 'com.tencent.mocmna.activity.MainActivity',
+      rules: [
-      rules:
+        {
-        'ViewGroup[childCount=2] > @ImageView[id!=null][clickable=true] + ImageView',
+          activityIds: 'com.tencent.mocmna.activity.MainActivity',
-      snapshotUrls: [
+          matches:
-        'https://i.gkd.li/i/12847323',
+            'ViewGroup[childCount=2] > @ImageView[id!=null][clickable=true][childCount=0] + ImageView[childCount=0]',
-        'https://i.gkd.li/i/12847336',
+          snapshotUrls: [
-        'https://i.gkd.li/i/13063271', // 限定 [clickable=true] 防止在此快照中点击左上角头像
+            'https://i.gkd.li/i/12847323',
+            'https://i.gkd.li/i/12847336',
+            'https://i.gkd.li/i/13063271', // 限定 [clickable=true] 防止在此快照中点击左上角头像
+          ],
+        },
       ],
     },
     {
       key: 2,
       name: '局部广告-信息流内嵌广告',
-      activityIds: 'com.tencent.mocmna.activity.MainActivity',
+      rules: [
-      rules: 'ImageView - ViewGroup > ImageView + ImageView + ImageView',
+        {
-      snapshotUrls: [
+          activityIds: 'com.tencent.mocmna.activity.MainActivity',
-        'https://i.gkd.li/i/12847340',
+          matches:
-        'https://i.gkd.li/i/12847364',
+            '@ImageView[clickable=true][childCount=0][index=parent.childCount.minus(1)] -5 [text="下载"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12847340',
+            'https://i.gkd.li/i/12847364',
+          ],
+        },
       ],
     },
   ],

src/apps/com.tencent.djcity.ts

@@ -25,11 +25,15 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           activityIds: 'com.tencent.djcity.activities.homepage.MainActivity',
           matches:
-            '[vid="main_container"] >7 View[childCount=7] > View[childCount=2] > View[index=1] > ImageView',
+            '[vid="main_container"] >7 View[childCount=7] > View[childCount=2] > @View[index=1][childCount=1][clickable=true] > ImageView[childCount=0] <<n [vid="main_container"]',
           exampleUrls:
             'https://m.gkd.li/57941037/151fd8a5-8c44-4368-a8ba-3563df44e492',
           snapshotUrls: 'https://i.gkd.li/i/14229532',
@@ -40,6 +44,7 @@ export default defineGkdApp({
       key: 2,
       name: '功能类-"签到成功"弹窗',
       desc: '点击"好的"',
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [

src/apps/com.tencent.docs.ts

@@ -12,8 +12,12 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
-      rules: '@LinearLayout > [id="com.tencent.docs:id/tv_gdt_ad_text"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13198082',
+        {
+          matches: '@LinearLayout > [id="com.tencent.docs:id/tv_gdt_ad_text"]',
+          snapshotUrls: 'https://i.gkd.li/i/13198082',
+        },
+      ],
     },
     {
       key: 1,
@@ -21,23 +25,37 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[desc="暂不更新"] + [desc="现在更新"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13198091',
+        {
+          activityIds: '.DocsFlutterActivity',
+          matches: '@[desc="暂不更新"] + [desc="现在更新"]',
+          snapshotUrls: 'https://i.gkd.li/i/13198091',
+        },
+      ],
     },
     {
       key: 2,
       name: '局部广告-卡片广告',
-      activityIds: 'com.tencent.docs.DocsFlutterActivity',
+      rules: [
-      rules: '[desc="限时购买"] + ImageView[clickable=true]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13198097',
+          activityIds: 'com.tencent.docs.DocsFlutterActivity',
+          matches: '@ImageView[clickable=true] - [desc="限时购买"]',
+          snapshotUrls: 'https://i.gkd.li/i/13198097',
+        },
+      ],
     },
     {
       key: 3,
       name: '全屏广告-弹窗广告',
-      actionDelay: 200,
+      rules: [
-      activityIds: 'com.tencent.docs.DocsFlutterActivity',
+        {
-      rules: 'View[childCount=2] > @TextView[id=null][clickable=true] + View',
+          actionDelay: 200,
-      snapshotUrls: 'https://i.gkd.li/i/13242404',
+          activityIds: 'com.tencent.docs.DocsFlutterActivity',
+          matches:
+            'View[childCount=2] > @TextView[id=null][clickable=true] + View',
+          snapshotUrls: 'https://i.gkd.li/i/13242404',
+        },
+      ],
     },
   ],
 });

src/apps/com.tencent.karaoke.ts

@@ -11,8 +11,9 @@ export default defineGkdApp({
         {
           key: 0,
           name: '动态页面-卡片广告',
+          fastQuery: true,
           activityIds: 'com.tencent.karaoke.module.main.ui.MainTabActivity',
-          matches: 'RelativeLayout > [text="广告"] + ImageView',
+          matches: '@ImageView[clickable=true] - [text="广告"]',
           snapshotUrls: 'https://i.gkd.li/i/13334798',
         },
       ],
@@ -27,7 +28,7 @@ export default defineGkdApp({
           activityIds:
             'com.tencent.karaoke.module.splash.ui.SplashBaseActivity',
           matches:
-            '[desc$="霸屏的按钮"] < ViewGroup + ViewGroup[childCount=1] > ViewGroup[childCount=0]',
+            'ViewGroup[childCount=0] < @ViewGroup[clickable=true][childCount=1] - ViewGroup > [desc*="双十一"]',
           snapshotUrls: 'https://i.gkd.li/i/13363281',
         },
       ],

src/apps/com.tencent.mm.ts

@@ -143,14 +143,18 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      activityIds: [
+      rules: [
-        'com.tencent.mm.plugin.webwx.ui.ExtDeviceWXLoginUI',
+        {
-        'com.tencent.mm.ui.LauncherUI',
+          activityIds: [
-      ],
+            'com.tencent.mm.plugin.webwx.ui.ExtDeviceWXLoginUI',
-      rules: 'TextView[text="取消登录"] - Button[text="登录"]',
+            'com.tencent.mm.ui.LauncherUI',
-      snapshotUrls: [
+          ],
-        'https://i.gkd.li/i/13522625', // activityIds: 'com.tencent.mm.plugin.webwx.ui.ExtDeviceWXLoginUI'
+          matches: 'TextView[text="取消登录"] - Button[text="登录"]',
-        'https://i.gkd.li/i/13522577', // activityIds: 'com.tencent.mm.ui.LauncherUI'
+          snapshotUrls: [
+            'https://i.gkd.li/i/13522625',
+            'https://i.gkd.li/i/13522577',
+          ],
+        },
       ],
     },
     {
@@ -160,13 +164,13 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      activityIds: [
-        'com.tencent.mm.plugin.base.stub.UIEntryStub',
-        'com.tencent.mm.ui.LauncherUI',
-        'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI',
-      ],
       rules: [
         {
+          activityIds: [
+            'com.tencent.mm.plugin.base.stub.UIEntryStub',
+            'com.tencent.mm.ui.LauncherUI',
+            'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI',
+          ],
           matches: ['[text^="获取你的"]', '[text="允许"]'],
           snapshotUrls: [
             'https://i.gkd.li/i/12663602',
@@ -179,20 +183,20 @@ export default defineGkdApp({
     {
       key: 4,
       name: '功能类-微信读书网页版扫码登录自动授权',
-      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       activityIds: 'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI',
       rules: [
         {
+          key: 1,
           matches: '[text="微信读书网页版"] +3 Button[text="登 录"]',
           snapshotUrls: 'https://i.gkd.li/i/12506197',
         },
         {
-          matches: [
+          preKeys: [1],
-            '[text="登录成功"]',
+          key: 2,
-            '[id="com.tencent.mm:id/g1"][desc="返回"]',
+          action: 'back',
-          ],
+          matches: '[text="登录成功"]',
           snapshotUrls: 'https://i.gkd.li/i/12506201',
         },
       ],
@@ -201,8 +205,6 @@ export default defineGkdApp({
       key: 5,
       name: '功能类-微信红包自动领取',
       desc: '自动领取私聊红包,群聊红包',
-      exampleUrls:
-        'https://github.com/gkd-kit/subscription/assets/38517192/32cfda78-b2e1-456c-8d85-bfb2bc4683aa',
       rules: [
         {
           name: '从红包结算界面返回',
@@ -333,9 +335,13 @@ export default defineGkdApp({
       fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
-      activityIds: 'com.tencent.mm.ui.LauncherUI',
+      rules: [
-      rules: '[text="打开网页版文件传输助手"] + * > Button[text="打开"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12793745',
+          activityIds: 'com.tencent.mm.ui.LauncherUI',
+          matches: '[text="打开网页版文件传输助手"] + * > Button[text="打开"]',
+          snapshotUrls: 'https://i.gkd.li/i/12793745',
+        },
+      ],
     },
     {
       key: 17,
@@ -368,15 +374,16 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          fastQuery: true,
           activityIds:
             'com.tencent.mm.plugin.teenmode.ui.AuthorizationRequestUI',
-          matches: '@LinearLayout[childCount=2] > [text="验证密码"]',
+          matches: '@LinearLayout[childCount=2] > TextView[text="验证密码"]',
           snapshotUrls: 'https://i.gkd.li/i/13588338',
         },
         {
           key: 1,
           activityIds: 'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI',
-          matches: ['View[text="申请今天临时访问"]', 'View[desc="验证密码"]'],
+          matches: 'View[desc="验证密码"][clickable=true]',
           snapshotUrls: 'https://i.gkd.li/i/13631987',
         },
       ],
@@ -416,12 +423,16 @@ export default defineGkdApp({
     {
       key: 25,
       name: '局部广告-订阅号消息-推荐文章',
-      desc: '自动点击“x”',
+      desc: '点击关闭',
-      activityIds:
+      rules: [
-        'com.tencent.mm.plugin.brandservice.ui.flutter.BizFlutterTLFlutterViewActivity',
+        {
-      rules:
+          activityIds:
-        'View[childCount=2] > View[desc$="推​荐​"][childCount=3] > ImageView[index=2][clickable=true][visibleToUser=true]',
+            'com.tencent.mm.plugin.brandservice.ui.flutter.BizFlutterTLFlutterViewActivity',
-      snapshotUrls: 'https://i.gkd.li/i/14392392',
+          matches:
+            'View[childCount=2] > View[desc$="推​荐​"][childCount=3] > ImageView[index=2][clickable=true][visibleToUser=true]',
+          snapshotUrls: 'https://i.gkd.li/i/14392392',
+        },
+      ],
     },
     {
       key: 26,
@@ -437,8 +448,8 @@ export default defineGkdApp({
           snapshotUrls: [
             'https://i.gkd.li/i/14399355',
             'https://i.gkd.li/i/14662147',
-            'https://i.gkd.li/i/14532946', // 避免在此页面误触
           ],
+          excludeSnapshotUrls: 'https://i.gkd.li/i/14532946',
         },
       ],
     },
@@ -525,14 +536,14 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/14548701',
         },
         {
+          preKeys: [0],
           key: 1,
-          preKeys: 0,
           matches: '[desc="不看此类内容"]',
           snapshotUrls: 'https://i.gkd.li/i/14549566',
         },
         {
+          preKeys: [1],
           key: 2,
-          preKeys: 1,
           matches: '[desc="确定"]',
           snapshotUrls: 'https://i.gkd.li/i/14549567',
         },