feat: 规则维护更新 (#201)

* feat(小黑盒): 自动查看原图 * fix: 全局规则-开屏广告 * feat(大学搜题酱): 信息流广告 * feat(支付宝): 关闭花呗, 借呗，还款升级弹窗 * feat(百度): 信息流广告 * feat(菜鸟): 弹窗广告 * chore(actions): check_format_lint --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
aoguai · Jul 10, 2024 · d79439a · d79439a
1 parent b639cd6
commit d79439a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/src/apps/com.baidu.tieba.ts b/src/apps/com.baidu.tieba.ts
@@ -25,6 +25,7 @@ export default defineGkdApp({
       name: '分段广告-信息流广告',
       desc: '推荐帖子列表, 评论区列表, 关闭时弹窗选原因',
       enable: false,
+      forcedTime: 10000,
       activityIds: [
         'com.baidu.tieba.pb.pb.main.PbActivity',
         'com.baidu.tieba.frs.FrsActivity',

diff --git a/src/apps/com.cainiao.wireless.ts b/src/apps/com.cainiao.wireless.ts
@@ -8,6 +8,7 @@ export default defineGkdApp({
       key: 1,
       name: '全屏广告-弹窗广告',
       enable: false,
+      forcedTime: 10000,
       activityIds: [
         'com.cainiao.wireless.homepage.view.activity.HomePageActivity',
         'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
@@ -17,10 +18,11 @@ export default defineGkdApp({
         {
           key: 0,
           quickFind: true,
-          matches: '[id="com.cainiao.wireless:id/draw_dialog_iv_close"]',
+          matches: '[vid="draw_dialog_iv_close"]',
           snapshotUrls: [
             'https://i.gkd.li/import/14162087',
             'https://i.gkd.li/import/14162238',
+            'https://i.gkd.li/i/16118156',
           ],
         },
         {
@@ -40,6 +42,14 @@ export default defineGkdApp({
           matches: 'View[childCount=2][clickable=true] > [text="关闭"]',
           snapshotUrls: 'https://i.gkd.li/import/14033859',
         },
+        {
+          key: 4,
+          quickFind: true,
+          activityIds:
+            'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity',
+          matches: '[vid="cn_bottom_sheet_close"]',
+          snapshotUrls: 'https://i.gkd.li/i/16118155',
+        },
       ],
     },
     {

diff --git a/src/apps/com.eg.android.AlipayGphone.ts b/src/apps/com.eg.android.AlipayGphone.ts
@@ -6,7 +6,7 @@ export default defineGkdApp({
   groups: [
     {
       key: 0,
-      name: '通知提示-关闭花呗, 借呗弹窗',
+      name: '通知提示-关闭花呗, 借呗，还款升级弹窗',
       desc: '包括升级和开通弹窗',
       enable: false,
       actionMaximum: 1,
@@ -21,7 +21,7 @@ export default defineGkdApp({
         {
           key: 0,
           matches:
-            '@[(name$=".Image")||(text^="暂不升级"||text="关闭")][visibleToUser=true][desc.length=null] <<n * <n * > * >n [(text^="同意协议并")&&(text$="确认交易"||text$="升级"||text$="开通"||text$="刷脸验证")]',
+            '@[(name$=".Image")||((text^="暂不升级"||text^="放弃升级")||text="关闭")][visibleToUser=true][desc.length=null] <<n * <n * > * >n [((text^="同意")&&((text*="协议并"||text*="升级并")))&&(text$="确认交易"||text$="升级"||text$="开通"||text$="刷脸验证"||text$="付款")]',
           snapshotUrls: [
             'https://i.gkd.li/import/12737055', //com.alipay.mobile.nebulax.integration.mpaas.activity.NebulaActivity$Main
             'https://i.gkd.li/import/13915022',
@@ -34,6 +34,7 @@ export default defineGkdApp({
             'https://i.gkd.li/import/14060628',
             'https://i.gkd.li/i/14650607',
             'https://i.gkd.li/i/15050300',
+            'https://i.gkd.li/i/16106615',
           ],
         },
       ],

diff --git a/src/apps/com.max.xiaoheihe.ts b/src/apps/com.max.xiaoheihe.ts
@@ -45,12 +45,17 @@ export default defineGkdApp({
       name: '功能类-自动查看原图',
       enable: false,
       quickFind: true,
-      activityIds:
+      activityIds: [
         'com.max.xiaoheihe.module.bbs.post.ui.activitys.PicturePostPageActivity',
+        'com.max.xiaoheihe.module.bbs.post.ui.activitys.WebNewsPostPageActivity',
+      ],
       rules: [
         {
           matches: '[vid="tv_original"][visibleToUser=true]',
-          snapshotUrls: 'https://i.gkd.li/i/16028159',
+          snapshotUrls: [
+            'https://i.gkd.li/i/16028159',
+            'https://i.gkd.li/i/16156806',
+          ],
         },
       ],
     },

diff --git a/src/apps/com.zmzx.college.search.ts b/src/apps/com.zmzx.college.search.ts
@@ -103,7 +103,13 @@ export default defineGkdApp({
           snapshotUrls: 'https://i.gkd.li/i/15885694',
         },
         {
-          preKeys: [0, 1, 2, 3],
+          key: 4,
+          matches:
+            '@ImageView - ImageView <(2) * > TextView[text.length>0] < * <n * > TextView[text.length>0]',
+          snapshotUrls: 'https://i.gkd.li/i/16157056',
+        },
+        {
+          preKeys: [0, 1, 2, 3, 4],
           key: 10,
           name: '点击不感兴趣',
           quickFind: true,

diff --git a/src/globalGroups.ts b/src/globalGroups.ts
@@ -81,7 +81,7 @@ export default defineGkdGlobalGroups([
     rules: [
       {
         key: 0,
-        matches: `[childCount<7] > ${COMMON_PREFIX}[(text.length<10&&(text*="跳过"||text*="跳過"||text~="(?is).*skip.*"))||id~="(?is).*tt_splash_skip_btn"||vid~="(?is).*skip.*"||(vid~="(?is).*count.*"&&vid~="(?is).*down.*"&&!(vid~="(?is).*load.*")&&!(vid~="(?is).*hour.*")&&!(vid~="(?is).*minute.*")&&!(vid~="(?is).*add.*")&&!(vid~="(?is).*ead.*"))||desc*="跳过"||desc~="(?is).*skip.*"][!(text~="([01]?[0-9]|2[0-3])[:：][0-5][0-9]")][!(desc~="([01]?[0-9]|2[0-3])[:：][0-5][0-9]")]`,
+        matches: `${COMMON_PREFIX}[(text.length<10&&(text*="跳过"||text*="跳過"||text~="(?is).*skip.*"))||id~="(?is).*tt_splash_skip_btn"||vid~="(?is).*skip.*"||(vid~="(?is).*count.*"&&vid~="(?is).*down.*"&&!(vid~="(?is).*load.*")&&!(vid~="(?is).*hour.*")&&!(vid~="(?is).*minute.*")&&!(vid~="(?is).*add.*")&&!(vid~="(?is).*ead.*"))||desc*="跳过"||desc~="(?is).*skip.*"][!(text~="([01]?[0-9]|2[0-3])[:：][0-5][0-9]")][!(desc~="([01]?[0-9]|2[0-3])[:：][0-5][0-9]")]`,
       },
       {
         key: 1,