feat: 规则维护更新

src/apps/com.autonavi.minimap.ts

@@ -64,14 +64,14 @@ export default defineGkdApp({
           key: 2,
           name: '加油页面优惠券弹窗',
           matches:
-            '@ImageView < [desc="关闭"][clickable=true] <n * > * >n View[text="立即领取"]',
+            'ImageView < @[desc="关闭"][clickable=true] <n * > * >n View[text="立即领取"]',
           snapshotUrls: ['https://i.gkd.li/import/12642857'],
         },
         {
           key: 3,
           fastQuery: true,
           matches:
-            '@ViewGroup[clickable=true] > View[visibleToUser=true][text^="关闭"] <<n [vid="mapInteractiveRelativeLayout"]',
+            '@ViewGroup[clickable=true] > View[text^="关闭"][visibleToUser=true] <<n [vid="mapInteractiveRelativeLayout"]',
           snapshotUrls: 'https://i.gkd.li/i/22287641',
         },
       ],
@@ -97,23 +97,23 @@ export default defineGkdApp({
           fastQuery: true,
           activityIds: 'com.autonavi.map.activity.NewMapActivity',
           matches:
-            'ViewGroup[desc="图片"][childCount=2] > ViewGroup[clickable=true] > @ImageView[childCount=0] <<n [vid="tab_container_id"]',
+            'ViewGroup[desc="图片"][childCount=2] > @ViewGroup[clickable=true] > ImageView[childCount=0] <<n [vid="tab_container_id"]',
           snapshotUrls: 'https://i.gkd.li/i/16960367',
         },
         {
           key: 2,
           fastQuery: true,
           activityIds: 'com.autonavi.map.activity.NewMapActivity',
           matches:
-            '@ImageView < ViewGroup[clickable=true] -2 * > View[text^="高德购票" && text$="优惠"] <<n [vid="mapInteractiveRelativeLayout"]',
+            'ImageView < @ViewGroup[clickable=true] -2 * > View[text^="高德购票" && text$="优惠"] <<n [vid="mapInteractiveRelativeLayout"]',
           snapshotUrls: 'https://i.gkd.li/i/16960157',
         },
         {
           key: 3,
           fastQuery: true,
           activityIds: 'com.autonavi.map.activity.NewMapActivity',
           matches:
-            '@[clickable=true] > [visibleToUser=true][text="关闭"] <<n [vid="ajx_view_container"]',
+            '@[clickable=true] > [text="关闭"][visibleToUser=true] <<n [vid="ajx_view_container"]',
           snapshotUrls: 'https://i.gkd.li/i/18627401',
         },
       ],

src/apps/com.baidu.tieba.ts

@@ -28,14 +28,15 @@ export default defineGkdApp({
       desc: '关闭首页、帖子内的广告和直播推广',
       enable: false,
       fastQuery: true,
-      forcedTime: 10000,
+      activityIds: [
+        '.tblauncher.MainTabActivity',
+        '.pb.pb.main.PbActivity',
+        '.forum.ForumActivity',
+      ],
       rules: [
         {
           key: 0,
-          activityIds: [
-            'com.baidu.tieba.tblauncher.MainTabActivity',
-            'com.baidu.tieba.forum.ForumActivity',
-          ],
+          activityIds: ['.tblauncher.MainTabActivity', '.forum.ForumActivity'],
           matches:
             '@ImageView[clickable=true][visibleToUser=true] <(1,2) LinearLayout <4 RelativeLayout +2 RelativeLayout >2 [text="直播中"]',
           snapshotUrls: [
@@ -45,13 +46,9 @@ export default defineGkdApp({
         },
         {
           key: 1,
-          activityIds: [
-            'com.baidu.tieba.forum.ForumActivity',
-            'com.baidu.tieba.pb.pb.main.PbActivity',
-            'com.baidu.tieba.tblauncher.MainTabActivity',
-          ],
           matches:
             '@FrameLayout[clickable=true][visibleToUser=true] < LinearLayout < RelativeLayout <3 LinearLayout < RelativeLayout + LinearLayout >2 [text$="广告"]',
+          exampleUrls: 'https://e.gkd.li/3b2f0906-f620-4fda-a59f-334a9548836e',
           snapshotUrls: [
             'https://i.gkd.li/i/16595127',
             'https://i.gkd.li/i/16595515',
@@ -60,7 +57,7 @@ export default defineGkdApp({
         },
         {
           key: 2,
-          activityIds: 'com.baidu.tieba.pb.pb.main.PbActivity',
+          activityIds: '.pb.pb.main.PbActivity',
           matches:
             '@FrameLayout[clickable=true][visibleToUser=true] < LinearLayout < FrameLayout -(1,2) [text$="广告"]',
           snapshotUrls: [
@@ -70,36 +67,16 @@ export default defineGkdApp({
         },
         {
           key: 3,
-          activityIds: 'com.baidu.tieba.pb.pb.main.PbActivity',
+          activityIds: '.pb.pb.main.PbActivity',
           matches:
             '@ImageView[clickable=true][visibleToUser=true] -3 [text="直播中"]',
           snapshotUrls: 'https://i.gkd.li/i/16596210',
         },
         {
           key: 4,
-          activityIds: 'com.baidu.tieba.pb.pb.main.PbActivity',
-          matches:
-            '@[clickable=true][visibleToUser=true] <(1,2) RelativeLayout <(1,4) RelativeLayout[childCount>1] >(3,4) [text="广告"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/16595124',
-            'https://i.gkd.li/i/16596297',
-            'https://i.gkd.li/i/24541094',
-          ],
-          excludeSnapshotUrls: 'https://i.gkd.li/i/16632851', // [childCount>1] 防止误触]
-        },
-        {
-          key: 5,
-          activityIds: [
-            'com.baidu.tieba.pb.pb.main.PbActivity',
-            'com.baidu.tieba.forum.ForumActivity',
-            'com.baidu.tieba.tblauncher.MainTabActivity',
-          ],
           matches:
-            '@FrameLayout[clickable=true][visibleToUser=true] <(3,4) RelativeLayout + FrameLayout >(7,8,9) [text="广告"]',
+            'ImageView[index=parent.childCount.minus(1)] < @[vid="obfuscated"][clickable=true] -n * < RelativeLayout + FrameLayout >n [text="广告"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/16595301',
-            'https://i.gkd.li/i/16596195',
-            'https://i.gkd.li/i/16596775',
             'https://i.gkd.li/i/21524232',
             'https://i.gkd.li/i/21529443',
             'https://i.gkd.li/i/21556758',
@@ -108,24 +85,50 @@ export default defineGkdApp({
           ],
         },
         {
+          key: 5,
+          activityIds: '.pb.pb.main.PbActivity',
+          matches:
+            'ImageView[childCount=0] < @FrameLayout[clickable=true][childCount=1][visibleToUser=true] <2 RelativeLayout + RelativeLayout >3 [text="广告"]',
+          snapshotUrls: 'https://i.gkd.li/i/24541094',
+        },
+        // 第二段
+        {
+          key: 50,
           preKeys: [0, 1, 2, 3, 4, 5],
-          key: 10,
-          activityIds: [
-            'com.baidu.tieba.tblauncher.MainTabActivity',
-            'com.baidu.tieba.pb.pb.main.PbActivity',
-            'com.baidu.tieba.forum.ForumActivity',
-          ],
-          anyMatches: [
+          name: '点击[不感兴趣]', // 直接结束, 无需第三段
+          matches:
             '@View[clickable=true][visibleToUser=true] - [text^="选择不喜欢"]',
-            '[text="已经看过"][clickable=true]',
-          ],
           snapshotUrls: [
             'https://i.gkd.li/i/16595134',
             'https://i.gkd.li/i/16595511',
             'https://i.gkd.li/i/16595113',
+          ],
+        },
+        {
+          key: 51,
+          preKeys: [0, 1, 2, 3, 4, 5],
+          name: '选一个[理由]',
+          matches:
+            '[text="已经看过" || text="广告重复" || text="不感兴趣"][clickable=true]',
+          snapshotUrls: [
             'https://i.gkd.li/i/26634661', // [已经看过]
           ],
         },
+        {
+          key: 52,
+          preKeys: [0, 1, 2, 3, 4, 5],
+          name: '选[不喜欢]该直播',
+          matches: '@[clickable=true] >3 [text="不喜欢"]',
+          snapshotUrls: 'https://i.gkd.li/i/27052244', // [不喜欢] 直播
+        },
+        // 第三段
+        {
+          key: 100,
+          preKeys: [51, 52],
+          name: '点击[确定]',
+          matches: '@[clickable=true] - [text^="已选"][text$="理由"]',
+          snapshotUrls: 'https://i.gkd.li/i/26934788',
+        },
       ],
     },
     {
@@ -306,14 +309,13 @@ export default defineGkdApp({
           key: 0,
           name: '贴吧页签到',
           activityIds: 'com.baidu.tieba.forum.ForumActivity',
-          anyMatches: [
-            '@TextView[text="签到"][visibleToUser=true] <3 View < View <2 View < View < WebView < WebView < FrameLayout < ViewGroup <2 FrameLayout < FrameLayout < [id="android:id/content"]',
-            '@TextView[text="签到"][visibleToUser=true] <5 View < View <2 View < WebView < WebView < FrameLayout < ViewGroup <2 FrameLayout < FrameLayout < [id="android:id/content"]',
-          ],
+          matches:
+            '@TextView[text="签到"][visibleToUser=true] <n View < View <2 View < * < WebView <<(6,7) [id="android:id/content"]',
           snapshotUrls: [
             'https://i.gkd.li/import/13776801',
             'https://i.gkd.li/i/15087289',
             'https://i.gkd.li/i/17902156',
+            'https://i.gkd.li/i/27051552',
           ],
         },
         {
@@ -328,6 +330,7 @@ export default defineGkdApp({
             'https://i.gkd.li/import/13776424',
             'https://i.gkd.li/i/15087327',
             'https://i.gkd.li/i/15881225',
+            'https://i.gkd.li/i/27051969',
           ],
         },
       ],

src/apps/com.eg.android.AlipayGphone.ts

@@ -43,6 +43,7 @@ export default defineGkdApp({
             'https://i.gkd.li/i/20684144',
             'https://i.gkd.li/i/23455533',
             'https://i.gkd.li/i/25000603',
+            'https://i.gkd.li/i/27007114',
           ],
           excludeSnapshotUrls: ['https://i.gkd.li/i/19478718'],
         },
@@ -105,7 +106,7 @@ export default defineGkdApp({
           activityIds:
             'com.alipay.mobile.nebulax.integration.mpaas.activity.NebulaActivity$Main',
           matches:
-            '[text="添加会员小组件"] < View +3 View[childCount=2] > [text="近期不再提醒我"]',
+            '[text="添加会员小组件"] < View +3 View[childCount=2] > @[text="近期不再提醒我"][clickable=true]',
           snapshotUrls: 'https://i.gkd.li/i/16427922',
         },
         {
@@ -273,7 +274,7 @@ export default defineGkdApp({
           activityIds:
             'com.alipay.mobile.nebulax.xriver.activity.XRiverActivity',
           matches:
-            '@[text*="跳过"] + [visibleToUser=true][text^="账单分期还"] <<n [id="com.alipay.mobile.nebula:id/h5_pc_container"]',
+            '@[text*="跳过"] + [text^="账单分期还"][visibleToUser=true] <<n [id="com.alipay.mobile.nebula:id/h5_pc_container"]',
           snapshotUrls: 'https://i.gkd.li/i/18409779',
         },
         {
@@ -327,7 +328,7 @@ export default defineGkdApp({
           activityIds:
             'com.alipay.mobile.nebulax.xriver.activity.XRiverActivity',
           matches:
-            '[text="支付宝授权"] >3 @[childCount=0][text="同意"] <<n [id="com.alipay.mobile.nebula:id/h5_pc_container"]',
+            '[text="支付宝授权"] >3 @[text="同意"][childCount=0] <<n [id="com.alipay.mobile.nebula:id/h5_pc_container"]',
           snapshotUrls: 'https://i.gkd.li/i/17376764',
         },
       ],

src/apps/com.google.android.documentsui.ts

@@ -9,6 +9,7 @@ export default defineGkdApp({
       enable: false,
       name: '功能类-授权第三方应用访问文件夹',
       desc: '(存在安全风险)自动点击使用此文件夹并允许访问权限',
+      fastQuery: true,
       activityIds: 'com.android.documentsui.picker.PickActivity',
       rules: [
         {

src/apps/com.google.android.gm.ts

@@ -26,8 +26,10 @@ export default defineGkdApp({
           key: 2,
           name: '②点击[屏蔽]',
           action: 'clickCenter', // 此界面不接受无障碍事件
-          matches:
-            '@Button[clickable=true][text="屏蔽此广告" || text^="Block" || desc="屏蔽"] <<n [vid="my_ad_center_dialog"]',
+          anyMatches: [
+            '@Button[text="屏蔽此广告" || text^="Block"][clickable=true] <<n [vid="my_ad_center_dialog"]',
+            '@Button[desc="屏蔽"][clickable=true] <<n [vid="my_ad_center_dialog"]',
+          ],
           snapshotUrls: [
             'https://i.gkd.li/i/13255700', // 屏蔽此广告
             'https://i.gkd.li/i/13724271', // Block
@@ -39,7 +41,7 @@ export default defineGkdApp({
           key: 3,
           name: '③点击[继续]',
           matches:
-            '@Button[clickable=true][text="继续" || text="Continue"] <<n [id="com.google.android.gm:id/my_ad_center_dialog"]',
+            '@Button[text="继续" || text="Continue"][clickable=true] <<n [id="com.google.android.gm:id/my_ad_center_dialog"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13255701', // 继续
             'https://i.gkd.li/i/13724287', // Continue

src/apps/com.google.android.youtube.ts

@@ -96,14 +96,16 @@ export default defineGkdApp({
           activityIds:
             'com.google.android.apps.youtube.app.watchwhile.MainActivity',
           matches:
-            '@Button[desc^="翻译成"||desc^="Translate to"][clickable=true][visibleToUser=true] -n [desc^="@"] <<3 ViewGroup -n * < [vid="results" || vid="section_list"]',
+            '@[desc^="翻译成"||desc^="Translate to"][visibleToUser=true] <n [childCount>3] <<(2,4) ViewGroup <n [vid="results" || vid="section_list"]',
           exampleUrls: 'https://e.gkd.li/e9d6eaa8-9fbf-4b16-8f0c-50239597c687',
           snapshotUrls: [
             'https://i.gkd.li/i/17068544', // 翻译前
+            'https://i.gkd.li/i/27276425', // 控件类名不一致
             'https://i.gkd.li/i/17068647', // 翻译后
             'https://i.gkd.li/i/17501400',
             'https://i.gkd.li/i/25462152', // En_translate前
             'https://i.gkd.li/i/25462248', // En_translate后
+            'https://i.gkd.li/i/27276291', // 评论-回复区UI
           ],
         },
       ],

src/apps/com.gotokeep.keep.ts

@@ -9,6 +9,7 @@ export default defineGkdApp({
       name: '全屏广告-首页广告弹窗',
       desc: '关闭首页弹出的全屏广告',
       enable: false,
+      fastQuery: true,
       rules: [
         {
           key: 0,
@@ -27,6 +28,7 @@ export default defineGkdApp({
       key: 3,
       name: '局部广告-首页信息流广告',
       desc: '关闭首页信息流中的广告卡片',
+      fastQuery: true,
       activityIds:
         'com.gotokeep.keep.refactor.business.main.activity.MainActivity',
       rules:
@@ -38,6 +40,7 @@ export default defineGkdApp({
       name: '全屏广告-运动购页面广告弹窗',
       desc: '关闭运动购物页面的弹窗广告',
       enable: false,
+      fastQuery: true,
       rules: [
         {
           key: 0,

src/apps/com.greenpoint.android.mc10086.activity.ts

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

src/apps/com.intsig.camscanner.ts

@@ -7,6 +7,7 @@ export default defineGkdApp({
     {
       key: 1,
       name: '局部广告-主页面上方广告',
+      fastQuery: true,
       activityIds: 'com.intsig.camscanner.mainmenu.mainactivity.MainActivity',
       rules:
         '[id="com.intsig.camscanner:id/card_ad_tag"] + [id="com.intsig.camscanner:id/card_close"]',

src/apps/com.jingdong.app.mall.ts

@@ -101,7 +101,7 @@ export default defineGkdApp({
         },
         {
           matches:
-            '@ImageView < FrameLayout[clickable=true] + TextView[text^="打开系统通知"]',
+            'ImageView < @FrameLayout[clickable=true] + TextView[text^="打开系统通知"]',
           snapshotUrls: 'https://i.gkd.li/import/12839865',
         },
       ],

src/apps/com.miui.player.ts

@@ -85,7 +85,7 @@ export default defineGkdApp({
         },
         {
           key: 1,
-          matches: '[visibleToUser=true][vid="ad_close"]',
+          matches: '[vid="ad_close"][visibleToUser=true]',
           snapshotUrls: 'https://i.gkd.li/i/16773614',
         },
       ],

src/apps/com.smile.gifmaker.ts

@@ -38,6 +38,7 @@ export default defineGkdApp({
       name: '局部广告-首页左侧红包悬浮控件',
       desc: '关闭首页左侧悬浮的红包广告控件',
       enable: false,
+      fastQuery: true,
       activityIds: 'com.yxcorp.gifshow.HomeActivity',
       rules: [
         {
@@ -60,6 +61,7 @@ export default defineGkdApp({
         {
           key: 0,
           name: '消息页面-你可能感兴趣的人',
+          fastQuery: true,
           matches: '[id="com.smile.gifmaker:id/close_pymk"]',
           snapshotUrls: 'https://i.gkd.li/i/12708707',
         },
@@ -91,7 +93,7 @@ export default defineGkdApp({
           action: 'back',
           activityIds:
             'com.kuaishou.live.core.basic.activity.LiveSlideActivity',
-          matches: '[visibleToUser=true][text="幸运奖池"] <<n [vid="webView"]',
+          matches: '[text="幸运奖池"][visibleToUser=true] <<n [vid="webView"]',
           snapshotUrls: 'https://i.gkd.li/i/15629334',
         },
       ],