feat: 规则维护更新

src/apps/cn.wps.moffice_eng.ts

@@ -20,17 +20,17 @@ export default defineGkdApp({
           key: 0,
           matches: '[id="com.mopub.ad.xiaomi:id/nativeclose"]',
           snapshotUrls: [
-            'https://i.gkd.li/import/12505350',
-            'https://i.gkd.li/import/12505286',
+            'https://i.gkd.li/i/12505350',
+            'https://i.gkd.li/i/12505286',
           ],
         },
         {
           preKeys: [0],
           key: 99,
           matches: '[text="不喜欢此广告"]',
           snapshotUrls: [
-            'https://i.gkd.li/import/12505365',
-            'https://i.gkd.li/import/13259090',
+            'https://i.gkd.li/i/12505365',
+            'https://i.gkd.li/i/13259090',
           ],
         },
       ],
@@ -50,17 +50,17 @@ export default defineGkdApp({
           ],
           matches: '[id="cn.wps.moffice_eng:id/afterlogin_cancel"]',
           snapshotUrls: [
-            'https://i.gkd.li/import/13259097',
-            'https://i.gkd.li/import/12882712',
+            'https://i.gkd.li/i/13259097',
+            'https://i.gkd.li/i/12882712',
           ],
         },
         {
           key: 1,
-          name: '体验超级会员弹窗',
+          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"]',
-          snapshotUrls: 'https://i.gkd.li/import/13945835',
+          snapshotUrls: 'https://i.gkd.li/i/13945835',
         },
         {
           key: 2,
@@ -74,8 +74,8 @@ export default defineGkdApp({
     },
     {
       key: 4,
-      name: '全屏广告-开启WPS云服务',
-      desc: '自动点击不开启云服务',
+      name: '全屏广告-关闭[开启WPS云服务]弹窗',
+      desc: '自动点击不开启',
       enable: false,
       fastQuery: true,
       activityIds: [
@@ -85,17 +85,19 @@ export default defineGkdApp({
       ],
       rules: [
         {
+          key: 1,
           matches:
             '[id="cn.wps.moffice_eng:id/cloud_protocol_dialog_not_start_btn"]',
           snapshotUrls: [
-            'https://i.gkd.li/import/12882536',
-            'https://i.gkd.li/import/12882610',
-            'https://i.gkd.li/import/12882678',
+            'https://i.gkd.li/i/12882536',
+            'https://i.gkd.li/i/12882610',
+            'https://i.gkd.li/i/12882678',
           ],
         },
         {
+          key: 2,
           matches: '[id="cn.wps.moffice_eng:id/dialog_button_positive"]',
-          snapshotUrls: 'https://i.gkd.li/import/12882554',
+          snapshotUrls: 'https://i.gkd.li/i/12882554',
         },
       ],
     },
@@ -105,32 +107,51 @@ export default defineGkdApp({
       desc: '关闭文档末尾的广告内容',
       enable: false,
       fastQuery: true,
-      activityIds: [
-        'cn.wps.moffice.writer.multiactivity.Writer', //Writer1,Writer2...
-      ],
+      activityIds: 'cn.wps.moffice.writer.multiactivity.Writer',
       rules: [
         {
           key: 1,
           matches:
             '[id="cn.wps.moffice_eng:id/doc_end_ad_container_main"] >2 [id="cn.wps.moffice_eng:id/btn_close"]',
-          snapshotUrls: 'https://i.gkd.li/import/13513911',
+          snapshotUrls: 'https://i.gkd.li/i/13513911',
         },
         {
-          preKeys: 1,
+          preKeys: [1],
           key: 2,
           matches: '[text="关闭当前广告"]',
-          snapshotUrls: 'https://i.gkd.li/import/13513914',
+          snapshotUrls: 'https://i.gkd.li/i/13513914',
         },
       ],
     },
     {
       key: 6,
-      name: '局部广告-首页底部广告',
-      desc: '关闭首页底部横幅广告',
-      fastQuery: true,
-      activityIds: 'cn.wps.moffice.main.local.HomeRootActivity',
-      rules: '[id="cn.wps.moffice_eng:id/home_banner_ad_spread_close"]',
-      snapshotUrls: 'https://i.gkd.li/import/13804525',
+      name: '局部广告',
+      desc: '关闭各类局部广告',
+      rules: [
+        {
+          key: 1,
+          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]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13804525',
+            'https://i.gkd.li/i/17893252',
+            'https://i.gkd.li/i/18047731',
+            'https://i.gkd.li/i/23577590',
+            'https://i.gkd.li/i/23786789',
+          ],
+        },
+        {
+          key: 2,
+          fastQuery: true,
+          activityIds: 'cn.wps.moffice.writer.multiactivity.Writer1',
+          matches:
+            '[vid="public_login"] <2 LinearLayout[childCount=2] + [vid="public_close"][clickable=true][visibleToUser=true]',
+          snapshotUrls: 'https://i.gkd.li/i/26026279',
+          exampleUrls: 'https://e.gkd.li/a17eca15-c7bd-4ea6-ba84-0d3242641697',
+        },
+      ],
     },
   ],
 });

src/apps/com.alicloud.databox.ts

@@ -35,6 +35,7 @@ export default defineGkdApp({
           name: '在签到后，关闭弹窗',
           action: 'back',
           anyMatches: [
+            '[text="保存至"]',
             '[vid="ivCardBackBackground"][visibleToUser=true]',
             '[vid="cvCardFront"] > [vid="ivClose"][visibleToUser=true]',
           ],

src/apps/com.autonavi.minimap.ts

@@ -81,6 +81,17 @@ export default defineGkdApp({
       name: '局部广告-卡片广告',
       desc: '关闭地图页面的卡片式广告和购票优惠提示',
       rules: [
+        {
+          key: 0,
+          activityIds: 'com.autonavi.map.activity.NewMapActivity',
+          fastQuery: true,
+          matches: [
+            '[vid="btn_qrscan"][desc="扫一扫"]',
+            'ViewGroup[desc.length>0] < ViewGroup + @[desc="关闭"][clickable=true][visibleToUser=true] <<n [vid="quickservice"]',
+          ],
+          snapshotUrls: 'https://i.gkd.li/i/14715295',
+          excludeSnapshotUrls: 'https://i.gkd.li/i/25660170',
+        },
         {
           key: 1,
           fastQuery: true,

src/apps/com.baidu.tieba.ts

@@ -104,6 +104,7 @@ export default defineGkdApp({
             'https://i.gkd.li/i/21529443',
             'https://i.gkd.li/i/21556758',
             'https://i.gkd.li/i/24520138',
+            'https://i.gkd.li/i/25710401',
           ],
         },
         {

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

@@ -108,6 +108,17 @@ export default defineGkdApp({
             '[text="添加会员小组件"] < View +3 View[childCount=2] > [text="近期不再提醒我"]',
           snapshotUrls: 'https://i.gkd.li/i/16427922',
         },
+        {
+          key: 2,
+          activityIds:
+            'com.alipay.mobile.nebulax.xriver.activity.XRiverActivity',
+          matches:
+            '[text="通用半浮层容器页面"] >4 [text*="小组件"] - View[index=0][visibleToUser=true]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/26164320',
+            'https://i.gkd.li/i/26164322',
+          ],
+        },
       ],
     },
     {
@@ -328,12 +339,13 @@ export default defineGkdApp({
             'com.alipay.mobile.nebulax.xriver.activity.XRiverActivity',
             'com.alipay.mobile.nebulax.xriver.activity.XRiverTransActivity$Main',
             'com.alipay.android.living.activity.LivingNotTransparentDetailActivity',
-            '.AlipayLogin',
             'com.alipay.android.phone.wallet.blessingcard_receive.biz.activity.ReceiveDialogActivity',
+            'com.alipay.android.living.activity.LivingDetailActivity',
+            '.AlipayLogin',
           ],
           matches: [
             '[text="访问被拒绝" || text="人气太旺啦，请稍后再试" || text="訪問被拒絕" || text="人氣太旺啦，請稍後再試" || text="伺服器繁忙，請稍後再試"][visibleToUser=true]',
-            '[id="com.alipay.mobile.antui:id/back_button"][visibleToUser=true]',
+            '[id="com.alipay.mobile.antui:id/back_button"][clickable=true]',
           ],
           snapshotUrls: [
             'https://i.gkd.li/i/23046994',
@@ -343,6 +355,7 @@ export default defineGkdApp({
             'https://i.gkd.li/i/24353826',
             'https://i.gkd.li/i/24183318',
             'https://i.gkd.li/i/25199767',
+            'https://i.gkd.li/i/25485052',
           ],
         },
       ],

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

@@ -12,40 +12,46 @@ export default defineGkdApp({
       fastQuery: true,
       rules: [
         {
-          key: 0,
-          matches:
-            '[id="com.google.android.gm:id/basic_ad_teaser_info_icon" || id="com.google.android.gm:id/button_chip_ad_teaser_info_icon"]',
-          snapshotUrls: [
-            'https://i.gkd.li/i/13255698',
-            'https://i.gkd.li/i/13255698',
-          ],
-        },
-        {
-          preKeys: [0],
           key: 1,
           matches:
-            'Button[visibleToUser=true][text="屏蔽此广告" || text^="Block" || desc="屏蔽"] <<n [vid="my_ad_center_dialog"]',
+            '[vid="basic_ad_teaser_info_icon" || vid="button_chip_ad_teaser_info_icon"][clickable=true]',
           snapshotUrls: [
-            'https://i.gkd.li/i/13255700',
-            'https://i.gkd.li/i/13724271',
-            'https://i.gkd.li/i/20585351',
+            'https://i.gkd.li/i/13255698', // 旧快照 节点还未引进 vid 属性
+            'https://i.gkd.li/i/25542293',
           ],
         },
         {
           preKeys: [1],
           key: 2,
+          name: '②点击[屏蔽]',
           matches:
-            'Button[visibleToUser=true][text="继续" || text="Continue"] <<n [id="com.google.android.gm:id/my_ad_center_dialog"]',
+            '@Button[clickable=true][text="屏蔽此广告" || text^="Block" || desc="屏蔽"] <<n [vid="my_ad_center_dialog"]',
           snapshotUrls: [
-            'https://i.gkd.li/i/13255701',
-            'https://i.gkd.li/i/13724287',
+            'https://i.gkd.li/i/13255700', // 屏蔽此广告
+            'https://i.gkd.li/i/13724271', // Block
+            'https://i.gkd.li/i/20585351', // 屏蔽
           ],
         },
         {
           preKeys: [2],
           key: 3,
-          matches: '[id="com.google.android.gm:id/my_ad_center_close_icon"]',
-          snapshotUrls: 'https://i.gkd.li/i/13263279',
+          name: '③点击[继续]',
+          matches:
+            '@Button[clickable=true][text="继续" || text="Continue"] <<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
+          ],
+        },
+        {
+          preKeys: [3],
+          key: 4,
+          name: '④x掉',
+          matches: '[vid="my_ad_center_close_icon"][clickable=true]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/13263279',
+            'https://i.gkd.li/i/25543406',
+          ],
         },
       ],
     },

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

@@ -2,7 +2,7 @@ import { defineGkdApp } from '@gkd-kit/define';
 
 export default defineGkdApp({
   id: 'com.google.android.youtube',
-  name: 'youtube',
+  name: 'YouTube',
   groups: [
     {
       key: 0,
@@ -61,13 +61,14 @@ export default defineGkdApp({
         'com.google.android.apps.youtube.app.watchwhile.WatchWhileActivity',
       ],
       rules:
-        '[getChild(0).getChild(0).desc!="Image attachment"] + @[desc="不用了，谢谢" || desc="关闭" || desc="Close" || desc="No thanks"][visibleToUser=true] <<n [vid="bottom_ui_container" || vid="custom"]',
+        '[!(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',
     },
@@ -80,15 +81,16 @@ export default defineGkdApp({
           activityIds:
             'com.google.android.apps.youtube.app.watchwhile.MainActivity',
           matches:
-            '@ImageView[clickable=true][width<100 && height<100] <<n [vid="panel_header"]',
-          snapshotUrls: 'https://i.gkd.li/i/23787178',
+            '[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',
         },
       ],
     },
     {
       key: 4,
       name: '功能类-自动翻译评论',
-      desc: '点击评论区的翻译成中文按钮',
+      desc: '评论区自动点击[翻译成/Translate to]',
       enable: false,
       rules: [
         {
@@ -97,11 +99,13 @@ export default defineGkdApp({
           activityIds:
             'com.google.android.apps.youtube.app.watchwhile.MainActivity',
           matches:
-            '@Button[desc^="翻译成中文"][clickable=true][visibleToUser=true] <<n [vid="results" || vid="section_list"]',
+            '@Button[desc^="翻译成"||desc^="Translate to"][clickable=true][visibleToUser=true] <<n [vid="results" || vid="section_list"]',
           snapshotUrls: [
             'https://i.gkd.li/i/17068544', // 翻译前
             '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后
           ],
         },
       ],
@@ -125,8 +129,12 @@ export default defineGkdApp({
           fastQuery: true,
           activityIds:
             'com.google.android.apps.youtube.app.watchwhile.MainActivity',
-          matches: '@[clickable=true] > [text="关闭"]',
-          snapshotUrls: 'https://i.gkd.li/i/23772979',
+          matches:
+            '@[clickable=true] >(1,2) [vid="list_item_text"][text="关闭"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/23772979',
+            'https://i.gkd.li/i/25461885',
+          ],
         },
       ],
     },

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

@@ -27,22 +27,28 @@ export default defineGkdApp({
       rules: [
         {
           key: 0,
+          actionCd: 300,
           activityIds: 'com.mc10086.cmcc.view.tabs.AppTabFragment',
           matches:
-            '[id="com.greenpoint.android.mc10086.activity:id/close_btn"]',
-          snapshotUrls: 'https://i.gkd.li/i/12662265',
+            '[vid="close_btn" || vid="close_btn_bottom" || vid="cmcc_digital_delete_float_icon_ll"]',
+          snapshotUrls: [
+            'https://i.gkd.li/i/12662265', // close_btn
+            'https://i.gkd.li/i/14570369', // close_btn_bottom
+            'https://i.gkd.li/i/25768816', // close_btn_bottom 和 cmcc_digital_delete_float_icon_ll
+          ],
         },
         {
           key: 1,
           activityIds: 'com.mc10086.cmcc.view.tabs.AppTabFragment',
-          matches: '[vid="close_btn_bottom"]',
-          snapshotUrls: 'https://i.gkd.li/i/14570369',
+          matches:
+            '[vid="tab_ai_tag"] >2 [vid="ai_floatingBar_close"][clickable=true]',
+          snapshotUrls: 'https://i.gkd.li/i/25768547',
         },
         {
           key: 2,
           activityIds: 'com.cmccit.webview.ac.CommonHtml5Activity',
           matches:
-            '[text="余量查询"] > View > View > @Image[clickable=true][text!=null] <<n [vid="patmentwebview"]',
+            '@Image[clickable=true][text!=null] <<3 WebView[text="余量查询"] <<2 [vid="patmentwebview"]',
           snapshotUrls: 'https://i.gkd.li/i/14738550',
         },
       ],