feat: 规则维护更新

src/apps/cn.wps.moffice_eng.ts

@@ -48,7 +48,7 @@ export default defineGkdApp({
             'cn.wps.moffice.main.AfterLoginActivity',
             'com.android.packageinstaller.permission.ui.GrantPermissionsActivity',
           ],
-          matches: '[id="cn.wps.moffice_eng:id/afterlogin_cancel"]',
+          matches: '[vid="afterlogin_cancel"]',
           snapshotUrls: [
             'https://i.gkd.li/i/13259097',
             'https://i.gkd.li/i/12882712',
@@ -59,7 +59,7 @@ export default defineGkdApp({
           fastQuery: true,
           activityIds: 'cn.wps.moffice.main.local.HomeRootActivity',
           matches:
-            'View[childCount=3] > Image[text!=null] +2 @TextView[clickable=true] <<n [vid="push_tips_ptr_super_webview"]',
+            '@TextView[clickable=true] -2 Image[text!=null] <<2 View - [id="app"] <<5 [vid="push_tips_ptr_super_webview"]',
           snapshotUrls: 'https://i.gkd.li/i/13945835',
         },
         {
@@ -86,8 +86,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 1,
-          matches:
-            '[id="cn.wps.moffice_eng:id/cloud_protocol_dialog_not_start_btn"]',
+          matches: '[vid="cloud_protocol_dialog_not_start_btn"]',
           snapshotUrls: [
             'https://i.gkd.li/i/12882536',
             'https://i.gkd.li/i/12882610',
@@ -96,7 +95,7 @@ export default defineGkdApp({
         },
         {
           key: 2,
-          matches: '[id="cn.wps.moffice_eng:id/dialog_button_positive"]',
+          matches: '[vid="dialog_button_positive"]',
           snapshotUrls: 'https://i.gkd.li/i/12882554',
         },
       ],
@@ -111,8 +110,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 1,
-          matches:
-            '[id="cn.wps.moffice_eng:id/doc_end_ad_container_main"] >2 [id="cn.wps.moffice_eng:id/btn_close"]',
+          matches: '[vid="doc_end_ad_container_main"] >2 [vid="btn_close"]',
           snapshotUrls: 'https://i.gkd.li/i/13513911',
         },
         {
@@ -133,7 +131,7 @@ export default defineGkdApp({
           fastQuery: true,
           activityIds: 'cn.wps.moffice.main.local.HomeRootActivity',
           matches:
-            '[id="cn.wps.moffice_eng:id/home_banner_ad_spread_close" || vid="phone_message_close_button" || vid="close_home_ad_banner_iv" || vid="iv_item_close" || vid="iv_cloud_sync_close"][visibleToUser=true]',
+            '[vid="home_banner_ad_spread_close" || vid="phone_message_close_button" || vid="close_home_ad_banner_iv" || vid="iv_item_close" || vid="iv_cloud_sync_close"][visibleToUser=true]',
           snapshotUrls: [
             'https://i.gkd.li/i/13804525',
             'https://i.gkd.li/i/17893252',

src/apps/com.alicloud.databox.ts

@@ -94,7 +94,7 @@ export default defineGkdApp({
       rules: [
         {
           matches:
-            '[text^="立即了解"] -3 @View[clickable=true] <<n [vid="webContainer"]',
+            '[text*="新版本"] -n @[clickable=true][getChild(0).name$="Image"] <<4 [id="root"] <<3 [vid="webContainer"]',
           snapshotUrls: 'https://i.gkd.li/import/13806865',
         },
       ],
@@ -149,7 +149,7 @@ export default defineGkdApp({
       desc: '点击关闭',
       enable: false,
       fastQuery: true,
-      activityIds: 'com.alicloud.databox.MainActivity',
+      activityIds: '.MainActivity',
       rules: [
         {
           matches: ['[text="容量使用超限"]', '[vid="layout_close"]'],
@@ -165,7 +165,7 @@ export default defineGkdApp({
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
-      activityIds: 'com.alicloud.databox.transferpage.TransferListActivity',
+      activityIds: '.transferpage.TransferListActivity',
       rules: [
         {
           key: 0,

src/apps/com.baidu.tieba.ts

@@ -115,12 +115,15 @@ export default defineGkdApp({
             'com.baidu.tieba.pb.pb.main.PbActivity',
             'com.baidu.tieba.forum.ForumActivity',
           ],
-          matches:
+          anyMatches: [
             '@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',
+            'https://i.gkd.li/i/26634661', // [已经看过]
           ],
         },
       ],

src/apps/com.chinamworld.bocmbci.ts

@@ -14,12 +14,30 @@ export default defineGkdApp({
       resetMatch: 'app',
       rules: [
         {
+          key: 0,
           fastQuery: true,
           activityIds:
             'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity',
           matches: '@[desc="关闭"] > [vid="btn_action"]',
           snapshotUrls: 'https://i.gkd.li/i/17691747',
         },
+        {
+          key: 1,
+          fastQuery: true,
+          activityIds:
+            'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity',
+          matches:
+            '@Image[clickable=true][childCount=0][visibleToUser=true][width<150 && height<150] <2 View[childCount=2] < View <4 View < View < WebView < WebView < [vid="webview_layout"]',
+          snapshotUrls: 'https://i.gkd.li/i/19567854',
+        },
+        {
+          key: 2,
+          activityIds:
+            'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity',
+          matches:
+            '@Image[width<80 && height<80] <2 View[childCount=2] <<2 View[index=parent.childCount.minus(1)] <n [id="app"] <<4 [vid="webview_layout"]',
+          snapshotUrls: 'https://i.gkd.li/i/26644706',
+        },
       ],
     },
   ],

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

@@ -250,10 +250,14 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          fastQuery: true,
           activityIds: 'com.eg.android.AlipayGphone.AlipayLogin',
           matches:
-            'RelativeLayout[childCount=2][desc="全屏广告"] ImageView[desc="关闭"]',
-          snapshotUrls: 'https://i.gkd.li/i/14034152',
+            '@ImageView[desc="关闭"][clickable=true] < LinearLayout - [id="com.alipay.mobile.advertisement:id/standardlayer_contentview"][desc="推荐广告"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/14034152',
+            'https://i.gkd.li/i/26184718',
+          ],
         },
         {
           key: 1,
@@ -332,6 +336,7 @@ export default defineGkdApp({
       key: 18,
       name: '功能类-无法访问时点击[返回]',
       desc: '无法访问时点击[返回]',
+      enable: false,
       rules: [
         {
           fastQuery: true,
@@ -360,5 +365,20 @@ export default defineGkdApp({
         },
       ],
     },
+    {
+      key: 20,
+      name: '局部广告-底部横幅广告',
+      fastQuery: true,
+      activityIds: '.AlipayLogin',
+      rules: [
+        {
+          key: 0,
+          name: '邀请参加调研',
+          matches:
+            '@ImageView[clickable=true][width<68] <2 [desc="底部广告"] - [vid="alipaylogin_layout"]',
+          snapshotUrls: 'https://i.gkd.li/i/26330637',
+        },
+      ],
+    },
   ],
 });

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

@@ -13,6 +13,7 @@ export default defineGkdApp({
       rules: [
         {
           key: 1,
+          actionMaximum: 1,
           matches:
             '[vid="basic_ad_teaser_info_icon" || vid="button_chip_ad_teaser_info_icon"][clickable=true]',
           snapshotUrls: [
@@ -24,6 +25,7 @@ export default defineGkdApp({
           preKeys: [1],
           key: 2,
           name: '②点击[屏蔽]',
+          action: 'clickCenter', // 此界面不接受无障碍事件
           matches:
             '@Button[clickable=true][text="屏蔽此广告" || text^="Block" || desc="屏蔽"] <<n [vid="my_ad_center_dialog"]',
           snapshotUrls: [

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

@@ -9,28 +9,21 @@ export default defineGkdApp({
       name: '全屏广告-视频播放-跳过广告',
       desc: '点击跳过广告按钮',
       enable: false,
-      fastQuery: true,
-      activityIds: [
-        'com.google.android.apps.youtube.app.watchwhile.WatchWhileActivity',
-        'com.google.android.apps.youtube.app.watchwhile.MainActivity',
-        'com.google.android.youtube',
-      ],
       rules: [
         {
+          fastQuery: true,
           key: 0,
-          name: '类型1',
-          matches: '[id="com.google.android.youtube:id/skip_ad_button_text"]',
+          activityIds: [
+            'com.google.android.apps.youtube.app.watchwhile.WatchWhileActivity',
+            'com.google.android.apps.youtube.app.watchwhile.MainActivity',
+          ],
+          matches: '[vid="skip_ad_button" || vid="modern_skip_ad_text"]',
           snapshotUrls: [
-            'https://i.gkd.li/import/13797491',
-            'https://i.gkd.li/import/12565261',
+            'https://i.gkd.li/i/13797491',
+            'https://i.gkd.li/i/12565261',
+            'https://i.gkd.li/i/13705106',
           ],
         },
-        {
-          key: 1,
-          name: '类型2',
-          matches: '[id="com.google.android.youtube:id/modern_skip_ad_text"]',
-          snapshotUrls: ['https://i.gkd.li/import/13705106'],
-        },
       ],
     },
     {
@@ -43,47 +36,51 @@ export default defineGkdApp({
         'com.google.android.apps.youtube.app.watchwhile.WatchWhileActivity',
         'com.google.android.apps.youtube.app.watchwhile.MainActivity',
       ],
-      rules:
-        '@[desc="关闭广告面板" || desc="Close ad panel"] <<n [vid="panel_header"]',
-      snapshotUrls: [
-        'https://i.gkd.li/import/12877346',
-        'https://i.gkd.li/import/13797491',
-        'https://i.gkd.li/import/13705106',
+      rules: [
+        {
+          matches:
+            '@[desc="关闭广告面板" || desc="Close ad panel"][clickable=true] - ImageView <<3 FrameLayout < [vid="panel_header"][visibleToUser=true]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13797491',
+            'https://i.gkd.li/i/13705106', // 纯id？
+            'https://i.gkd.li/i/14784199',
+          ],
+        },
       ],
     },
     {
       key: 2,
       name: '全屏广告-会员广告',
       desc: '关闭首页和视频页的会员广告提示',
       enable: false,
-      activityIds: [
+      fastQuery: true,
+      activityIds:
         'com.google.android.apps.youtube.app.watchwhile.MainActivity',
-        'com.google.android.apps.youtube.app.watchwhile.WatchWhileActivity',
-      ],
-      rules:
-        '[!(getChild(0).getChild(0).desc="Image attachment")] + @[desc="不用了，谢谢" || desc="关闭" || desc="我暂时不要" || desc="Close" || desc="No thanks"][visibleToUser=true] <<n [vid="bottom_ui_container" || vid="custom"]',
-      snapshotUrls: [
-        'https://i.gkd.li/import/12877357',
-        'https://i.gkd.li/i/13797512',
-        'https://i.gkd.li/i/18017075',
-        'https://i.gkd.li/i/18549944',
-        'https://i.gkd.li/i/19578085',
-        'https://i.gkd.li/i/25865404',
-      ],
-      excludeSnapshotUrls: 'https://i.gkd.li/i/21978683',
-    },
-    {
-      key: 3,
-      name: '局部广告',
       rules: [
         {
-          fastQuery: true,
-          activityIds:
-            'com.google.android.apps.youtube.app.watchwhile.MainActivity',
+          key: 0,
+          name: '视频',
           matches:
-            '[desc="更多选项"] + @ImageView[clickable=true][width<100 && height<100] <<n [vid="panel_header"]',
-          snapshotUrls: ['https://i.gkd.li/i/23787178'],
-          excludeSnapshotUrls: 'https://i.gkd.li/i/25461943',
+            '[!(getChild(0).getChild(0).desc="Image attachment")] + @[desc="不用了，谢谢" || desc="关闭" || desc="我暂时不要" || desc="Close" || desc="No thanks"][visibleToUser=true] <3 ViewGroup <<(-n+8) [vid="bottom_ui_container" || vid="custom"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13797512',
+            'https://i.gkd.li/i/19578085',
+            'https://i.gkd.li/i/25865404',
+          ],
+          // excludeSnapshotUrls: 'https://i.gkd.li/i/21978683',
+          exampleUrls: 'https://e.gkd.li/1292c8c9-26e3-4053-bec4-e5ebe50cde8e',
+        },
+        {
+          key: 1,
+          name: '开屏', // 疑似开屏，但有可能不是
+          matches:
+            '[!(getChild(0).getChild(0).desc="Image attachment")] + @[desc="不用了，谢谢" || desc="关闭" || desc="我暂时不要" || desc="Close" || desc="No thanks"][visibleToUser=true] -n ImageView < * < [vid="custom"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/18017075',
+            'https://i.gkd.li/i/18549944',
+          ],
+          // excludeSnapshotUrls: 'https://i.gkd.li/i/21978683',
+          exampleUrls: 'https://e.gkd.li/11cdf5b2-97a8-42f0-a2eb-dc1cb2c98ac1',
         },
       ],
     },
@@ -99,7 +96,8 @@ export default defineGkdApp({
           activityIds:
             'com.google.android.apps.youtube.app.watchwhile.MainActivity',
           matches:
-            '@Button[desc^="翻译成"||desc^="Translate to"][clickable=true][visibleToUser=true] <<n [vid="results" || vid="section_list"]',
+            '@Button[desc^="翻译成"||desc^="Translate to"][clickable=true][visibleToUser=true] -n [desc^="@"] <<3 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/17068647', // 翻译后
@@ -113,22 +111,60 @@ export default defineGkdApp({
     {
       key: 5,
       name: '分段广告-播放页广告',
+      desc: '点击[Dismiss/关闭]',
+      enable: false,
       rules: [
         {
-          key: 1,
           fastQuery: true,
           activityIds:
             'com.google.android.apps.youtube.app.watchwhile.MainActivity',
           matches:
-            '@[vid="overflow_button"][clickable=true] <<n [vid="collapsible_ad_cta_overlay_container"]',
-          snapshotUrls: 'https://i.gkd.li/i/23790199',
+            '[vid="mealbar_action_button"] - [vid="mealbar_dismiss_button"][clickable=true][visibleToUser=true]',
+          exampleUrls: 'https://e.gkd.li/aa8f2617-fd6d-43a8-951d-1bd6efc504d3',
+          snapshotUrls: [
+            'https://i.gkd.li/i/19930694',
+            'https://i.gkd.li/i/25461814',
+          ],
         },
+      ],
+    },
+    {
+      key: 8,
+      name: '局部广告',
+      desc: '点击关闭各类局部广告',
+      rules: [
         {
-          key: 2,
-          preKeys: [1],
           fastQuery: true,
           activityIds:
             'com.google.android.apps.youtube.app.watchwhile.MainActivity',
+          matches:
+            '@ImageView[clickable=true][index=parent.childCount.minus(1)] - [desc="更多选项"] < ViewGroup[childCount=2] < * < [vid="panel_header"]',
+          snapshotUrls: 'https://i.gkd.li/i/23787178',
+          excludeSnapshotUrls: 'https://i.gkd.li/i/25461943',
+        },
+      ],
+    },
+    {
+      key: 9,
+      name: '分段广告-播放器广告',
+      desc: '点击关闭播放器广告',
+      enable: false,
+      fastQuery: true,
+      activityIds:
+        'com.google.android.apps.youtube.app.watchwhile.MainActivity',
+      rules: [
+        {
+          key: 1,
+          matches:
+            '[vid="collapsible_ad_cta_overlay_container"] >4 [vid="overflow_button"][clickable=true]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/23790199',
+            'https://i.gkd.li/i/26672553',
+          ],
+        },
+        {
+          key: 2,
+          preKeys: [1],
           matches:
             '@[clickable=true] >(1,2) [vid="list_item_text"][text="关闭"]',
           snapshotUrls: [