fix: 修复错误使用局部快速查找可能导致规则不触发的问题

2025-12-19 16:25:09 +08:00 · 2024-07-22 15:54:52 +08:00
parent 44c4add154
commit f53d272c58
27 changed files with 56 additions and 56 deletions
--- a/src/apps/client.android.yixiaotong.ts
+++ b/src/apps/client.android.yixiaotong.ts
@@ -97,7 +97,7 @@ export default defineGkdApp({
      activityIds:
        'client.android.yixiaotong.v3.ui.appcontrol.bath.BathDetailActivity',
      rules:
-        '@TextView[clickable=true][text=""] + View [text="广告"] <<n [id="client.android.yixiaotong:id/ksad_container"]',
+        '@TextView[clickable=true][text=""] + View [visibleToUser=true][text="广告"] <<n [id="client.android.yixiaotong:id/ksad_container"]',
      snapshotUrls: 'https://i.gkd.li/i/13448963',
    },
  ],
--- a/src/apps/cn.runningquotient.rq.ts
+++ b/src/apps/cn.runningquotient.rq.ts
@@ -24,7 +24,8 @@ export default defineGkdApp({
          key: 1,
          activityIds:
            'cn.runningquotient.rq.page.common_page.CommonContainerActivity',
-          matches: '@[text="我知道了"] <<n [vid="common_h5_container"]',
+          matches:
+            '@[visibleToUser=true][text="我知道了"] <<n [vid="common_h5_container"]',
          snapshotUrls: 'https://i.gkd.li/i/16105938',
        },
        {
--- a/src/apps/com.cainiao.wireless.ts
+++ b/src/apps/com.cainiao.wireless.ts
@@ -31,7 +31,7 @@ export default defineGkdApp({
          activityIds:
            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
          matches:
-            'View[clickable=true] > @[text="关闭"] + [text="活动"] <<n [vid="browser_fragment_layout"]',
+            'View[clickable=true] > @[text="关闭"] + [visibleToUser=true][text="活动"] <<n [vid="browser_fragment_layout"]',
          snapshotUrls: 'https://i.gkd.li/i/14033859',
        },
        {
@@ -48,7 +48,7 @@ export default defineGkdApp({
          activityIds:
            'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
          matches:
-            '@[text="关闭"] + [text="活动"] <<n [vid="browser_fragment_layout"]',
+            '@[text="关闭"] + [visibleToUser=true][text="活动"] <<n [vid="browser_fragment_layout"]',
          snapshotUrls: 'https://i.gkd.li/i/14033859',
        },
        {
--- a/src/apps/com.chinatelecom.bestpayclient.ts
+++ b/src/apps/com.chinatelecom.bestpayclient.ts
@@ -24,7 +24,7 @@ export default defineGkdApp({
          activityIds: 'com.chinatelecom.bestpayclient.ui.MainActivity',
          fastQuery: true,
          matches:
-            'Image < @View[clickable=true][index=1] <<n Dialog <<n [id="com.chinatelecom.bestpayclient:id/best_h5_container"]',
+            'Dialog >3 View[childCount=2] > @View[clickable=true] > Image[childCount=0] <<n [id="com.chinatelecom.bestpayclient:id/best_h5_container"]',
          snapshotUrls: 'https://i.gkd.li/i/13402692',
        },
        {
--- a/src/apps/com.dataoke.union.ts
+++ b/src/apps/com.dataoke.union.ts
@@ -12,9 +12,12 @@ export default defineGkdApp({
      matchTime: 10000,
      actionMaximum: 1,
      resetMatch: 'app',
-      rules:
-        '@[text="取消"] <<n [id="com.dataoke.union:id/parentPanel"] [text^="你还没有打开通知哦"]',
+      rules: [
+        {
+          matches: ['[text^="你还没有打开通知哦"]', '[text="取消"]'],
          snapshotUrls: 'https://i.gkd.li/i/13446826',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.eg.android.AlipayGphone.ts
+++ b/src/apps/com.eg.android.AlipayGphone.ts
@@ -289,7 +289,7 @@ export default defineGkdApp({
            'com.alipay.mobile.nebulax.xriver.activity.XRiverActivity',
          ],
          matches:
-            'WebView[text="基金"] >(2,3) View[childCount=3] > @TextView[text=""][clickable=true][visibleToUser=true] <<n [id="com.alipay.mobile.nebula:id/h5_pc_container"]',
+            'WebView[text="基金"] >(2,3) View[childCount=3] > @TextView[clickable=true][visibleToUser=true][text=""] <<n [id="com.alipay.mobile.nebula:id/h5_pc_container"]',
          exampleUrls:
            'https://m.gkd.li/57941037/5df9b6fb-7455-492c-a726-fb6a42266a02',
          snapshotUrls: [
@@ -321,7 +321,7 @@ export default defineGkdApp({
          activityIds:
            'com.alipay.mobile.nebulax.xriver.activity.XRiverTransActivity$Main',
          matches:
-            '@TextView[clickable=true][text=""] < * > [text="立即加入"] <<n [id="com.alipay.mobile.nebula:id/h5_trans_web_content"]',
+            '@TextView[clickable=true][text=""] < * > [visibleToUser=true][text="立即加入"] <<n [id="com.alipay.mobile.nebula:id/h5_trans_web_content"]',
          exampleUrls:
            'https://m.gkd.li/57941037/e6332999-1c2b-49f0-84e1-780424a5cf2a',
          snapshotUrls: 'https://i.gkd.li/i/15289022',
--- a/src/apps/com.gamersky.ts
+++ b/src/apps/com.gamersky.ts
@@ -52,7 +52,7 @@ export default defineGkdApp({
          activityIds:
            'com.gamersky.common.activity.LibDetailContentDetailActivity',
          matches:
-            '[text="广告"] < * > @[text=""][clickable=true][index=1] <<n [vid="contentWebView"]',
+            '[text="广告"] < * > @[clickable=true][text=""][index=1] <<n [vid="contentWebView"]',
          snapshotUrls: [
            'https://i.gkd.li/i/13635579',
            'https://i.gkd.li/i/15477470',
--- a/src/apps/com.hnnx.pmbank.ts
+++ b/src/apps/com.hnnx.pmbank.ts
@@ -12,7 +12,7 @@ export default defineGkdApp({
      actionMaximum: 1,
      resetMatch: 'app',
      rules:
-        '[text="是否下载最新版客户端？"] <<n [id="android:id/parentPanel"] Button[text="取消"]',
+        '[visibleToUser=true][text="是否下载最新版客户端？"] <<n [id="android:id/parentPanel"] Button[text="取消"]',
      snapshotUrls: 'https://i.gkd.li/i/13536762',
    },
  ],
--- a/src/apps/com.hyww.wisdomtree.ts
+++ b/src/apps/com.hyww.wisdomtree.ts
@@ -29,7 +29,7 @@ export default defineGkdApp({
          key: 0,
          name: '信息流广告',
          fastQuery: true,
-          matches: '[vid="time_line_type"] <<n * > * > [vid="rl_down"]',
+          matches: '@[vid="rl_down"] <<n [vid="tt_ad_content"]',
          snapshotUrls: 'https://i.gkd.li/i/13852023',
        },
      ],
--- a/src/apps/com.jd.jrapp.ts
+++ b/src/apps/com.jd.jrapp.ts
@@ -22,7 +22,7 @@ export default defineGkdApp({
        {
          key: 1,
          matches:
-            '@View - * > [text="开启并订阅通知"] <<n [id="com.jd.jrapp:id/webview"]',
+            '@View - * > [visibleToUser=true][text="开启并订阅通知"] <<n [id="com.jd.jrapp:id/webview"]',
          snapshotUrls: 'https://i.gkd.li/i/13255656',
        },
      ],
--- a/src/apps/com.panaceasoft.pswallpaper.ts
+++ b/src/apps/com.panaceasoft.pswallpaper.ts
@@ -11,9 +11,12 @@ export default defineGkdApp({
      matchTime: 10000,
      resetMatch: 'app',
      actionMaximum: 1,
-      rules:
-        '[vid="tv_next"][text="下一条"] <<n LinearLayout - [vid="iv_close"]',
+      rules: [
+        {
+          matches: ['[text="下一条"]', '[vid="iv_close"]'],
          snapshotUrls: 'https://i.gkd.li/i/14141561',
        },
      ],
+    },
+  ],
 });
--- a/src/apps/com.paokeji.yiqu.ts
+++ b/src/apps/com.paokeji.yiqu.ts
@@ -65,10 +65,10 @@ export default defineGkdApp({
          actionDelay: 350, //防误触
          matches: [
            '[id="com.byted.pangle.m:id/tt_reward_full_count_down_after"]',
-            '[text="反馈"] <<n View + View[childCount=1]',
-            '[text*="跳过" && text.length<=6] <2 @View -(3-n) View < View',
-            '[text="反馈"] -n @View[index<=1] > Image[text.length=0]',
-            '[text="反馈"] <<n View - View[childCount=1]',
+            '[visibleToUser=true][text="反馈"] <<n View + View[childCount=1]',
+            '[visibleToUser=true][text*="跳过" && text.length<=6] <2 @View -(3-n) View < View',
+            '[visibleToUser=true][text="反馈"] -n @View[index<=1] > Image[text.length=0]',
+            '[visibleToUser=true][text="反馈"] <<n View - View[childCount=1]',
          ],
          snapshotUrls: [
            'https://i.gkd.li/i/13830798', //规则2
--- a/src/apps/com.ruanmei.ithome.ts
+++ b/src/apps/com.ruanmei.ithome.ts
@@ -15,7 +15,7 @@ export default defineGkdApp({
          fastQuery: true,
          activityIds: 'com.ruanmei.ithome.ui.MainActivity',
          matches:
-            '@[text="关闭"][visibleToUser=true] <<n [vid="ll_web"][visibleToUser=true]',
+            '@[visibleToUser=true][text="关闭"] <<n [vid="ll_web"][visibleToUser=true]',
          snapshotUrls: [
            'https://i.gkd.li/i/15413491',
            'https://i.gkd.li/i/15603266', // 避免误触
--- a/src/apps/com.sankuai.meituan.ts
+++ b/src/apps/com.sankuai.meituan.ts
@@ -238,7 +238,7 @@ export default defineGkdApp({
          activityIds:
            'com.meituan.android.hybridcashier.HybridCashierActivity',
          matches:
-            '[text="支付成功"] >5 @[text="完成"][clickable=true] <<n [vid="mil_container"]',
+            '[text="支付成功"] >5 @[clickable=true][text="完成"] <<n [vid="mil_container"]',
          snapshotUrls: 'https://i.gkd.li/i/14392284',
        },
      ],
--- a/src/apps/com.sfexpress.sfim.ts
+++ b/src/apps/com.sfexpress.sfim.ts
@@ -19,7 +19,7 @@ export default defineGkdApp({
            'com.sfexpress.sfim.microservice.commonservice.ui.MicroAppContainerActivity',
            'com.sfexpress.sfim.sdkuikit.widget.dialog.NoticeDialog',
          ],
-          matches: '@[text="登录"] <<n [vid="flContainer"]',
+          matches: '@[visibleToUser=true][text="登录"] <<n [vid="flContainer"]',
          snapshotUrls: [
            'https://i.gkd.li/i/12745239',
            'https://i.gkd.li/i/12745240',
--- a/src/apps/com.sina.weibo.ts
+++ b/src/apps/com.sina.weibo.ts
@@ -113,7 +113,7 @@ export default defineGkdApp({
          key: 1,
          activityIds: 'com.sina.weibo.feed.MPDialogActivity',
          matches:
-            'View[childCount=2] > @TextView[clickable=true] - View >n [text="元"] <<n [id="com.sina.weibo:id/container"]',
+            'View[childCount=2] > @TextView[clickable=true] - View >n [visibleToUser=true][text="元"] <<n [id="com.sina.weibo:id/container"]',
          snapshotUrls: 'https://i.gkd.li/i/13670266',
        },
        {
--- a/src/apps/com.sina.weibolite.ts
+++ b/src/apps/com.sina.weibolite.ts
@@ -27,7 +27,7 @@ export default defineGkdApp({
          preKeys: 0,
          name: '点击[不感兴趣]',
          matches:
-            '@View[clickable=true][childCount=1] > TextView[text="不感兴趣"||text$="interest"] <<n [vid="design_bottom_sheet"]',
+            '@View[clickable=true][childCount=1] > TextView[visibleToUser=true][text="不感兴趣"||text$="interest"] <<n [vid="design_bottom_sheet"]',
          snapshotUrls: [
            'https://i.gkd.li/i/12738132',
            'https://i.gkd.li/i/13727657',
--- a/src/apps/com.sinovatech.unicom.ui.ts
+++ b/src/apps/com.sinovatech.unicom.ui.ts
@@ -47,7 +47,7 @@ export default defineGkdApp({
          key: 1,
          activityIds: 'com.sinovatech.unicom.basic.ui.activity.MainActivity',
          matches:
-            '@TextView[id="home_popup_close"][childCount=0][clickable=true] <<n [vid="main_fragment_layout_haoka"]',
+            '@TextView[childCount=0][clickable=true][id="home_popup_close"] <<n [vid="main_fragment_layout_haoka"]',
          snapshotUrls: 'https://i.gkd.li/i/15971964',
        },
      ],
--- a/src/apps/com.smile.gifmaker.ts
+++ b/src/apps/com.smile.gifmaker.ts
@@ -112,7 +112,7 @@ export default defineGkdApp({
          action: 'back',
          activityIds:
            'com.kuaishou.live.core.basic.activity.LiveSlideActivity',
-          matches: '[text="幸运奖池"][visibleToUser=true] <<n [vid="webView"]',
+          matches: '[visibleToUser=true][text="幸运奖池"] <<n [vid="webView"]',
          exampleUrls:
            'https://m.gkd.li/57941037/338df1c2-8789-435b-8970-c837b00fc0f5',
          snapshotUrls: 'https://i.gkd.li/i/15629334',
--- a/src/apps/com.taobao.idlefish.ts
+++ b/src/apps/com.taobao.idlefish.ts
@@ -20,7 +20,7 @@ export default defineGkdApp({
      resetMatch: 'app',
      activityIds: 'com.taobao.idlefish.maincontainer.activity.MainActivity',
      rules:
-        '@Button[text="取消"] <<n FrameLayout >n TextView[text*="手机信息"]',
+        '@Button[visibleToUser=true][text="取消"] <<n FrameLayout >n TextView[text*="手机信息"]',
      snapshotUrls: 'https://i.gkd.li/i/13620277',
    },
    {
--- a/src/apps/com.taobao.taobao.ts
+++ b/src/apps/com.taobao.taobao.ts
@@ -182,28 +182,19 @@ export default defineGkdApp({
      fastQuery: true,
      matchTime: 10000,
      actionMaximum: 1,
-      resetMatch: 'app',
      rules: [
-        {
-          key: 0,
-          activityIds: 'com.alipay.android.msp.ui.views.MspContainerActivity',
-          matches:
-            '[text="花呗服务未升级，将影响后续使用"] <<n FrameLayout @FrameLayout[clickable=true] [text="暂不升级，继续付款"]',
-          snapshotUrls: 'https://i.gkd.li/i/13628020',
-        },
-        {
-          key: 1,
-          activityIds: 'com.alipay.android.msp.ui.views.MspContainerActivity',
-          matches:
-            '[text="根据相关法律法规要求，请尽快完成花呗升级"] <<n FrameLayout FrameLayout @[text="关闭"]',
-          snapshotUrls: 'https://i.gkd.li/i/13691864',
-        },
        {
          key: 2,
          activityIds: 'com.alipay.android.msp.ui.views.MspContainerActivity',
-          matches:
-            '[id="com.taobao.taobao:id/flybird_userinfo"] + * [text="暂不升级，继续付款"]',
-          snapshotUrls: 'https://i.gkd.li/i/13898735',
+          matches: [
+            '[text*="花呗" && text*="升级"]',
+            '@[clickable=true] >n [text="暂不升级，继续付款" || text="关闭"]',
+          ],
+          snapshotUrls: [
+            'https://i.gkd.li/i/13691864',
+            'https://i.gkd.li/i/13628020',
+            'https://i.gkd.li/i/13898735',
+          ],
        },
      ],
    },
--- a/src/apps/com.tencent.mm.ts
+++ b/src/apps/com.tencent.mm.ts
@@ -491,7 +491,7 @@ export default defineGkdApp({
          fastQuery: true,
          activityIds: 'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI',
          matches:
-            '@TextView[clickable=true] + * > [text^="使用 APP"] <<n [id="android:id/content"]',
+            '@TextView[clickable=true] + * > [visibleToUser=true][text^="使用 APP"] <<n [id="android:id/content"]',
          exampleUrls:
            'https://m.gkd.li/57941037/2228f99e-e0a1-4915-864f-d60e3d8580a6',
          snapshotUrls: 'https://i.gkd.li/i/14533286',
--- a/src/apps/com.tencent.mobileqq.ts
+++ b/src/apps/com.tencent.mobileqq.ts
@@ -637,7 +637,7 @@ export default defineGkdApp({
          activityIds:
            'com.tencent.mobileqq.activity.TeamWorkDocEditBrowserActivity',
          matches:
-            '@TextView[clickable=true] + * > [text^="使用 APP"] <<n [vid="webview"]',
+            '@TextView[clickable=true] + * > [visibleToUser=true][text^="使用 APP"] <<n [vid="webview"]',
          exampleUrls:
            'https://m.gkd.li/57941037/6efc2dfd-79f3-43b5-bf20-f59a88295ddb',
          snapshotUrls: 'https://i.gkd.li/i/14188983',
--- a/src/apps/com.twitter.android.ts
+++ b/src/apps/com.twitter.android.ts
@@ -174,7 +174,7 @@ export default defineGkdApp({
      rules: [
        {
          matches:
-            '@[clickable=true] > [text="Not now"] <<n [vid="half_cover_recycler_view_holder"]',
+            '@[clickable=true] > [visibleToUser=true][text="Not now"] <<n [vid="half_cover_recycler_view_holder"]',
          snapshotUrls: 'https://i.gkd.li/i/13930126',
        },
      ],
--- a/src/apps/com.weico.international.ts
+++ b/src/apps/com.weico.international.ts
@@ -59,7 +59,7 @@ export default defineGkdApp({
          key: 1,
          name: '点击不感兴趣',
          matches:
-            '@View[clickable=true] > [text="不感兴趣"] <<n [vid="design_bottom_sheet"]',
+            '@View[clickable=true] > [visibleToUser=true][text="不感兴趣"] <<n [vid="design_bottom_sheet"]',
          snapshotUrls: [
            'https://i.gkd.li/i/12505755',
            'https://i.gkd.li/i/12505764',
--- a/src/apps/com.zhihu.android.ts
+++ b/src/apps/com.zhihu.android.ts
@@ -113,7 +113,8 @@ export default defineGkdApp({
          action: 'clickCenter',
          activityIds:
            'com.zhihu.android.creatorcenter.CreatorCenterHostActivity',
-          matches: 'View[text="关闭"] > @[text="关闭"] <<n [vid="webview_bg"]',
+          matches:
+            'View[text="关闭"] > @[visibleToUser=true][text="关闭"] <<n [vid="webview_bg"]',
          snapshotUrls: 'https://i.gkd.li/i/14955183',
        },
      ],
@@ -158,7 +159,7 @@ export default defineGkdApp({
            'com.zhihu.android.mixshortcontainer.MixShortContainerActivity',
          ],
          matches:
-            '@[text="×"][visibleToUser=true] <n * > [text*="广告"] <<n [vid="web_frame"]',
+            '@[text="×"][visibleToUser=true] <n * > [visibleToUser=true][text*="广告"] <<n [vid="web_frame"]',
          snapshotUrls: [
            'https://i.gkd.li/i/14220104',
            'https://i.gkd.li/i/14421277',
@@ -183,7 +184,7 @@ export default defineGkdApp({
            'com.zhihu.android.mix.activity.ContentMixProfileActivity',
          ],
          matches:
-            '@Image[clickable=true][visibleToUser=true] <2 * > [text$="广告"] <<n [vid="view_content"]',
+            '@Image[clickable=true][visibleToUser=true] <2 * > [visibleToUser=true][text$="广告"] <<n [vid="view_content"]',
          snapshotUrls: [
            'https://i.gkd.li/i/14391614',
            'https://i.gkd.li/i/15282584',
@@ -214,7 +215,7 @@ export default defineGkdApp({
          activityIds:
            'com.zhihu.android.mix.activity.ContentMixProfileActivity',
          matches:
-            '@[text="×"][visibleToUser=true] <n * > [text="查看详情"] <<n [vid="view_content"]',
+            '@[text="×"][visibleToUser=true] <n * > [visibleToUser=true][text="查看详情"] <<n [vid="view_content"]',
          snapshotUrls: 'https://i.gkd.li/i/15285359',
        },
      ],
--- a/src/apps/com.zmzx.college.search.ts
+++ b/src/apps/com.zmzx.college.search.ts
@@ -178,7 +178,8 @@ export default defineGkdApp({
          action: 'back',
          activityIds:
            'com.zmzx.college.search.activity.common.CommonCacheHybridActivity',
-          matches: '[text="邀好友得开学好礼"] <<n [vid="webview_root_layout"]',
+          matches:
+            '[visibleToUser=true][text="邀好友得开学好礼"] <<n [vid="webview_root_layout"]',
          exampleUrls:
            'https://m.gkd.li/57941037/d625fcaa-4cf3-4c92-9b27-10542b0262bb',
          snapshotUrls: 'https://i.gkd.li/i/14555042',