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

* fix(QQ): 消息页面顶部广告 * feat(大学搜题酱): 信息流广告, 底部卡片广告 * chore(actions): check_format_lint * fix: 全局规则-开屏广告 --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
aoguai · Jun 20, 2024 · f2c1c2b · f2c1c2b
1 parent ea922f3
commit f2c1c2b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 8 deletions.
diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts
@@ -40,7 +40,7 @@ export default defineGkdApp({
           key: 0,
           name: '顶部横幅',
           matches:
-            'ImageView[longClickable!=true] <n *[left=0][vid!="root"] >n TextView[clickable=false][text.length>0][text!~="(?is).*([01]?[0-9]|2[0-3])[:：][0-5][0-9].*"] <<n * > [name$="ImageView"||name$="Button"][desc="关闭"||(desc=null&&text=null)][childCount=0][visibleToUser=true][clickable=true][longClickable!=true][left>0]',
+            'ImageView[longClickable!=true] <n *[left=0][vid!="root"] >n TextView[clickable=false][text.length>0][text!~="(?is).*([01]?[0-9]|2[0-3])[:：][0-5][0-9].*"] <<n * > [name$="ImageView"||name$="Button"][desc="关闭"||(desc=null&&text=null)][childCount=0][visibleToUser=true][clickable=true][longClickable!=true][left>0][vid!="chat_item_head_icon"]',
           excludeMatches: [
             '[id^="com.tencent.mobileqq.qzone"]', // QQ空间
           ],

diff --git a/src/apps/com.zmzx.college.search.ts b/src/apps/com.zmzx.college.search.ts
@@ -76,7 +76,7 @@ export default defineGkdApp({
     },
     {
       key: 10,
-      name: '局部广告-信息流广告',
+      name: '分段广告-信息流广告',
       activityIds:
         'com.zmzx.college.search.activity.main.activity.MainActivity',
       rules: [
@@ -101,16 +101,48 @@ export default defineGkdApp({
           matches: '@Image < View + View > View >n [text="广告"]',
           snapshotUrls: 'https://i.gkd.li/i/15885694',
         },
+        {
+          preKeys: [0, 1, 2, 3],
+          key: 10,
+          name: '点击不感兴趣',
+          quickFind: true,
+          matches: 'TextView[text="不感兴趣"]',
+          snapshotUrls: ['https://i.gkd.li/i/15913004'],
+        },
       ],
     },
     {
       key: 11,
-      name: '局部广告-首页底部广告',
+      name: '分段广告-底部卡片广告',
+      desc: '点击关闭-点击不感兴趣',
       quickFind: true,
-      activityIds:
-        'com.zmzx.college.search.activity.main.activity.MainActivity',
-      rules: '[vid="tvClose"]',
-      snapshotUrls: 'https://i.gkd.li/i/14518991',
+      rules: [
+        {
+          key: 0,
+          name: '首页底部广告',
+          activityIds:
+            'com.zmzx.college.search.activity.main.activity.MainActivity',
+          matches: '[vid="tvClose"]',
+          snapshotUrls: 'https://i.gkd.li/i/14518991',
+        },
+        {
+          key: 1,
+          name: '教材底部广告',
+          activityIds:
+            'com.zmzx.college.search.activity.booksearch.result.activity.AnswerBrowseActivity',
+          matches: '@[desc$="dislike"] <<n [vid="rlBottomADContainer"]',
+          snapshotUrls: 'https://i.gkd.li/i/15902162',
+        },
+        {
+          preKeys: [1],
+          key: 10,
+          name: '点击不感兴趣',
+          activityIds:
+            'com.zmzx.college.search.activity.booksearch.result.activity.AnswerBrowseActivity',
+          matches: '@[clickable=true] > [text="不感兴趣"]',
+          snapshotUrls: 'https://i.gkd.li/i/15902298',
+        },
+      ],
     },
   ],
 });
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: `[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]"]`,
       },
       {
         key: 1,