From 686fcf67effda7f5d3d66bf210e9e0966307d4ca Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Mon, 13 Nov 2023 00:50:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=B1=86=E7=93=A3):=20=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A=EF=BC=88=E4=BC=98=E5=8C=96=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=89=20(#2037)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat 弹窗广告（优化规则）

* feat(豆瓣): 规则优化

---------

Co-authored-by: lisonge <i@songe.li>
---
 src/apps/com.douban.frodo.ts | 37 +++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/apps/com.douban.frodo.ts b/src/apps/com.douban.frodo.ts
index 05b92c36..5295af1b 100644
--- a/src/apps/com.douban.frodo.ts
+++ b/src/apps/com.douban.frodo.ts
@@ -3,6 +3,7 @@ import { defineAppConfig } from '../types';
 export default defineAppConfig({
   id: 'com.douban.frodo',
   name: '豆瓣',
+  deprecatedKeys: [7],
   groups: [
     {
       key: 0,
@@ -152,7 +153,6 @@ export default defineAppConfig({
         },
       ],
     },
-    // key=7 已被删除,不可使用
     {
       key: 8,
       name: '小组讨论详情页广告',
@@ -185,20 +185,27 @@ export default defineAppConfig({
       name: '弹窗广告',
       desc: '浏览详情时弹窗广告,点击右上角x',
       matchLauncher: true,
-      quickFind: true,
-      rules: {
-        activityIds: [
-          'com.douban.frodo.subject.structure.activity.MovieActivity',
-        ],
-        matches: [
-          '[text*="看"][text="查看详情"||text^="去"&&text$="看看"]',
-          'FrameLayout[childCount=5] > FrameLayout[childCount=1] > ImageView',
-        ],
-        snapshotUrls: [
-          'https://i.gkd.li/import/13195565',
-          'https://i.gkd.li/import/13296656', //新增ids对应快照
-        ],
-      },
+      rules: [
+        {
+          key: 0,
+          name: '腾讯广告-1',
+          activityIds:
+            'com.douban.frodo.subject.structure.activity.MovieActivity',
+          matches:
+            'ImageView - FrameLayout[childCount=5] > FrameLayout[childCount=1] > ImageView',
+          snapshotUrls: 'https://i.gkd.li/import/13195565',
+        },
+        {
+          key: 1,
+          name: '腾讯广告-2',
+          matches:
+            'ImageView -n FrameLayout[childCount=2] > FrameLayout > FrameLayout > ImageView',
+          snapshotUrls: [
+            'https://i.gkd.li/import/13296656',
+            'https://i.gkd.li/import/13328126',
+          ],
+        },
+      ],
     },
     {
       key: 11,