From bbc878cfe40374a5026f6791c9e486584b4005bd Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Sun, 14 Jan 2024 21:16:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=A4=A7=E5=AD=A6=E6=90=9C=E9=A2=98?=
 =?UTF-8?q?=E9=85=B1):=20=E5=85=A8=E5=B1=8F=E5=B9=BF=E5=91=8A=EF=BC=88?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=84=E5=88=99=EF=BC=89=E3=80=81=E5=B1=80?=
 =?UTF-8?q?=E9=83=A8=E5=B9=BF=E5=91=8A=EF=BC=88=E4=BC=98=E5=8C=96=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=EF=BC=89=20(#3766)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat 全屏广告（优化规则）

* feat 局部广告（优化规则）
---
 src/apps/com.zmzx.college.search.ts | 69 ++++++++++++++++-------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/src/apps/com.zmzx.college.search.ts b/src/apps/com.zmzx.college.search.ts
index 38570418..b1498074 100644
--- a/src/apps/com.zmzx.college.search.ts
+++ b/src/apps/com.zmzx.college.search.ts
@@ -3,6 +3,7 @@ import { defineAppConfig } from '../types';
 export default defineAppConfig({
   id: 'com.zmzx.college.search',
   name: '大学搜题酱',
+  deprecatedKeys: [4],
   groups: [
     {
       enable: false,
@@ -19,28 +20,26 @@ export default defineAppConfig({
     },
     {
       key: 2,
-      name: '弹窗广告',
-      desc: '会出现在搜题页面与我的页面',
-
-      activityIds: [
-        'com.zmzx.college.search.activity.main.activity.MainActivity',
-        'com.zmzx.college.search.activity.questionsearch.camera.activity.PicSearchResultActivity',
-      ],
+      name: '全屏广告',
       rules: [
         {
           key: 0,
           name: '腾讯广告',
           quickFind: true,
+          activityIds: [
+            'com.zmzx.college.search.activity.main.activity.MainActivity',
+            'com.zmzx.college.search.activity.questionsearch.camera.activity.PicSearchResultActivity',
+          ],
           matches: 'ImageView[id="com.zmzx.college.search:id/iv_close"]',
           snapshotUrls: [
             'https://i.gkd.li/import/12867751',
             'https://i.gkd.li/import/12894813',
-            'https://i.gkd.li/import/13345633', //
           ],
         },
         {
           key: 1,
           name: '快手广告-1',
+          activityIds: 'com.bbk.launcher2.Launcher',
           matches:
             '[text="广告"] <2 ViewGroup -3 ViewGroup > @ViewGroup[clickable=true] > ImageView',
           snapshotUrls: 'https://i.gkd.li/import/13346628',
@@ -48,9 +47,11 @@ export default defineAppConfig({
         {
           key: 2,
           name: '快手广告-2',
+          activityIds:
+            'com.zmzx.college.search.activity.main.activity.MainActivity',
           matches: [
             'ViewGroup > ViewGroup > ViewGroup[childCount=2] > ImageView + [text="广告"]',
-            'ViewGroup > ViewGroup > ViewGroup[childCount=1] > ImageView[childCount=0]',
+            'ViewGroup > ViewGroup > @ViewGroup[childCount=1][clickable=true] > ImageView[childCount=0]',
           ],
           snapshotUrls: 'https://i.gkd.li/import/13451304',
         },
@@ -71,31 +72,39 @@ export default defineAppConfig({
           matches: '@Image < View +3 View > View > TextView[text$="广告"]',
           snapshotUrls: 'https://i.gkd.li/import/13523288',
         },
+        {
+          key: 5,
+          name: '字节广告-3',
+          quickFind: true,
+          activityIds:
+            'com.bilibili.ship.theseus.detail.UnitedBizDetailsActivity',
+          matches:
+            '@[clickable=true] > [id="com.zmzx.college.search:id/tt_reward_full_count_down_after_close"]',
+          snapshotUrls: 'https://i.gkd.li/import/12893408',
+        },
       ],
     },
     {
       key: 3,
-      name: '资料库-弹窗广告',
-      activityIds: [
-        'com.bilibili.ship.theseus.detail.UnitedBizDetailsActivity',
-      ],
-      rules:
-        '@LinearLayout > ImageView[id="com.zmzx.college.search:id/tt_reward_full_count_down_after_close"]',
-      quickFind: true,
-      snapshotUrls: 'https://i.gkd.li/import/12893408',
-    },
-    {
-      key: 4,
-      name: '教材-底部广告',
-      quickFind: true,
-
-      activityIds: [
-        'com.zmzx.college.search.activity.booksearch.result.activity.SearchScanCodeResultDxActivity',
-      ],
-      rules: '[id="com.zmzx.college.search:id/close"]',
-      snapshotUrls: [
-        'https://i.gkd.li/import/13063381',
-        'https://i.gkd.li/import/13346621', //
+      name: '局部广告',
+      rules: [
+        {
+          key: 0,
+          quickFind: true,
+          activityIds:
+            'com.zmzx.college.search.activity.booksearch.result.activity.SearchScanCodeResultDxActivity',
+          matches: '[vid="close_m_image_left_text_right_app_compliance"]',
+          snapshotUrls: 'https://i.gkd.li/import/13849755',
+        },
+        {
+          key: 1,
+          quickFind: true,
+          activityIds:
+            'com.zmzx.college.search.activity.booksearch.result.activity.SearchScanCodeResultDxActivity',
+          matches:
+            '[id^="com.zmzx.college.search:id/ad_flag_source"] - * > [id="com.zmzx.college.search:id/close"]',
+          snapshotUrls: 'https://i.gkd.li/import/13063381',
+        },
       ],
     },
     {