perf: some rules

src/appDeprecatedKeys.ts

@@ -420,7 +420,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.kmxs.reader',
     name: '七猫免费小说',
-    deprecatedKeys: [0],
+    deprecatedKeys: [-2, 0, 6, 7],
   },
   {
     id: 'com.magicalstory.AppStore',
@@ -435,7 +435,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.netease.cloudmusic',
     name: '网易云音乐',
-    deprecatedKeys: [3, 9, 11, 12],
+    deprecatedKeys: [3, 9, 10, 11, 12],
   },
   {
     id: 'com.netease.mobimail',
@@ -540,7 +540,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.netease.newsreader.activity',
     name: '网易新闻',
-    deprecatedKeys: [3],
+    deprecatedKeys: [1, 3],
   },
   {
     id: 'com.sina.weibo',
@@ -565,7 +565,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.huawei.android.thememanager',
     name: '华为主题',
-    deprecatedKeys: [3, 4, 5, 6],
+    deprecatedKeys: [3, 4, 5, 6, 8],
   },
   {
     id: 'com.ximalaya.ting.android',
@@ -585,7 +585,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
   {
     id: 'com.mihoyo.hyperion',
     name: '米游社',
-    deprecatedKeys: [1, 4, 5],
+    deprecatedKeys: [1, 2, 4, 5],
   },
   {
     id: 'com.miui.packageinstaller',
@@ -747,6 +747,46 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [
     name: '古文岛',
     deprecatedKeys: [1],
   },
+  {
+    id: 'com.huawei.music',
+    name: '华为音乐',
+    deprecatedKeys: [2, 4, 5, 6, 7],
+  },
+  {
+    id: 'com.icbc',
+    name: '中国工商银行',
+    deprecatedKeys: [0],
+  },
+  {
+    id: 'com.jd.app.reader',
+    name: '京东读书',
+    deprecatedKeys: [1],
+  },
+  {
+    id: 'com.jsmcc',
+    name: '中国移动江苏',
+    deprecatedKeys: [1],
+  },
+  {
+    id: 'com.kuaiduizuoye.scan',
+    name: '快对',
+    deprecatedKeys: [1],
+  },
+  {
+    id: 'com.maidu.gkld',
+    name: '公考雷达',
+    deprecatedKeys: [1],
+  },
+  {
+    id: 'com.miaoying.appmy.cs',
+    name: '新小财神影视',
+    deprecatedKeys: [1],
+  },
+  {
+    id: 'com.netease.mail',
+    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 > [text="领取优惠"]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [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.One.WoodenLetter.ts

@@ -1,17 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.One.WoodenLetter',
-  name: '一个木函',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      actionMaximum: 1,
-      resetMatch: 'app',
-      fastQuery: true,
-      rules: '[text^="新版本"] <2 * +2 * > [text="忽略"]',
-      snapshotUrls: 'https://i.gkd.li/i/14332536',
-    },
-  ],
-});

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 > [text="查看详情"]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [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 > [text="下载应用" || text="立即下载"]',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13521680',
             'https://i.gkd.li/i/13625476',

src/apps/com.haier.uhome.uplus.ts

@@ -10,10 +10,15 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="取消"] + [text="立即更新"||text="立即安装"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/12726844',
+          activityIds: '.upgradeui.ui.UpgradeDialogActivity',
-        'https://i.gkd.li/i/12726801', // activityId: 'com.huawei.android.launcher.unihome.UniHomeLauncher'
+          matches: '@[text="取消"] + [text="立即更新"||text="立即安装"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12726844',
+            'https://i.gkd.li/i/12726801',
+          ],
+        },
       ],
     },
     {
@@ -22,8 +27,22 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text*="通知栏权限"] +n LinearLayout > [text="取消"]',
+      activityIds: '.ui.widget.MPermissionCheckDialog',
-      snapshotUrls: 'https://i.gkd.li/i/12726829',
+      rules: [
+        {
+          key: 0,
+          matches: '@[checked=false] + [text="禁止后不在询问"]',
+          exampleUrls: 'https://e.gkd.li/e1c6f008-4eba-4370-b7a1-054d0279956a',
+          snapshotUrls: 'https://i.gkd.li/i/12726829',
+        },
+        {
+          preKeys: [0],
+          key: 1,
+          matches: '[text="取消"]',
+          exampleUrls: 'https://e.gkd.li/e1c6f008-4eba-4370-b7a1-054d0279956a',
+          snapshotUrls: 'https://i.gkd.li/i/12726829',
+        },
+      ],
     },
   ],
 });

src/apps/com.handsgo.jiakao.android.ts

@@ -33,9 +33,19 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          fastQuery: true,
           activityIds: 'com.handsgo.jiakao.android.main.activity.MainActivity',
           matches:
-            '@[id="com.handsgo.jiakao.android:id/ivDelete"] + [id="com.handsgo.jiakao.android:id/ivRemote"]',
+            '[id="com.handsgo.jiakao.android:id/ivDelete"][visibleToUser=true]',
+          snapshotUrls: 'https://i.gkd.li/i/13475994',
+        },
+        {
+          key: 1,
+          fastQuery: true,
+          activityIds: '.main.activity.MainActivity',
+          matches:
+            '[id="com.handsgo.jiakao.android:id/adsdk__ids_component_close"][visibleToUser=true]',
+          exampleUrls: 'https://e.gkd.li/a3ff6d58-4902-4ff4-a1dd-dbdb4a9ae38a',
           snapshotUrls: 'https://i.gkd.li/i/13475994',
         },
       ],
@@ -43,6 +53,9 @@ export default defineGkdApp({
     {
       key: 2,
       name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,

src/apps/com.hanweb.android.zhejiang.activity.ts

@@ -7,8 +7,8 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
-      resetMatch: 'app',
       fastQuery: true,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
@@ -26,7 +26,7 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/13520598',
         },
         {
-          preKeys: 1,
+          preKeys: [1],
           key: 2,
           matches:
             '[text="版本更新"] - [id="com.hanweb.android.zhejiang.activity:id/rl_back"]',

src/apps/com.hd.smartVillage.ts

@@ -11,10 +11,19 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: 'View[id="com.hd.smartVillage:id/notificationSettingCloseBtn"]',
+      rules: [
-      snapshotUrls: [
+        {
-        'https://i.gkd.li/i/13223669',
+          activityIds: [
-        'https://i.gkd.li/i/13293000',
+            '.modules.main.MainActivity',
+            '.modules.h5service.H5WebActivity',
+          ],
+          matches:
+            'View[id="com.hd.smartVillage:id/notificationSettingCloseBtn"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13223669',
+            'https://i.gkd.li/i/13293000',
+          ],
+        },
       ],
     },
     {
@@ -24,9 +33,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        'TextView[id="com.hd.smartVillage:id/tv_upgrade_cancel"][text="取消"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13223642',
+          activityIds: '.modules.main.MainActivity',
+          matches: 'TextView[id="com.hd.smartVillage:id/tv_upgrade_cancel"]',
+          snapshotUrls: 'https://i.gkd.li/i/13223642',
+        },
+      ],
     },
   ],
 });

src/apps/com.hello.pet.ts

@@ -7,11 +7,16 @@ export default defineGkdApp({
     {
       key: 1,
       name: '权限提示-通知权限',
+      fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[text^="开启通知"] +2 [text="取消"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/14622639',
+          matches: '[text^="开启通知"] +2 [text="取消"]',
+          snapshotUrls: 'https://i.gkd.li/i/14622639',
+        },
+      ],
     },
   ],
 });

src/apps/com.henzanapp.miaomiaozhe.ts

@@ -1,17 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.henzanapp.miaomiaozhe',
-  name: '喵喵折',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: '[text="更新提示"] +(2) LinearLayout > [text="取消"]',
-      snapshotUrls: ['https://i.gkd.li/i/12649457'],
-    },
-  ],
-});

src/apps/com.heytap.headset.ts

@@ -8,11 +8,16 @@ export default defineGkdApp({
       key: 0,
       name: '更新提示',
       fastQuery: true,
-      actionMaximum: 1,
       matchTime: 10000,
+      actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[vid="tv_app_upgrade_cancel"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/14971296',
+        {
+          activityIds: '.component.about.FindAppUpgradeActivity',
+          matches: '[vid="tv_app_upgrade_cancel"]',
+          snapshotUrls: 'https://i.gkd.li/i/14971296',
+        },
+      ],
     },
   ],
 });

src/apps/com.heytap.market.ts

@@ -29,8 +29,8 @@ export default defineGkdApp({
       rules: [
         {
           action: 'back',
-          matches:
+          activityIds: 'com.heytap.upgrade.ui.UpgradeActivity',
-            '[id="com.heytap.market:id/tv_titile"][text="发现软件商店新版本"]',
+          matches: '[text="发现软件商店新版本"]',
           snapshotUrls: 'https://i.gkd.li/i/13455965',
         },
       ],

src/apps/com.heytap.music.ts

@@ -13,6 +13,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.allsaints.music.MainActivity',
           matches: '@ImageView[clickable=true] + [text="检测到新版本"]',
           snapshotUrls: 'https://i.gkd.li/i/14987173',
         },

src/apps/com.heytap.reader.ts

@@ -7,6 +7,9 @@ export default defineGkdApp({
     {
       key: 2,
       name: '全屏广告-首页弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           fastQuery: true,
@@ -23,8 +26,8 @@ export default defineGkdApp({
       name: '局部广告-首页浮窗广告',
       rules: [
         {
-          activityIds: 'com.zhangyue.iReader.bookshelf.ui.ActivityBookShelf',
           fastQuery: true,
+          activityIds: 'com.zhangyue.iReader.bookshelf.ui.ActivityBookShelf',
           matches: '[id="com.heytap.reader:id/float_delete"]',
           exampleUrls:
             'https://m.gkd.li/6328439/860371ea-1f09-4f82-8ed6-1436eca4a50d',
@@ -37,8 +40,11 @@ export default defineGkdApp({
       name: '局部广告-今日推荐',
       rules: [
         {
-          activityIds: 'com.zhangyue.iReader.bookshelf.ui.ActivityBookShelf',
           fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
+          activityIds: 'com.zhangyue.iReader.bookshelf.ui.ActivityBookShelf',
           matches: '[id="com.heytap.reader:id/iv_float_read_continue_close"]',
           exampleUrls:
             'https://m.gkd.li/6328439/3ee7210c-970e-4c9a-acb6-9254245c27a0',

src/apps/com.hihonor.appmarket.ts

@@ -24,23 +24,34 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
-      activityIds: [
+      matchTime: 10000,
-        'com.hihonor.android.launcher.unihome.UniHomeLauncher',
+      actionMaximum: 1,
-        'com.hihonor.appmarket.module.main.MainActivity',
+      resetMatch: 'app',
-      ],
+      rules: [
-      rules: '[id="com.hihonor.appmarket:id/iv_dialog_operation_close"]',
+        {
-      snapshotUrls: [
+          activityIds: [
-        'https://i.gkd.li/i/13063815',
+            'com.hihonor.android.launcher.unihome.UniHomeLauncher',
-        'https://i.gkd.li/i/13168440',
+            'com.hihonor.appmarket.module.main.MainActivity',
+          ],
+          matches: '[id="com.hihonor.appmarket:id/iv_dialog_operation_close"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13063815',
+            'https://i.gkd.li/i/13168440',
+          ],
+        },
       ],
     },
     {
       key: 2,
       name: '局部广告-悬浮窗小广告',
-      fastQuery: true,
+      rules: [
-      activityIds: 'com.hihonor.appmarket.module.main.MainActivity',
+        {
-      rules: '[id="com.hihonor.appmarket:id/iv_floating_close"]',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/13063928',
+          activityIds: '.module.main.MainActivity',
+          matches: '[id="com.hihonor.appmarket:id/iv_floating_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13063928',
+        },
+      ],
     },
     {
       key: 3,
@@ -49,9 +60,14 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       fastQuery: true,
-      rules:
+      rules: [
-        'TextView[text="接收通知"] < LinearLayout < LinearLayout +n [id="android:id/buttonPanel"] Button[text="否"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13073319',
+          activityIds: '.module.main.MainActivity',
+          matches:
+            'TextView[text="接收通知"] < LinearLayout < LinearLayout +n [id="android:id/buttonPanel"] Button[text="否"]',
+          snapshotUrls: 'https://i.gkd.li/i/13073319',
+        },
+      ],
     },
   ],
 });

src/apps/com.hihonor.cloudmusic.ts

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

src/apps/com.hihonor.health.ts

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

src/apps/com.hihonor.magichome.ts

@@ -24,13 +24,18 @@ export default defineGkdApp({
       key: 12,
       name: '更新提示',
       desc: '点击以后再说',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules:
+        {
-        'TextView[text="立即更新"] -2 [id="com.hihonor.magichome:id/negative_btn"][text="以后再说"]',
+          activityIds: '.business.MainActivity',
-      snapshotUrls: 'https://i.gkd.li/i/12916700',
+          matches:
+            'TextView[text="立即更新"] -2 [id="com.hihonor.magichome:id/negative_btn"][text="以后再说"]',
+          snapshotUrls: 'https://i.gkd.li/i/12916700',
+        },
+      ],
     },
   ],
 });

src/apps/com.hihonor.phoneservice.ts

@@ -8,6 +8,9 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           fastQuery: true,
@@ -23,10 +26,14 @@ export default defineGkdApp({
       name: '权限提示-定位权限',
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.hihonor.phoneservice.main.MainActivity',
+      rules: [
-      rules:
+        {
-        '[text^="开启定位权限"] + [id="com.hihonor.phoneservice:id/iv_close"]',
+          activityIds: 'com.hihonor.phoneservice.main.MainActivity',
-      snapshotUrls: 'https://i.gkd.li/i/12783134',
+          matches:
+            '[text^="开启定位权限"] + [id="com.hihonor.phoneservice:id/iv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12783134',
+        },
+      ],
     },
   ],
 });

src/apps/com.hihonor.vmall.ts

@@ -7,12 +7,19 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-应用内弹窗广告',
-      activityIds: [
+      matchTime: 10000,
-        'com.vmall.client.base.fragment.VmallWapActivity',
+      actionMaximum: 1,
-        'com.vmall.client.splash.fragment.SplashActivity',
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: [
+            'com.vmall.client.base.fragment.VmallWapActivity',
+            'com.vmall.client.splash.fragment.SplashActivity',
+          ],
+          matches: '[id="com.hihonor.vmall:id/gift_close_iv"]',
+          snapshotUrls: 'https://i.gkd.li/i/13060881',
+        },
       ],
-      rules: '[id="com.hihonor.vmall:id/gift_close_iv"]',
-      snapshotUrls: 'https://i.gkd.li/i/13060881',
     },
     {
       key: 2,

src/apps/com.hj119.sygjx.ts

@@ -8,9 +8,16 @@ export default defineGkdApp({
       key: 2,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
-      rules:
+      matchTime: 10000,
-        '@ImageView < FrameLayout +2 FrameLayout[childCount=2] > FrameLayout > TextView[text="立即下载"]',
+      actionMaximum: 1,
-      snapshotUrls: 'https://i.gkd.li/i/13226595',
+      resetMatch: 'app',
+      rules: [
+        {
+          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/13226595',
+        },
+      ],
     },
   ],
 });

src/apps/com.hlg.daydaytobusiness.ts

@@ -1,18 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.hlg.daydaytobusiness',
-  name: '稿定设计',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      fastQuery: true,
-      matchTime: 10000,
-      resetMatch: 'app',
-      actionMaximum: 1,
-      rules: '[text="现在升级"] - TextView[text="以后再说"]',
-      snapshotUrls: 'https://i.gkd.li/i/13766557',
-    },
-  ],
-});

src/apps/com.hnnx.pmbank.ts

@@ -1,19 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.hnnx.pmbank',
-  name: '河南农信',
-  groups: [
-    {
-      key: 3,
-      name: '更新提示',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules:
-        '[visibleToUser=true][text="是否下载最新版客户端？"] <<n [id="android:id/parentPanel"] Button[text="取消"]',
-      snapshotUrls: 'https://i.gkd.li/i/13536762',
-    },
-  ],
-});

src/apps/com.hpbr.bosszhipin.ts

@@ -13,6 +13,10 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: [
+            '.module.main.activity.MainActivity',
+            '.module.launcher.WelcomeActivity',
+          ],
           matches: '@ImageView[id="com.hpbr.bosszhipin:id/iv_cancle"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13440781',

src/apps/com.hpbr.directhires.ts

@@ -1,22 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.hpbr.directhires',
-  name: '店长直聘',
-  groups: [
-    {
-      key: 3,
-      name: '更新提示',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: [
-        {
-          matches: '[id="com.hpbr.directhires:id/iv_close"]',
-          snapshotUrls: 'https://i.gkd.li/i/13774242',
-        },
-      ],
-    },
-  ],
-});

src/apps/com.huaban.android.ts

@@ -1,23 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.huaban.android',
-  name: '花瓣',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示-版本更新弹窗',
-      desc: '点击不再提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      fastQuery: true,
-      rules: [
-        {
-          matches: '[vid="tv_update"] + * > [text="不再提示"]',
-          snapshotUrls: 'https://i.gkd.li/i/13832253',
-        },
-      ],
-    },
-  ],
-});

src/apps/com.huatu.handheld_huatu.ts

@@ -7,15 +7,22 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
-      activityIds: [
+      matchTime: 10000,
-        'com.huatu.handheld_huatu.view.MainPopDialog',
+      actionMaximum: 1,
-        'com.huatu.handheld_huatu.business.main.MainTabActivity',
+      resetMatch: 'app',
-      ],
+      rules: [
-      rules:
+        {
-        '[id="com.huatu.handheld_huatu:id/main_img_adv_bg"] + [id="com.huatu.handheld_huatu:id/main_img_close"]',
+          activityIds: [
-      snapshotUrls: [
+            'com.huatu.handheld_huatu.view.MainPopDialog',
-        'https://i.gkd.li/i/12715702', // activityId: 'com.huatu.handheld_huatu.view.MainPopDialog'
+            'com.huatu.handheld_huatu.business.main.MainTabActivity',
-        'https://i.gkd.li/i/12744973', // activityId: 'com.huatu.handheld_huatu.business.main.MainTabActivity'
+          ],
+          matches:
+            '[id="com.huatu.handheld_huatu:id/main_img_adv_bg"] + [id="com.huatu.handheld_huatu:id/main_img_close"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12715702',
+            'https://i.gkd.li/i/12744973',
+          ],
+        },
       ],
     },
     {
@@ -24,8 +31,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text*="开启通知提示"] +2 LinearLayout > [text="取消"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/12715719',
+        {
+          activityIds: '.business.main.MainTabActivity',
+          matches: '[text*="开启通知提示"] +2 LinearLayout > [text="取消"]',
+          snapshotUrls: 'https://i.gkd.li/i/12715719',
+        },
+      ],
     },
   ],
 });

src/apps/com.huawei.android.thememanager.ts

@@ -121,15 +121,6 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 8,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: '@[text="以后再说"] + [text="立即更新"]',
-      snapshotUrls: 'https://i.gkd.li/i/12727318',
-    },
     {
       key: 9,
       name: '权限提示-通知权限',

src/apps/com.huawei.appmarket.ts

@@ -22,12 +22,17 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '@[text="以后再说"] + [text="立即更新"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13228520',
+          activityIds: '.MarketActivity',
+          matches: '@[text="以后再说"] + [text="立即更新"]',
+          snapshotUrls: 'https://i.gkd.li/i/13228520',
+        },
+      ],
     },
     {
       key: 3,

src/apps/com.huawei.browser.ts

@@ -7,18 +7,16 @@ export default defineGkdApp({
     {
       key: 0,
       name: '开屏广告',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       priorityTime: 10000,
       rules: [
         {
-          matches: '[id$="/hiad_skip_text"]',
           action: 'clickCenter',
-          snapshotUrls: [
+          matches: '[text*="跳过"][text.length<10][visibleToUser=true]',
-            'https://i.gkd.li/i/12681995',
+          snapshotUrls: 'https://i.gkd.li/i/13403785',
-            'https://i.gkd.li/i/13403785',
-          ],
         },
       ],
     },
@@ -28,6 +26,7 @@ export default defineGkdApp({
       desc: '关闭资讯通知后，总是弹窗让打开',
       rules: [
         {
+          fastQuery: true,
           matches: '[id="com.huawei.browser:id/close_push_guide_window"]',
           exampleUrls:
             'https://m.gkd.li/87047583/3982b64a-15a7-4c0c-b179-2ed82d6ea18e',
@@ -38,13 +37,14 @@ export default defineGkdApp({
     {
       key: 2,
       name: '局部广告-卡片广告',
-      desc: '点击X',
+      desc: '点击关闭',
       rules: [
         {
+          fastQuery: true,
           activityIds:
             'com.huawei.browser.customtab.EmuiBrowserCustomTabActivity',
           matches:
-            'View[id="root"] > View[index=1] > View[id="logo-close-btn"]',
+            'View[id="root"] > View[index=1] > @View[visibleToUser=true][id="logo-close-btn"] <<n [vid="web_view_container"]',
           snapshotUrls: 'https://i.gkd.li/i/13997759',
         },
       ],

src/apps/com.huawei.genexcloud.speedtest.ts

@@ -1,25 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.huawei.genexcloud.speedtest',
-  name: '花瓣测速',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      desc: '点击"以后再说"',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: [
-        {
-          matches: '[id="com.huawei.genexcloud.speedtest:id/btn_cancle"]',
-          exampleUrls:
-            'https://m.gkd.li/57941037/03083d39-1d4c-4af7-8ba1-77201b2a87f2',
-          snapshotUrls: 'https://i.gkd.li/i/14061490',
-        },
-      ],
-    },
-  ],
-});

src/apps/com.huawei.health.ts

@@ -15,10 +15,9 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          matches: '[id$="hiad_skip_text"]',
           action: 'clickCenter',
+          matches: '[id="com.huawei.health:id/hiad_skip_text"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/12667766',
             'https://i.gkd.li/i/13215012',
             'https://i.gkd.li/i/13228290',
           ],
@@ -28,11 +27,11 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-“我的”页会员广告',
-      activityIds: ['com.huawei.health.MainActivity'],
       rules: [
         {
+          activityIds: 'com.huawei.health.MainActivity',
           matches: '[id="com.huawei.health:id/item_banner_ad_close_icon"]',
-          snapshotUrls: ['https://i.gkd.li/i/12667814'],
+          snapshotUrls: 'https://i.gkd.li/i/12667814',
         },
       ],
     },
@@ -52,15 +51,20 @@ export default defineGkdApp({
     {
       key: 3,
       name: '功能类-请求开启个性化推荐弹窗',
-      activityIds: 'com.huawei.watchface.api.WebViewActivity',
+      rules: [
-      rules: '[text="开启个性化推荐"] +2 [text="开启"] + Button',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13546292',
+          activityIds: 'com.huawei.watchface.api.WebViewActivity',
+          matches: '[text="开启个性化推荐"] +2 [text="开启"] + Button',
+          snapshotUrls: 'https://i.gkd.li/i/13546292',
+        },
+      ],
     },
     {
       key: 4,
       name: '局部广告-底部横幅广告',
       rules: [
         {
+          fastQuery: true,
           activityIds: 'com.huawei.health.MainActivity',
           matches: '[id="com.huawei.health:id/marketing_close_icon"]',
           snapshotUrls: 'https://i.gkd.li/i/13587206',
@@ -98,6 +102,8 @@ export default defineGkdApp({
       rules: [
         {
           action: 'back',
+          activityIds:
+            'com.huawei.hwversionmgr.activity.AppUpdateDialogActivity',
           matches: '[text="发现新版本"]',
           snapshotUrls: 'https://i.gkd.li/i/15521811',
         },

src/apps/com.huawei.hwid.ts

@@ -8,13 +8,15 @@ export default defineGkdApp({
       // 我不知道这个广告从哪里来的，它出乎意料地跳出并覆盖在Gspace上面
       key: 0,
       name: '全屏广告-弹窗广告',
-      activityIds: [
+      matchTime: 10000,
-        'com.huawei.openalliance.ad.ppskit.activity.InnerPPSInterstitialAdActivity',
+      actionMaximum: 1,
-      ],
+      resetMatch: 'app',
       rules: [
         {
+          activityIds:
+            'com.huawei.openalliance.ad.ppskit.activity.InnerPPSInterstitialAdActivity',
           matches: '[id="com.huawei.hwid:id/interstitial_close"]',
-          snapshotUrls: ['https://i.gkd.li/i/12709068'],
+          snapshotUrls: 'https://i.gkd.li/i/12709068',
         },
       ],
     },

src/apps/com.huawei.music.ts

@@ -18,26 +18,6 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 2,
-      name: '分段广告-广告反馈下拉窗',
-      fastQuery: true,
-      activityIds: 'com.huawei.openalliance.ad.activity.FeedbackActivity',
-      rules: [
-        {
-          matches:
-            'TextView[id="com.huawei.music:id/label_title"][text="直接关闭"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/13067574',
-            'https://i.gkd.li/i/13067572',
-            'https://i.gkd.li/i/13067571',
-            'https://i.gkd.li/i/13067659',
-            'https://i.gkd.li/i/13067665',
-            'https://i.gkd.li/i/13067820',
-          ],
-        },
-      ],
-    },
     {
       key: 3,
       name: '局部广告-播放界面直播浮窗',
@@ -51,67 +31,6 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 4,
-      name: '局部广告-播放（音乐、视频）页面广告',
-      fastQuery: true,
-      activityIds: 'com.android.mediacenter.MainActivity',
-      rules: [
-        {
-          matches:
-            'TextView[id="com.huawei.music:id/ad_icon"&&visibleToUser=true]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/13067956',
-            'https://i.gkd.li/i/13067978',
-            'https://i.gkd.li/i/13067387',
-          ],
-        },
-      ],
-    },
-    {
-      key: 5,
-      name: '局部广告-评论区广告',
-      fastQuery: true,
-      activityIds: 'com.android.mediacenter.comment.ui.CommentListMainActivity',
-      rules: [
-        {
-          matches: '[id="com.huawei.music:id/ad_icon"]',
-          snapshotUrls: 'https://i.gkd.li/i/13067937',
-        },
-      ],
-    },
-    {
-      key: 6,
-      name: '分段广告-视频播放页广告反馈',
-      fastQuery: true,
-      activityIds: 'com.android.mediacenter.MainActivity',
-      rules: [
-        {
-          matches: 'TextView[text="不感兴趣"][id$="title"][visibleToUser=true]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/13067986',
-            'https://i.gkd.li/i/13067981',
-          ],
-        },
-      ],
-    },
-    {
-      key: 7,
-      name: '局部广告-播放器上滑广告',
-      fastQuery: true,
-      activityIds: 'com.android.mediacenter.MainActivity',
-      rules: [
-        {
-          matches:
-            'ViewGroup > TextView[text="广告"][id$="ad_icon"][visibleToUser=true]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/13068935',
-            'https://i.gkd.li/i/13194163', // 避免在此规则误触
-            'https://i.gkd.li/i/13263590', // visibleToUser
-          ],
-        },
-      ],
-    },
     {
       key: 8,
       name: '全屏广告-弹窗广告',

src/apps/com.huawei.search.ts

@@ -6,25 +6,28 @@ export default defineGkdApp({
   groups: [
     {
       key: 0,
-      name: '局部广告-下拉搜索横幅广告',
+      name: '分段广告-下拉搜索横幅广告',
+      fastQuery: true,
       activityIds: [
         'com.huawei.search.HomeActivity',
         'com.huawei.search.MainActivity',
       ],
       rules: [
         {
+          key: 0,
           matches:
-            '[id="com.huawei.search:id/iv_topic_close_in_image"||id="com.huawei.search:id/iv_topic_left_close"||id="com.huawei.search:id/iv_topic_close_in_pps"]',
+            '[id="com.huawei.search:id/iv_topic_close_in_image" || id="com.huawei.search:id/iv_topic_left_close" || id="com.huawei.search:id/iv_topic_close_in_pps"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12667938',
             'https://i.gkd.li/i/12745008',
             'https://i.gkd.li/i/12841076',
-            'https://i.gkd.li/i/13266095', // iv_topic_close_in_pps
+            'https://i.gkd.li/i/13266095',
           ],
         },
         {
-          matches:
+          preKeys: [0],
-            'ViewGroup[id="com.huawei.search:id/unlike_flow_layout"] > TextView[text="直接关闭"]',
+          key: 1,
+          matches: 'TextView[text="直接关闭"]',
           snapshotUrls: ['https://i.gkd.li/i/12745001'],
         },
       ],

src/apps/com.huawei.smarthome.ts

@@ -1,17 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.huawei.smarthome',
-  name: '智慧生活',
-  groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: '@[text="以后再说"] +2 [text="立即更新"]',
-      snapshotUrls: 'https://i.gkd.li/i/12738253',
-    },
-  ],
-});

src/apps/com.huawei.wallet.ts

@@ -8,10 +8,10 @@ export default defineGkdApp({
       key: 1,
       name: '局部广告-钱包扩展服务提示',
       desc: '点击关闭',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
           matches:

src/apps/com.huaxiaozhu.rider.ts

@@ -9,10 +9,12 @@ export default defineGkdApp({
       name: '更新提示',
       desc: '点击"稍后更新"',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.huaxiaozhu.sdk.app.MainActivity',
           matches: '[text="稍后更新"]',
           exampleUrls:
             'https://m.gkd.li/57941037/7b5e81bf-6c51-4222-b832-ba4176be2a4b',
@@ -24,6 +26,9 @@ export default defineGkdApp({
       key: 2,
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           fastQuery: true,

src/apps/com.hunantv.imgo.activity.ts

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

src/apps/com.huodao.hdphone.ts

@@ -6,13 +6,15 @@ export default defineGkdApp({
   groups: [
     {
       key: 1,
-      fastQuery: true,
       name: '全屏广告-超级补贴日弹窗',
-      desc: '点击X',
+      desc: '点击关闭',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
-          matches:
+          matches: '[vid="iv_adv"] + [vid="dialog_close"]',
-            '[id="android:id/content"] >2 [id="com.huodao.hdphone:id/dialog_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13927567',
         },
       ],

src/apps/com.hupu.shihuo.ts

@@ -7,33 +7,42 @@ export default defineGkdApp({
     {
       key: 2,
       name: '权限提示-通知权限',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[text^="通知分类"] +n ImageView[id="com.hupu.shihuo:id/ivClose"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13704887',
+          matches: '[text="去开启"] + [id="com.hupu.shihuo:id/ivClose"]',
+          snapshotUrls: 'https://i.gkd.li/i/13704887',
+        },
+      ],
     },
     {
       key: 3,
       name: '全屏广告-弹窗广告',
-      desc: '点击左上角x关闭',
+      desc: '点击关闭',
-      activityIds:
+      rules: [
-        'com.shizhuang.duapp.modules.rn.mini.MiniReactActivity$MiniUITranslucentReactActivity',
+        {
-      rules:
+          activityIds:
-        '[id="com.hupu.shihuo:id/fragment_container"] >11 @ViewGroup[clickable=true] > ImageView',
+            'com.shizhuang.duapp.modules.rn.mini.MiniReactActivity$MiniUITranslucentReactActivity',
-      snapshotUrls: 'https://i.gkd.li/i/13115664',
+          matches:
+            '[id="com.hupu.shihuo:id/fragment_container"] >11 @ViewGroup[clickable=true] > ImageView',
+          snapshotUrls: 'https://i.gkd.li/i/13115664',
+        },
+      ],
     },
     {
       key: 4,
       name: '更新提示',
-      desc: '点击"以后再说"',
+      desc: '点击[以后再说]',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
       rules: [
         {
+          activityIds: 'com.shizhi.shihuoapp.module.main.ui.main.MainActivity',
           matches: '[text="发现新版本"] +2 ViewGroup > [text="以后再说"]',
           snapshotUrls: 'https://i.gkd.li/i/14052208',
         },

src/apps/com.hyww.wisdomtree.ts

@@ -7,13 +7,17 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           name: '百度广告',
+          fastQuery: true,
           activityIds: 'com.baidu.mobads.sdk.api.MobRewardVideoActivity',
           matches:
-            '[id="android:id/content"] >n RelativeLayout[childCount<=3] > ImageView[clickable=true]',
+            '@ImageView[clickable=true][childCount=0] + RelativeLayout >(1,2) [text="反馈"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13799876',
             'https://i.gkd.li/i/13852024',

src/apps/com.icbc.ts

@@ -4,18 +4,19 @@ export default defineGkdApp({
   id: 'com.icbc',
   name: '中国工商银行',
   groups: [
-    {
-      key: 0,
-      name: '功能类-第一次启动提示',
-      activityIds: 'com.icbc.activity.init.SplashActivity',
-      rules: '[id="com.icbc:id/close_btn"]',
-    },
     {
       key: 1,
       name: '全屏广告-弹窗广告',
-      activityIds: 'com.icbc.activity.main.MainActivity',
+      fastQuery: true,
-      rules: '[id="com.icbc:id/tv_time"][text*="跳过"][text.length<=6]',
+      actionMaximum: 1,
-      snapshotUrls: 'https://i.gkd.li/i/13330431',
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.icbc.activity.main.MainActivity',
+          matches: '[id="com.icbc:id/tv_time"][text*="跳过"][text.length<=6]',
+          snapshotUrls: 'https://i.gkd.li/i/13330431',
+        },
+      ],
     },
   ],
 });

src/apps/com.ideal.flyerteacafes.ts

@@ -11,10 +11,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.ideal.flyerteacafes.ui.HomeActivity',
+      rules: [
-      rules:
+        {
-        '@[id="com.ideal.flyerteacafes:id/close"] - FrameLayout > [id="com.ideal.flyerteacafes:id/tv_time_down"]',
+          activityIds: 'com.ideal.flyerteacafes.ui.HomeActivity',
-      snapshotUrls: 'https://i.gkd.li/i/13466119',
+          matches:
+            '@[id="com.ideal.flyerteacafes:id/close"] - FrameLayout > [id="com.ideal.flyerteacafes:id/iv_adv_tip"]',
+          snapshotUrls: 'https://i.gkd.li/i/13466119',
+        },
+      ],
     },
   ],
 });

src/apps/com.ifeng.news2.ts

@@ -70,13 +70,18 @@ export default defineGkdApp({
     {
       key: 10,
       name: '权限提示-定位权限',
-      desc: '自动点击取消',
+      desc: '点击取消',
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.ifeng.news2.activity.IfengTabMainActivity',
+      rules: [
-      rules:
+        {
-        '[text*="请求您的位置"] + [id="com.ifeng.news2:id/permission_cancel"]',
+          activityIds: 'com.ifeng.news2.activity.IfengTabMainActivity',
-      snapshotUrls: 'https://i.gkd.li/i/12705531',
+          matches:
+            '[text*="请求您的位置"] + [id="com.ifeng.news2:id/permission_cancel"]',
+          snapshotUrls: 'https://i.gkd.li/i/12705531',
+        },
+      ],
     },
   ],
 });

src/apps/com.iflytek.womusicclient.ts

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

src/apps/com.igpsport.igpsportandroid.ts

@@ -10,8 +10,16 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[text="忽略本次"] + [text="立即升级"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13797203',
+        {
+          fastQuery: true,
+          activityIds: 'com.igpsport.globalapp.main.MainActivity',
+          matches:
+            '@[visibleToUser=true][text="忽略本次"] <<n [vid="updateComposeView"]',
+          exampleUrls: 'https://e.gkd.li/57341233-2547-4469-869c-e05fdebb20fc',
+          snapshotUrls: 'https://i.gkd.li/i/13797203',
+        },
+      ],
     },
   ],
 });

src/apps/com.intsig.camscanner.ts

@@ -40,11 +40,16 @@ export default defineGkdApp({
     {
       key: 3,
       name: '其他-关闭[发现新截图]提示',
-      fastQuery: true,
+      rules: [
-      activityIds: '.mainmenu.mainactivity.MainActivity',
+        {
-      rules: 'RelativeLayout[vid="rl_screenshot"] + ImageView[vid="iv_esc"]',
+          fastQuery: true,
-      exampleUrls: 'https://e.gkd.li/c66080aa-1758-4a69-9752-aa1373d7f2b5',
+          activityIds: '.mainmenu.mainactivity.MainActivity',
-      snapshotUrls: 'https://i.gkd.li/i/16975714',
+          matches:
+            'RelativeLayout[vid="rl_screenshot"] + ImageView[vid="iv_esc"]',
+          exampleUrls: 'https://e.gkd.li/c66080aa-1758-4a69-9752-aa1373d7f2b5',
+          snapshotUrls: 'https://i.gkd.li/i/16975714',
+        },
+      ],
     },
   ],
 });

src/apps/com.jarworld.bleach.bvn.sjm.cyc.ts

@@ -28,11 +28,10 @@ export default defineGkdApp({
         },
         {
           key: 2,
+          fastQuery: true,
           activityIds: 'com.kwad.sdk.api.proxy.app.KsRewardVideoActivity',
-          matches: [
+          matches:
-            'WebView > View > View > [text="广告"]',
+            'ViewGroup[childCount=2] > ViewGroup[childCount=2] > @ViewGroup[clickable=true][childCount=1][visibleToUser=true] > ImageView[childCount=0] <<n [id="com.jarworld.bleach.bvn.sjm.cyc:id/ksad_js_reward_card"]',
-            'ViewGroup[childCount=2] > @ViewGroup[childCount=1] > ImageView[childCount=0]',
-          ],
           snapshotUrls: 'https://i.gkd.li/i/13635410',
         },
       ],

src/apps/com.jc.avatar.mm.ts

@@ -8,10 +8,17 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
-      activityIds: 'com.jc.avatar.mm.MainActivity',
+      matchTime: 10000,
-      rules:
+      actionMaximum: 1,
-        '@ImageView[childCount=0][text=null][visibleToUser=true] < FrameLayout[childCount=1] <2 FrameLayout[childCount=2] <2 FrameLayout[childCount=2] <2 FrameLayout[childCount=2] - FrameLayout > [text^="扭动或点击"]',
+      resetMatch: 'app',
-      snapshotUrls: 'https://i.gkd.li/i/13188475',
+      rules: [
+        {
+          activityIds: 'com.jc.avatar.mm.MainActivity',
+          matches:
+            '@ImageView[childCount=0][text=null][visibleToUser=true] < FrameLayout[childCount=1] <2 FrameLayout[childCount=2] <2 FrameLayout[childCount=2] <2 FrameLayout[childCount=2] - FrameLayout > [text^="扭动或点击"]',
+          snapshotUrls: 'https://i.gkd.li/i/13188475',
+        },
+      ],
     },
   ],
 });

src/apps/com.jd.app.reader.ts

@@ -43,21 +43,11 @@ export default defineGkdApp({
       ],
     },
     {
-      key: 1,
+      key: 2,
-      name: '更新提示',
+      name: '全屏广告-首页弹窗广告',
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: [
-        {
-          matches: '@[text="下次再说"] +(2) [text="立即更新"]',
-          snapshotUrls: ['https://i.gkd.li/i/12686632'],
-        },
-      ],
-    },
-    {
-      key: 2,
-      name: '全屏广告-首页弹窗广告',
       rules: [
         {
           fastQuery: true,
@@ -71,11 +61,15 @@ export default defineGkdApp({
     {
       key: 3,
       name: '全屏广告-阅读页面弹窗广告',
-      activityIds: 'com.jd.read.engine.activity.EngineReaderActivity',
+      rules: [
-      rules: '[id$="ad_read_close"]',
+        {
-      snapshotUrls: [
+          activityIds: 'com.jd.read.engine.activity.EngineReaderActivity',
-        'https://i.gkd.li/i/12881810',
+          matches: '[id$="ad_read_close"]',
-        'https://i.gkd.li/i/12893631',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12881810',
+            'https://i.gkd.li/i/12893631',
+          ],
+        },
       ],
     },
   ],

src/apps/com.jd.jdlite.ts

@@ -7,9 +7,16 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
-      activityIds: 'com.jd.jdlite.MainFrameActivity',
+      matchTime: 10000,
-      rules: '@[desc="关闭页面"] - FrameLayout >n [text="极速版弹窗"]',
+      actionMaximum: 1,
-      snapshotUrls: 'https://i.gkd.li/i/12727396',
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.jd.jdlite.MainFrameActivity',
+          matches: '@[desc="关闭页面"] - FrameLayout >n [text="极速版弹窗"]',
+          snapshotUrls: 'https://i.gkd.li/i/12727396',
+        },
+      ],
     },
     {
       key: 10,
@@ -17,9 +24,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '@ImageView[clickable=true] - LinearLayout > [text="开启消息通知"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13062969',
+          activityIds: '.MainFrameActivity',
+          matches:
+            '@ImageView[clickable=true] - LinearLayout > [text="开启消息通知"]',
+          snapshotUrls: 'https://i.gkd.li/i/13062969',
+        },
+      ],
     },
   ],
 });

src/apps/com.jd.jrapp.ts

@@ -11,16 +11,17 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      actionMaximumKey: 0,
       rules: [
         {
           key: 0,
+          activityIds: '.bm.mainbox.main.MainActivity',
           matches:
             'TextView[text^="打开通知"] +2 [id="com.jd.jrapp:id/iv_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13249998',
         },
         {
           key: 1,
+          activityIds: '.bm.common.web.ui.WebActivity',
           matches:
             '@View - * > [visibleToUser=true][text="开启并订阅通知"] <<n [id="com.jd.jrapp:id/webview"]',
           snapshotUrls: 'https://i.gkd.li/i/13255656',
@@ -34,9 +35,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '@ImageButton[id="com.jd.jrapp:id/ib_close"] + RelativeLayout [text^="发现新版本"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13628364',
+          activityIds: '.bm.mainbox.main.MainActivity',
+          matches:
+            '@ImageButton[id="com.jd.jrapp:id/ib_close"] + RelativeLayout [text^="发现新版本"]',
+          snapshotUrls: 'https://i.gkd.li/i/13628364',
+        },
+      ],
     },
     {
       key: 3,
@@ -45,8 +51,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@ImageView[clickable=true] - [text$="满意度打几分？"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13804561',
+        {
+          activityIds: '.dy.api.JRDynamicPickerActivity',
+          matches: '@ImageView[clickable=true] - [text$="满意度打几分？"]',
+          snapshotUrls: 'https://i.gkd.li/i/13804561',
+        },
+      ],
     },
   ],
 });

src/apps/com.jd.jxj.ts

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

src/apps/com.jd.pingou.ts

@@ -7,11 +7,19 @@ export default defineGkdApp({
     {
       key: 1,
       name: '权限提示-定位权限',
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.jd.jdlite.MainFrameActivity',
+      rules: [
-      rules: '[text*="开启定位授权"] +2 ImageView',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13804515',
+          fastQuery: true,
+          activityIds: 'com.jd.jdlite.MainFrameActivity',
+          matches:
+            '@ImageView[clickable=true][visibleToUser=true] -2 [text^="开启定位授权"]',
+          exampleUrls: 'https://e.gkd.li/311e64ee-e775-41fb-b981-ceead0280ac7',
+          snapshotUrls: 'https://i.gkd.li/i/13804515',
+        },
+      ],
     },
   ],
 });

src/apps/com.jdcloud.mt.smartrouter.ts

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

src/apps/com.jdd.motorfans.ts

@@ -11,6 +11,13 @@ export default defineGkdApp({
         {
           key: 0,
           fastQuery: true,
+          activityIds: [
+            '.MTMainActivity',
+            '.modules.detail.DetailActivity2',
+            '.search.SearchMainActivity',
+            '.modules.base.FragmentContainerActivity',
+            '.message.ChatDetailActivity',
+          ],
           matches:
             '[id="com.jdd.motorfans:id/ad_content"] >n [id="com.jdd.motorfans:id/iv_close"]',
           snapshotUrls: [
@@ -19,8 +26,6 @@ export default defineGkdApp({
             'https://i.gkd.li/i/12878843',
             'https://i.gkd.li/i/12913956',
             'https://i.gkd.li/i/13188861',
-            'https://i.gkd.li/i/12840710',
-            'https://i.gkd.li/i/13188928',
             'https://i.gkd.li/i/14546613',
           ],
         },
@@ -53,7 +58,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          name: '点x按钮',
+          name: '点关闭按钮',
           matches:
             '[id="com.jdd.motorfans:id/recyclerView"] > FrameLayout[id="com.jdd.motorfans:id/container"] > FrameLayout[childCount=3] > ImageView[clickable=true][id=null] + ImageView[clickable=true][id=null]', //虽然在审查页面能匹配上，但是在“执行选择器”功能下一直处于搜索中，先添加后到真机测试
           snapshotUrls: 'https://i.gkd.li/i/12826382',

src/apps/com.jf.my.ts

@@ -11,8 +11,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
+      actionMaximumKey: 0,
       rules: [
         {
+          key: 0,
+          activityIds: [
+            '.MainActivity',
+            'com.lbe.security.ui.CountdownDialogActivity',
+          ],
           matches:
             '[id="com.jf.my:id/btn_ok"][text="更新"] - [id="com.jf.my:id/btn_cancel"][text="关闭"]',
           snapshotUrls: [
@@ -21,6 +27,7 @@ export default defineGkdApp({
           ],
         },
         {
+          key: 1,
           matches:
             '[id="com.jf.my:id/toUpgradeTv"] - [id="com.jf.my:id/cancelTv"]',
           snapshotUrls: 'https://i.gkd.li/i/13786867',
@@ -30,9 +37,16 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
-      activityIds: 'com.jf.my.main.ui.dialog.HomeRedPackageDialog',
+      matchTime: 10000,
-      rules: '[id="com.jf.my:id/iv_back"]',
+      actionMaximum: 1,
-      snapshotUrls: 'https://i.gkd.li/i/12840619',
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.jf.my.main.ui.dialog.HomeRedPackageDialog',
+          matches: '[id="com.jf.my:id/iv_back"]',
+          snapshotUrls: 'https://i.gkd.li/i/12840619',
+        },
+      ],
     },
   ],
 });

src/apps/com.jianshu.haruki.ts

@@ -23,13 +23,22 @@ export default defineGkdApp({
       key: 2,
       name: '更新提示',
       fastQuery: true,
-      actionMaximum: 1,
       matchTime: 10000,
+      actionMaximum: 1,
       resetMatch: 'app',
+      activityIds: 'com.jianshu.wireless.articleV2.X5ArticleDetailActivity',
       rules: [
         {
-          action: 'back',
+          key: 0,
-          matches: '[text="升级到最新版本"]',
+          matches: '@[checked=false] + [text="忽略此版本"]',
+          exampleUrls: 'https://e.gkd.li/23662d6a-1858-4d97-9bc7-ef03ede9f316',
+          snapshotUrls: 'https://i.gkd.li/i/15989275',
+        },
+        {
+          preKeys: [0],
+          key: 1,
+          matches: '[text="取消"]',
+          exampleUrls: 'https://e.gkd.li/23662d6a-1858-4d97-9bc7-ef03ede9f316',
           snapshotUrls: 'https://i.gkd.li/i/15989275',
         },
       ],
@@ -38,11 +47,11 @@ export default defineGkdApp({
       key: 3,
       name: '局部广告-首页信息流广告',
       desc: '点击关闭',
-      fastQuery: true,
       rules: [
         {
-          matches: 'ImageView[vid="nativeAdClose"]',
+          fastQuery: true,
           activityIds: 'com.baiji.jianshu.MainActivity',
+          matches: 'ImageView[vid="nativeAdClose"]',
           snapshotUrls: 'https://i.gkd.li/i/16201541',
         },
       ],

src/apps/com.jin10.ts

@@ -10,29 +10,51 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '@[id="com.jin10:id/update_cancel"] + [id="com.jin10:id/iv_pic"]',
+      rules: [
-      snapshotUrls: ['https://i.gkd.li/i/12706043'],
+        {
+          activityIds: '.lgd.update.UpdateActivity',
+          matches:
+            '@[id="com.jin10:id/update_cancel"] + [id="com.jin10:id/iv_pic"]',
+          snapshotUrls: 'https://i.gkd.li/i/12706043',
+        },
+      ],
     },
     {
       key: 2,
       name: '全屏广告-首页弹窗广告',
-      activityIds: ['com.jin10.lgd.biz.MainActivity'],
+      matchTime: 10000,
-      rules: '[id="com.jin10:id/iv_body"] + [id="com.jin10:id/iv_close"]',
+      actionMaximum: 1,
-      snapshotUrls: ['https://i.gkd.li/i/12706045'],
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.jin10.lgd.biz.MainActivity',
+          matches: '[id="com.jin10:id/iv_body"] + [id="com.jin10:id/iv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12706045',
+        },
+      ],
     },
     {
       key: 3,
       name: '全屏广告-快讯页面弹窗广告',
-      activityIds: ['com.jin10.lgd.biz.MainActivity'],
+      rules: [
-      rules: '@[id="com.jin10:id/iv_close"] + [id="com.jin10:id/iv_pic"]',
+        {
-      snapshotUrls: ['https://i.gkd.li/i/12706047'],
+          activityIds: 'com.jin10.lgd.biz.MainActivity',
+          matches: '@[id="com.jin10:id/iv_close"] + [id="com.jin10:id/iv_pic"]',
+          snapshotUrls: 'https://i.gkd.li/i/12706047',
+        },
+      ],
     },
     {
       key: 10,
       name: '局部广告-会员页面顶部广告',
-      activityIds: ['com.jin10.lgd.biz.MainActivity'],
+      rules: [
-      rules: '[id="com.jin10:id/iv_header"] + [id="com.jin10:id/iv_close"]',
+        {
-      snapshotUrls: ['https://i.gkd.li/i/12706051'],
+          activityIds: 'com.jin10.lgd.biz.MainActivity',
+          matches:
+            '[id="com.jin10:id/iv_header"] + [id="com.jin10:id/iv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12706051',
+        },
+      ],
     },
   ],
 });

src/apps/com.jingdong.pdj.ts

@@ -7,17 +7,20 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
+      fastQuery: true,
       matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       activityIds: 'pdj.main.MainActivity',
       rules: [
         {
           key: 0,
-          matches: 'WebView[text="京东到家"] >7 TextView[text=""]',
+          matches:
+            'WebView[text="京东到家"] >5 @View[clickable=true][childCount=1][visibleToUser=true] > View[childCount=1] > TextView[childCount=0] <<n [id="com.jingdong.pdj:id/mWebView"]',
           snapshotUrls: 'https://i.gkd.li/i/13217796',
         },
         {
           key: 1,
-          fastQuery: true,
           matches: '[id="com.jingdong.pdj:id/ivClose"][desc="关闭"]',
           snapshotUrls: 'https://i.gkd.li/i/13223282',
         },
@@ -30,8 +33,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: 'Button[text="暂不安装"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13217634',
+        {
+          activityIds: '.plunginupdate.update.UpdateDialogActivity',
+          matches: 'Button[text="暂不安装"]',
+          snapshotUrls: 'https://i.gkd.li/i/13217634',
+        },
+      ],
     },
   ],
 });

src/apps/com.jingyao.easybike.ts

@@ -4,7 +4,6 @@ export default defineGkdApp({
   id: 'com.jingyao.easybike',
   name: '哈啰',
   groups: [
-    // 预留 key 0-8
     {
       key: 1,
       name: '更新提示',
@@ -23,26 +22,38 @@ export default defineGkdApp({
     {
       key: 8,
       name: '权限提示-通知权限',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '[text*="开启通知"] < FrameLayout + FrameLayout >2 [text="取消"]',
+        {
-      snapshotUrls: [
+          activityIds: [
-        'https://i.gkd.li/i/13228735',
+            'com.yanzhenjie.permission.PermissionActivity',
-        'https://i.gkd.li/i/13402675',
+            'com.hellobike.atlas.business.portal.PortalActivity',
+          ],
+          matches: ['[text*="开启通知"]', '[text="取消"]'],
+          snapshotUrls: [
+            'https://i.gkd.li/i/13228735',
+            'https://i.gkd.li/i/13402675',
+          ],
+        },
       ],
     },
     {
       key: 9,
       name: '权限提示-定位权限',
       fastQuery: true,
+      matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.hellobike.atlas.business.portal.PortalActivity',
+      rules: [
-      rules:
+        {
-        '[text="系统定位服务已关闭"] < FrameLayout +n FrameLayout >2 [text="取消"]',
+          activityIds: 'com.hellobike.atlas.business.portal.PortalActivity',
-      snapshotUrls: 'https://i.gkd.li/i/13228677',
+          matches: ['[text="系统定位服务已关闭"]', '[text="取消"]'],
+          snapshotUrls: 'https://i.gkd.li/i/13228677',
+        },
+      ],
     },
     {
       key: 10,
@@ -50,6 +61,10 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
           activityIds: [
             'com.hellobike.ads.widget.insert.dialog.HBAdvertDialog',
             'com.hellobike.atlas.business.portal.PortalActivity',
@@ -63,6 +78,9 @@ export default defineGkdApp({
         {
           key: 1,
           fastQuery: true,
+          matchTime: 10000,
+          actionMaximum: 1,
+          resetMatch: 'app',
           activityIds:
             'com.hellobike.evehicle.business.main.EVehicleHomeManagerActivity',
           matches:
@@ -95,13 +113,17 @@ export default defineGkdApp({
     },
     {
       key: 15,
-      fastQuery: true,
+      name: '其他-新人教学弹窗',
-      name: '功能类-新人教学弹窗',
       desc: '点击跳过',
-      activityIds: 'com.alipay.mobile.nebulacore.ui.H5Activity',
+      fastQuery: true,
-      rules:
+      rules: [
-        '@View[text="跳过"] <2 View <2 View <<n FrameLayout[id="com.jingyao.easybike:id/h5_pc_container"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13837543',
+          activityIds: 'com.alipay.mobile.nebulacore.ui.H5Activity',
+          matches:
+            '@View[text="跳过"] <2 View <2 View <<n FrameLayout[id="com.jingyao.easybike:id/h5_pc_container"]',
+          snapshotUrls: 'https://i.gkd.li/i/13837543',
+        },
+      ],
     },
   ],
 });

src/apps/com.jiongji.andriod.card.ts

@@ -7,10 +7,18 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-活动弹窗',
-      activityIds: 'com.baicizhan.main.activity.MainTabActivity',
+      fastQuery: true,
-      rules:
+      matchTime: 10000,
-        '[text="反馈"] + ImageView + ImageView[childCount=0][clickable=true]',
+      actionMaximum: 1,
-      snapshotUrls: 'https://i.gkd.li/i/13415075',
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds: 'com.baicizhan.main.activity.MainTabActivity',
+          matches:
+            '@ImageView[clickable=true][visibleToUser=true] -2 [text="反馈"]',
+          snapshotUrls: 'https://i.gkd.li/i/13415075',
+        },
+      ],
     },
     {
       key: 3,
@@ -19,8 +27,13 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules: '[text="抢先体验"] - [text="取消"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13488652',
+        {
+          activityIds: 'com.baicizhan.main.activity.MainTabActivity',
+          matches: '[text="抢先体验"] - [text="取消"]',
+          snapshotUrls: 'https://i.gkd.li/i/13488652',
+        },
+      ],
     },
   ],
 });

src/apps/com.jisu.manhua.ts

@@ -8,9 +8,12 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       fastQuery: true,
-      activityIds: 'com.ilike.cartoon.activities.HomeActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.ilike.cartoon.activities.HomeActivity',
           matches:
             '[id="com.jisu.manhua:id/iv_promotion"] + [id="com.jisu.manhua:id/iv_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13688186',

src/apps/com.jiutian.jiutianapp.sss.ts

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

src/apps/com.jovetech.CloudSee.temp.ts

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

src/apps/com.jsguohua.youquanmall.tt.ts

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

src/apps/com.jsmcc.ts

@@ -4,21 +4,6 @@ export default defineGkdApp({
   id: 'com.jsmcc',
   name: '中国移动江苏',
   groups: [
-    {
-      key: 1,
-      name: '更新提示',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: [
-        {
-          key: 0,
-          matches: '[id="com.jsmcc:id/cancelVersionTV"]',
-          snapshotUrls: 'https://i.gkd.li/i/13327322',
-        },
-      ],
-    },
     {
       key: 2,
       name: '权限提示-通知权限',
@@ -29,6 +14,7 @@ export default defineGkdApp({
       rules: [
         {
           action: 'back',
+          activityIds: '.ui.MainActivityGroupNew',
           matches: 'ImageView[vid="notice_dia"]',
           snapshotUrls: 'https://i.gkd.li/i/16215987',
         },

src/apps/com.julanling.app.ts

@@ -9,10 +9,17 @@ export default defineGkdApp({
       name: '全屏广告-弹窗广告',
       desc: '点击关闭',
       fastQuery: true,
-      activityIds: 'com.julanling.dgq.main.view.MainFragmentActivity',
+      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/13523567',
+      rules: [
+        {
+          activityIds: 'com.julanling.dgq.main.view.MainFragmentActivity',
+          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/13523567',
+        },
+      ],
     },
   ],
 });

src/apps/com.jxedt.ts

@@ -7,18 +7,26 @@ export default defineGkdApp({
     {
       key: 2,
       name: '局部广告-卡片广告',
-      activityIds: 'com.jxedt.ui.activitys.exercise.OrderExerciseActivity',
+      rules: [
-      rules: '[id="com.jxedt:id/img_question_banner_close"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13195641',
+          fastQuery: true,
+          activityIds: 'com.jxedt.ui.activitys.exercise.OrderExerciseActivity',
+          matches: '[id="com.jxedt:id/img_question_banner_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13195641',
+        },
+      ],
     },
     {
       key: 3,
       name: '全屏广告-弹窗广告',
+      fastQuery: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           activityIds: 'com.jxedt.ui.activitys.NewHomeActivity',
-          fastQuery: true,
           matches: '[id="com.jxedt:id/img_dialog_ad_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13476741',
         },

src/apps/com.jym.mall.ts

@@ -1,21 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.jym.mall',
-  name: '交易猫',
-  groups: [
-    {
-      key: 0,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: {
-        matches: '[id="com.jym.mall:id/tv_cancel"][text="下次再说"]',
-        exampleUrls:
-          'https://m.gkd.li/57941037/3fa65227-8284-4343-ac5c-d509b8eb70bf',
-        snapshotUrls: 'https://i.gkd.li/i/12496974',
-      },
-    },
-  ],
-});

src/apps/com.jz.xydj.ts

@@ -7,7 +7,7 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-卡片广告',
-      desc: '[ChangeMe]本规则由GKD网页端审查工具生成',
+      desc: '点击关闭',
       rules: [
         {
           key: 0,

src/apps/com.kaoshibaodian.app.ts

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

src/apps/com.kk.ysk3.tz12063k.ts

@@ -8,6 +8,9 @@ export default defineGkdApp({
       key: 1,
       name: '通知提示-公告弹窗',
       desc: '点击[朕知道了]',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           fastQuery: true,

src/apps/com.klcxkj.zqxy.ts

@@ -36,17 +36,10 @@ export default defineGkdApp({
             'https://i.gkd.li/i/13707849',
           ],
         },
-        {
-          key: 4,
-          name: '字节广告',
-          activityIds:
-            'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
-          matches:
-            '@Image[text=""] < View +n View > View > TextView[text="广告"]',
-        },
         {
           key: 5,
           name: '吉欣广告',
+          fastQuery: true,
           activityIds: 'com.klcxkj.zqxy.ui.splash.SplashActivity',
           matches: '@ViewGroup < ViewGroup +2 ViewGroup > [text="吉欣广告"]',
           snapshotUrls: 'https://i.gkd.li/i/13274838',
@@ -68,12 +61,11 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
-          activityIds: [
+          activityIds:
             'com.klcxkj.zqxy.ui.device.drink.ble.DrinkingBleActivity',
-          ],
           matches:
-            '[id="com.klcxkj.zqxy:id/bathing_adv_layout"] >n FrameLayout[childCount=1] > ImageView',
+            '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]',
-          snapshotUrls: ['https://i.gkd.li/i/13488870'],
+          snapshotUrls: 'https://i.gkd.li/i/13488870',
         },
       ],
     },

src/apps/com.kmxs.reader.ts

@@ -4,15 +4,6 @@ export default defineGkdApp({
   id: 'com.kmxs.reader',
   name: '七猫免费小说',
   groups: [
-    {
-      key: -2,
-      name: '更新提示',
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules: '[id="com.kmxs.reader:id/tv_update_cancel"]',
-      snapshotUrls: 'https://i.gkd.li/i/12641338',
-    },
     {
       key: 2,
       name: '分段广告-阅读页面广告',
@@ -39,10 +30,7 @@ export default defineGkdApp({
       activityIds: 'org.geometerplus.android.fbreader.FBReader',
       rules: [
         {
-          matches: [
+          matches: '[id="com.kmxs.reader:id/ad_direct_close"]',
-            '[text$="广告"]',
-            '[id="com.kmxs.reader:id/ad_direct_close"]',
-          ],
           snapshotUrls: [
             'https://i.gkd.li/i/12640303',
             'https://i.gkd.li/i/13362269',
@@ -73,13 +61,13 @@ export default defineGkdApp({
     {
       key: 5,
       name: '全屏广告-字节视频广告',
-      desc: '此规则有概率误触或失效，请谨慎选择开启。',
+      desc: '点击关闭',
-      activityIds:
+      actionDelay: 300,
-        'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
       rules: [
         {
           key: 0,
-          name: '点击跳过',
+          activityIds:
+            'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
           matches: '[text*="跳过"][text.length<=10]',
           snapshotUrls: [
             'https://i.gkd.li/i/13459157',
@@ -89,40 +77,27 @@ export default defineGkdApp({
         },
         {
           key: 1,
-          name: '点击"x"',
+          activityIds:
+            'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
           fastQuery: true,
           matches:
             '[id="com.byted.pangle:id/tt_reward_full_count_down_after_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13459182',
         },
-      ],
-    },
-    {
-      key: 6,
-      name: '全屏广告-百度',
-      desc: '此规则有概率误触或失效，请谨慎选择开启。',
-      activityIds: 'com.baidu.mobads.sdk.api.MobRewardVideoActivity',
-      rules: [
         {
-          key: 0,
+          key: 2,
-          name: '点击"x"',
+          fastQuery: true,
+          activityIds: 'com.baidu.mobads.sdk.api.MobRewardVideoActivity',
           matches:
-            'RelativeLayout > RelativeLayout + ImageView + ImageView[clickable=true]',
+            '@ImageView[clickable=true][visibleToUser=true][childCount=0] <3 RelativeLayout[childCount=4] < [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/13472957',
         },
-      ],
-    },
-    {
-      key: 7,
-      name: '全屏广告-腾讯',
-      desc: '此规则有概率误触或失效，请谨慎选择开启。',
-      activityIds: 'com.qq.e.ads.PortraitADActivity',
-      rules: [
         {
-          key: 0,
+          key: 3,
-          name: '点击"x"',
+          fastQuery: true,
+          activityIds: 'com.qq.e.ads.PortraitADActivity',
           matches:
-            'FrameLayout[childCount=10] > FrameLayout[index=3] > FrameLayout > ImageView',
+            '@ImageView[visibleToUser=true][childCount=0] < FrameLayout[childCount=1] < FrameLayout[childCount=1] + FrameLayout >3 [text^="摇动或点击"]',
           snapshotUrls: 'https://i.gkd.li/i/13472955',
         },
       ],
@@ -150,11 +125,14 @@ export default defineGkdApp({
     },
     {
       key: 9,
-      fastQuery: true,
       name: '全屏广告-今日专属推荐弹窗',
-      desc: '点击X',
+      desc: '点击关闭',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          fastQuery: true,
           matches: '[id="com.kmxs.reader:id/close"]',
           snapshotUrls: 'https://i.gkd.li/i/13941276',
         },

src/apps/com.koudai.weidian.buyer.ts

@@ -10,10 +10,15 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.vdian.android.wdb.main.ui.activity.MainTabsActivity',
+      rules: [
-      rules:
+        {
-        'FrameLayout > FrameLayout > RelativeLayout > ImageView[clickable=true][index=1]',
+          activityIds:
-      snapshotUrls: 'https://i.gkd.li/i/13646151',
+            'com.vdian.android.wdb.main.ui.activity.MainTabsActivity',
+          matches:
+            '@ImageView[clickable=true][visibleToUser=true][childCount=0] <2 RelativeLayout[childCount=2] < FrameLayout <2 [parent=null]',
+          snapshotUrls: 'https://i.gkd.li/i/13646151',
+        },
+      ],
     },
   ],
 });

src/apps/com.ksf.yyx.ts

@@ -48,26 +48,26 @@ export default defineGkdApp({
     {
       key: 2,
       name: '全屏广告-插屏广告',
-      activityIds: [
+      desc: '点击关闭',
-        'com.ksf.yyx.MainActivity',
-        'com.sigmob.sdk.base.common.TransparentAdActivity',
-        // 'com.miui.wakepath.ui.ConfirmStartActivity', //抓到activityIds为小米的 不确定是否正常
-        // 'com.miui.home.launcher.Launcher',
-      ],
       rules: [
         {
+          key: 1,
+          fastQuery: true,
+          activityIds: '.MainActivity',
           matches: '[id="com.ksf.yyx:id/ksad_container"] [text="跳过"]',
           snapshotUrls: 'https://i.gkd.li/i/12775922',
         },
         {
+          key: 2,
+          fastQuery: true,
+          activityIds: '.MainActivity',
           matches:
-            '[id="com.ksf.yyx:id/ksad_container"] TextView[text="广告"] <2 ViewGroup -n ViewGroup[childCount=1] > @ViewGroup[childCount=1 && clickable=true] > ImageView',
+            'ImageView[childCount=0][text=null] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] < ViewGroup +n ViewGroup[childCount=2] > [text="广告"]',
-          snapshotUrls: [
+          snapshotUrls: 'https://i.gkd.li/i/12775923',
-            'https://i.gkd.li/i/12775923',
-            'https://i.gkd.li/i/12998899',
-          ],
         },
         {
+          key: 3,
+          activityIds: 'com.sigmob.sdk.base.common.TransparentAdActivity',
           matches: '[id="ad_area"] [id="close_btn"][clickable=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/12775925',
@@ -75,26 +75,16 @@ export default defineGkdApp({
           ],
         },
         {
-          action: 'clickCenter',
+          key: 4,
+          fastQuery: true,
+          activityIds: '.MainActivity',
           matches:
-            '[text^="去"][text$="看看"] < FrameLayout <2 FrameLayout[childCount=2] -n FrameLayout[childCount=1] > ImageView',
+            '@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/12775921',
             'https://i.gkd.li/i/12776903',
           ],
         },
-        {
-          action: 'clickCenter',
-          matches:
-            'TextView[text="查看详情"] < FrameLayout <2 FrameLayout[childCount=2] -n FrameLayout > FrameLayout > ImageView',
-          snapshotUrls: 'https://i.gkd.li/i/12789196',
-        },
-        {
-          action: 'clickCenter',
-          matches:
-            'TextView[text="立即下载"] < FrameLayout <2 FrameLayout[childCount=2] -n FrameLayout[childCount=1] > ImageView',
-          snapshotUrls: 'https://i.gkd.li/i/12789928',
-        },
       ],
     },
   ],

src/apps/com.kuaiduizuoye.scan.ts

@@ -28,12 +28,5 @@ export default defineGkdApp({
         },
       ],
     },
-    {
-      key: 1,
-      name: '全屏广告-首页弹窗广告',
-      activityIds: 'com.hihonor.android.launcher.drawer.DrawerLauncher',
-      rules: '[id="com.kuaiduizuoye.scan:id/iv_advertisement_widget_close"]',
-      snapshotUrls: 'https://i.gkd.li/i/12716285',
-    },
   ],
 });

src/apps/com.kugou.android.lite.ts

@@ -7,21 +7,25 @@ export default defineGkdApp({
     {
       key: 2,
       name: '全屏广告-VIP弹窗',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           name: '新人限时优惠弹窗',
-          activityIds: 'com.kugou.android.app.setting.YoungModeTipsActivity',
           fastQuery: true,
+          activityIds: 'com.kugou.android.app.setting.YoungModeTipsActivity',
           matches: '[text^="新人限时开通"] +3 [text="放弃优惠"]',
           snapshotUrls: 'https://i.gkd.li/i/14321698',
         },
         {
           key: 1,
           name: '组队抽奖弹窗',
+          fastQuery: true,
           activityIds: 'com.kugou.android.app.setting.YoungModeTipsActivity',
           matches:
-            '[id="android:id/content"] > ViewGroup[childCount=3] > ImageView + ImageView + ImageView[clickable=true][visibleToUser=true]',
+            '@ImageView[clickable=true][visibleToUser=true][childCount=0] <3 ViewGroup[childCount=3] < [id="android:id/content"]',
           snapshotUrls: 'https://i.gkd.li/i/14321700',
         },
       ],
@@ -53,11 +57,16 @@ export default defineGkdApp({
     {
       key: 4,
       name: '更新提示',
+      fastQuery: true,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules: '@ImageView - * > [text="立即升级"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/14622566',
+          activityIds: 'com.kugou.android.app.MediaActivity',
+          matches: '@ImageView - * > [text="立即升级"]',
+          snapshotUrls: 'https://i.gkd.li/i/14622566',
+        },
+      ],
     },
     {
       key: 5,

src/apps/com.ky.medical.reference.ts

@@ -18,9 +18,12 @@ export default defineGkdApp({
     {
       key: 0,
       name: '全屏广告-弹窗广告',
-      activityIds: 'com.ky.medical.reference.promotion.AdDialogActivity',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.ky.medical.reference.promotion.AdDialogActivity',
           matches: '[id="com.ky.medical.reference:id/icClose"]',
           snapshotUrls: 'https://i.gkd.li/i/12840924',
         },

src/apps/com.lanjinger.choiassociatedpress.ts

@@ -7,13 +7,17 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      activityIds: 'com.lanjinger.choiassociatedpress.main.OperateActivity',
+        {
-      rules: '@ImageView[id$="iv_back"][clickable=true]',
+          activityIds: 'com.lanjinger.choiassociatedpress.main.OperateActivity',
-      snapshotUrls: 'https://i.gkd.li/i/13749206',
+          matches: '@ImageView[id$="iv_back"][clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/13749206',
+        },
+      ],
     },
   ],
 });

src/apps/com.lbe.security.miui.ts

@@ -8,11 +8,18 @@ export default defineGkdApp({
       key: 1,
       name: '功能类-权限授予弹窗',
       desc: '自动点击"仅在使用中允许"',
-      activityIds:
-        'com.android.packageinstaller.permission.ui.GrantPermissionsActivity',
       fastQuery: true,
-      rules: '[text="仅在使用中允许"]',
+      matchTime: 10000,
-      snapshotUrls: 'https://i.gkd.li/i/13761264',
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: [
+        {
+          activityIds:
+            'com.android.packageinstaller.permission.ui.GrantPermissionsActivity',
+          matches: '[text="仅在使用中允许"]',
+          snapshotUrls: 'https://i.gkd.li/i/13761264',
+        },
+      ],
     },
     {
       key: 2,

src/apps/com.le123.ysdq.ts

@@ -10,9 +10,9 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          fastQuery: true,
           activityIds:
             'com.elinkway.infinitemovies.ui.activity.NewMainActivity',
-          fastQuery: true,
           matches: '[id="com.le123.ysdq:id/ad_close_iv"]',
           snapshotUrls: 'https://i.gkd.li/i/13635244',
         },

src/apps/com.leduoworks.gpstoolbox.ts

@@ -7,10 +7,14 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-首页占位广告',
-      activityIds: 'com.leduoworks.gpstoolbox.frmt.MainFrmtActivity',
+      rules: [
-      fastQuery: true,
+        {
-      rules: '[id="com.leduoworks.gpstoolbox:id/iv_close"]',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/13062612',
+          activityIds: 'com.leduoworks.gpstoolbox.frmt.MainFrmtActivity',
+          matches: '[id="com.leduoworks.gpstoolbox:id/iv_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13062612',
+        },
+      ],
     },
   ],
 });

src/apps/com.lemon.lv.ts

@@ -30,19 +30,29 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-选择素材界面上方广告',
-      activityIds: 'com.vega.libcutsame.select.view.CutSameSelectMediaActivity',
+      rules: [
-      rules:
+        {
-        '[vid="gallery_layout_below_category_view"] >3 [text="立即下载"] -n LynxFlattenUI[clickable=true]',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/14122865',
+          activityIds:
+            'com.vega.libcutsame.select.view.CutSameSelectMediaActivity',
+          matches:
+            '@LynxFlattenUI[clickable=true][visibleToUser=true] +6 [text="立即下载"]',
+          snapshotUrls: 'https://i.gkd.li/i/14122865',
+        },
+      ],
     },
     {
       key: 2,
       name: '功能类-恢复创作',
       desc: '自动点击[立即恢复]按钮',
-      activityIds: 'com.vega.main.MainActivity',
+      rules: [
-      fastQuery: true,
+        {
-      rules: '[vid="tv_title_resume_design"] +2 [vid="tvResumeNow"]',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/14292755',
+          activityIds: 'com.vega.main.MainActivity',
+          matches: '[vid="tv_title_resume_design"] +2 [vid="tvResumeNow"]',
+          snapshotUrls: 'https://i.gkd.li/i/14292755',
+        },
+      ],
     },
   ],
 });

src/apps/com.lenovo.browser.hd.ts

@@ -7,13 +7,18 @@ export default defineGkdApp({
     {
       key: 1,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      rules: [
-      rules:
+        {
-        '[text="发现新版本"] - * > [id="com.lenovo.browser.hd:id/fl_close"]',
+          activityIds: 'com.zui.launcher.drawer.NormalLauncher',
-      snapshotUrls: 'https://i.gkd.li/i/13401982',
+          matches:
+            '[text="发现新版本"] - * > [id="com.lenovo.browser.hd:id/fl_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13401982',
+        },
+      ],
     },
     {
       key: 2,
@@ -22,9 +27,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '[text="开启消息通知"] +n * > [id="com.lenovo.browser.hd:id/tv_cancle"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13401980',
+          activityIds: 'com.zui.launcher.drawer.NormalLauncher',
+          matches:
+            '[text="开启消息通知"] +n * > [id="com.lenovo.browser.hd:id/tv_cancle"]',
+          snapshotUrls: 'https://i.gkd.li/i/13401980',
+        },
+      ],
     },
   ],
 });

src/apps/com.lenovo.club.app.ts

@@ -1,19 +0,0 @@
-import { defineGkdApp } from '@gkd-kit/define';
-
-export default defineGkdApp({
-  id: 'com.lenovo.club.app',
-  name: '联想',
-  groups: [
-    {
-      key: 2,
-      name: '更新提示',
-      fastQuery: true,
-      matchTime: 10000,
-      actionMaximum: 1,
-      resetMatch: 'app',
-      rules:
-        '[id="com.lenovo.club.app:id/tv_title"][text="发现新版本"] < LinearLayout [text="下次再说"]',
-      snapshotUrls: 'https://i.gkd.li/i/13498778',
-    },
-  ],
-});

src/apps/com.lenovo.leos.appstore.ts

@@ -11,9 +11,14 @@ export default defineGkdApp({
       actionMaximum: 1,
       resetMatch: 'app',
       fastQuery: true,
-      rules:
+      rules: [
-        '@[id="com.lenovo.leos.appstore:id/dialog_cancel"] + [text$="版本更新"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/13401992',
+          activityIds: 'com.zui.launcher.drawer.NormalLauncher',
+          matches:
+            '@[id="com.lenovo.leos.appstore:id/dialog_cancel"] + [text$="版本更新"]',
+          snapshotUrls: 'https://i.gkd.li/i/13401992',
+        },
+      ],
     },
     {
       key: 1,
@@ -24,6 +29,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.activities.NotificationGuideActivity',
           matches: ['[text$="打开应用中心通知"]', '[text="知道了"]'],
           snapshotUrls: 'https://i.gkd.li/i/13401991',
         },

src/apps/com.lingan.seeyou.ts

@@ -7,10 +7,10 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-评论区上方卡片广告',
-      desc: '点击X',
+      desc: '点击关闭',
-      fastQuery: true,
       rules: [
         {
+          fastQuery: true,
           activityIds:
             'com.lingan.seeyou.ui.activity.community.topicdetail.TopicDetailActivity',
           matches: '[id="com.lingan.seeyou:id/v_close"]',

src/apps/com.lolaage.tbulu.tools.ts

@@ -11,9 +11,14 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '[id="com.lolaage.tbulu.tools:id/tvFullUpgrade"] + [id="com.lolaage.tbulu.tools:id/tvCancel"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12882550',
+          activityIds: '.upgrade',
+          matches:
+            '[id="com.lolaage.tbulu.tools:id/tvFullUpgrade"] + [id="com.lolaage.tbulu.tools:id/tvCancel"]',
+          snapshotUrls: 'https://i.gkd.li/i/12882550',
+        },
+      ],
     },
     {
       key: 2,
@@ -65,6 +70,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: '.ui.activity.main.MainActivity',
           matches: '[text="发送通知"] + * >3 [text="取消"]',
           snapshotUrls: 'https://i.gkd.li/i/14952803',
         },

src/apps/com.longshine.nanwang.electric.charge.ts

@@ -7,10 +7,17 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
-      activityIds: ['com.android.app.station.NewMainAct'],
+      matchTime: 10000,
-      rules:
+      actionMaximum: 1,
-        '[id="com.longshine.nanwang.electric.charge:id/bodyFL"] + [id="com.longshine.nanwang.electric.charge:id/ivClose"]',
+      resetMatch: 'app',
-      snapshotUrls: ['https://i.gkd.li/i/12700011'],
+      rules: [
+        {
+          activityIds: 'com.android.app.station.NewMainAct',
+          matches:
+            '[id="com.longshine.nanwang.electric.charge:id/bodyFL"] + [id="com.longshine.nanwang.electric.charge:id/ivClose"]',
+          snapshotUrls: 'https://i.gkd.li/i/12700011',
+        },
+      ],
     },
   ],
 });

src/apps/com.loyea.adnmb.ts

@@ -7,12 +7,26 @@ export default defineGkdApp({
     {
       key: 5,
       name: '通知提示-通知弹窗',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      activityIds: '.activity.MainActivity',
-      rules: 'LinearLayout > Button[text="确定"]',
+      rules: [
-      snapshotUrls: 'https://i.gkd.li/i/13623450',
+        {
+          key: 0,
+          matches: '[text="不再显示该条通知"][checked=false]',
+          exampleUrls: 'https://e.gkd.li/81cc5b1b-d0a6-44e9-be99-7897cceb491a',
+          snapshotUrls: 'https://i.gkd.li/i/13623450',
+        },
+        {
+          preKeys: [0],
+          key: 1,
+          matches: '[text="确定"]',
+          exampleUrls: 'https://e.gkd.li/81cc5b1b-d0a6-44e9-be99-7897cceb491a',
+          snapshotUrls: 'https://i.gkd.li/i/13623450',
+        },
+      ],
     },
   ],
 });

src/apps/com.lphtsccft.ts

@@ -7,23 +7,31 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-首页弹窗广告',
-      activityIds: [
+      matchTime: 10000,
-        'com.lphtsccft.zhangle.startup.SplashScreenActivity',
+      actionMaximum: 1,
-        'com.lphtsccft.zhangle.main.MainActivity',
+      resetMatch: 'app',
-      ],
+      rules: [
-      rules: '[id="com.lphtsccft:id/tv_never"][text="不再提醒"]',
+        {
-      snapshotUrls: [
+          activityIds: [
-        'https://i.gkd.li/i/12646899',
+            'com.lphtsccft.zhangle.startup.SplashScreenActivity',
-        'https://i.gkd.li/i/12646925',
+            'com.lphtsccft.zhangle.main.MainActivity',
+          ],
+          matches: '[id="com.lphtsccft:id/tv_never"][text="不再提醒"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12646899',
+            'https://i.gkd.li/i/12646925',
+          ],
+        },
       ],
     },
     {
       key: 2,
       name: '更新提示',
+      fastQuery: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      fastQuery: true,
+      activityIds: '.zhangle.main.MainActivity',
       rules: [
         {
           key: 0,
@@ -40,9 +48,13 @@ export default defineGkdApp({
     {
       key: 3,
       name: '局部广告-右侧悬浮广告',
-      activityIds: 'com.lphtsccft.zhangle.main.MainActivity',
+      rules: [
-      rules: '[id="com.lphtsccft:id/home_float_close"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12892821',
+          activityIds: 'com.lphtsccft.zhangle.main.MainActivity',
+          matches: '[id="com.lphtsccft:id/home_float_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/12892821',
+        },
+      ],
     },
   ],
 });

src/apps/com.lptiyu.tanke.ts

@@ -23,19 +23,22 @@ export default defineGkdApp({
         {
           key: 1,
           name: '腾讯广告-2',
+          fastQuery: true,
           activityIds: 'com.lptiyu.tanke.activities.main.MainActivity',
-          matches: 'ImageView - FrameLayout > FrameLayout > ImageView',
+          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/13070801',
         },
         {
           key: 2,
           name: '快手广告-1',
+          fastQuery: true,
           activityIds: [
             'com.lptiyu.tanke.activities.splash.SplashActivity',
             'com.lptiyu.tanke.activities.school_run_record_detail.RunRecordDetailActivity',
           ],
           matches:
-            '[text="广告"] <2 ViewGroup -n ViewGroup > @ViewGroup[childCount=1] > ImageView',
+            'ImageView[childCount=0][text=null] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] < ViewGroup +n ViewGroup[childCount=2] > [text="广告"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13218232',
             'https://i.gkd.li/i/13536714',
@@ -44,8 +47,8 @@ export default defineGkdApp({
         {
           key: 3,
           name: '快手广告-2',
-          activityIds: 'com.lptiyu.tanke.activities.splash.SplashActivity',
           fastQuery: true,
+          activityIds: 'com.lptiyu.tanke.activities.splash.SplashActivity',
           matches:
             '[text="广告"] <2 ViewGroup - ViewGroup > ViewGroup > [text="跳过"]',
           snapshotUrls: 'https://i.gkd.li/i/13476172',
@@ -53,8 +56,8 @@ export default defineGkdApp({
         {
           key: 4,
           name: '快手广告-3',
-          activityIds: 'com.lptiyu.tanke.activities.splash.SplashActivity',
           fastQuery: true,
+          activityIds: 'com.lptiyu.tanke.activities.splash.SplashActivity',
           matches:
             '[id="com.lptiyu.tanke:id/ksad_splash_circle_skip_left_view"]',
           snapshotUrls: 'https://i.gkd.li/i/13625386',

src/apps/com.lucky.luckyclient.ts

@@ -10,29 +10,41 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      rules:
+      rules: [
-        '@ImageView[id="com.lucky.luckyclient:id/dismiss_btn"] - LinearLayout > ImageView[id="com.lucky.luckyclient:id/update_btn"]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/12846499',
+          activityIds: 'com.luckin.client.main.FirstActivity',
+          matches:
+            '@ImageView[id="com.lucky.luckyclient:id/dismiss_btn"] - LinearLayout > ImageView[id="com.lucky.luckyclient:id/update_btn"]',
+          snapshotUrls: 'https://i.gkd.li/i/12846499',
+        },
+      ],
     },
     {
       key: 2,
       name: '全屏广告-超值换购弹窗',
       desc: '关闭超值换购弹窗',
-      activityIds: 'com.lucky.luckyclient.preview2.OrderPreviewActivity2',
+      rules: [
-      fastQuery: true,
+        {
-      rules: '[id="com.lucky.luckyclient:id/close_iv"][visibleToUser=true]',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/12922834',
+          activityIds: 'com.lucky.luckyclient.preview2.OrderPreviewActivity2',
+          matches:
+            '[id="com.lucky.luckyclient:id/close_iv"][visibleToUser=true]',
+          snapshotUrls: 'https://i.gkd.li/i/12922834',
+        },
+      ],
     },
     {
       key: 3,
       name: '全屏广告-优惠卷领取提示',
       desc: '按下返回键关闭优惠卷领取提示',
-      activityIds: 'com.luckin.client.main.FirstActivity',
+      rules: [
-      rules: {
+        {
-        matches: '[id="com.lucky.luckyclient:id/webcontent"]',
+          activityIds: 'com.luckin.client.main.FirstActivity',
-        action: 'back',
+          action: 'back',
-      },
+          matches: '[id="com.lucky.luckyclient:id/webcontent"]',
-      snapshotUrls: 'https://i.gkd.li/i/13164114',
+          snapshotUrls: 'https://i.gkd.li/i/13164114',
+        },
+      ],
     },
   ],
 });

src/apps/com.luna.music.ts

@@ -39,6 +39,7 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          activityIds: 'com.luna.biz.ad.AdActivity',
           matches: '@[text="稍后再说"] + [text="立即升级"]',
           snapshotUrls: 'https://i.gkd.li/i/14790279',
         },
@@ -150,10 +151,15 @@ export default defineGkdApp({
     {
       key: 9,
       name: '功能类-看视频免费听弹窗',
-      desc: '点击【立得全天畅听】',
+      desc: '点击[立得全天畅听]',
-      activityIds: 'com.luna.biz.main.main.MainActivity',
+      rules: [
-      rules: '[text="立得全天畅听"][clickable=true]',
+        {
-      snapshotUrls: 'https://i.gkd.li/i/14237527',
+          fastQuery: true,
+          activityIds: 'com.luna.biz.main.main.MainActivity',
+          matches: 'FlattenUIText[text="立得全天畅听"]',
+          snapshotUrls: 'https://i.gkd.li/i/14237527',
+        },
+      ],
     },
     {
       key: 10,

src/apps/com.lxt.cfmoto.ts

@@ -7,13 +7,16 @@ export default defineGkdApp({
     {
       key: 1,
       name: '全屏广告-弹窗广告',
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 1,
           name: '首页弹窗广告',
+          fastQuery: true,
           activityIds: 'com.cfmoto.oilmoto.ui.MainCfActivity',
-          matches:
+          matches: '[id="com.lxt.cfmoto:id/closeClick"]',
-            'RelativeLayout[childCount=2] > [id="com.lxt.cfmoto:id/image"] + [id="com.lxt.cfmoto:id/closeClick"]',
           snapshotUrls: 'https://i.gkd.li/i/13401967',
         },
       ],

src/apps/com.m.mfood.ts

@@ -7,10 +7,14 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-浮窗广告',
-      fastQuery: true,
+      rules: [
-      activityIds: 'com.zdyl.mfood.ui.home.MainActivity',
+        {
-      rules: '[id="com.m.mfood:id/close"]',
+          fastQuery: true,
-      snapshotUrls: 'https://i.gkd.li/i/13350787',
+          activityIds: 'com.zdyl.mfood.ui.home.MainActivity',
+          matches: '[id="com.m.mfood:id/close"]',
+          snapshotUrls: 'https://i.gkd.li/i/13350787',
+        },
+      ],
     },
   ],
 });