From 2a1da7b5b30a57d380d719c974c9c7e81ac5656f Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Sun, 15 Oct 2023 02:13:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=BF=85=E9=9B=B7):=20=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=B9=BF=E5=91=8A-=E8=A7=84=E5=88=99=E4=BC=98=E5=8C=96=20(#104?=
 =?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(迅雷)

* feat 应用内广告弹窗

* feat 视频详情页广告（完善规则）

* feat 搜索页面-顶部banner广告

* feat 会员续费广告（完善规则）

* chore 传输界面-广告弹窗（删除冗余字段）

* feat 应用内广告弹窗（完善规则）

* feat(迅雷): 规则优化

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

* feat 下载页面-广告卡片（完善规则）

* feat 应用内广告弹窗（完善 activityId）

* feat 下载页面-广告卡片（增加 activityId）

* Revert "feat 应用内广告弹窗（增加 activityId）"

This reverts commit d3c7e385c188db4fab80bd4e8cd77ba7e05c972a.

* Revert "Revert "feat 应用内广告弹窗（增加 activityId）""

This reverts commit 9da0ffb37fff3ba518b34ec5acc5fb0794b9663e.

* feat 应用内广告弹窗（优化规则、增加提示说明）

* fix 删除冗余规则

---------

Co-authored-by: 二刺螈 <i@songe.li>
---
 src/apps/com.xunlei.downloadprovider.ts | 35 +++++++++++++++----------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/apps/com.xunlei.downloadprovider.ts b/src/apps/com.xunlei.downloadprovider.ts
index b95eb11c..62eb1181 100644
--- a/src/apps/com.xunlei.downloadprovider.ts
+++ b/src/apps/com.xunlei.downloadprovider.ts
@@ -65,8 +65,10 @@ export default defineAppConfig({
       ],
     },
     {
+      enable: false,
       key: 3,
       name: '应用内广告弹窗',
+      desc: '⚠ 此规则容易误触，因此默认关闭。',
       rules: [
         {
           key: 0,
@@ -87,7 +89,8 @@ export default defineAppConfig({
           activityIds:
             'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
           matches:
-            '@Image[text=""] < View + View +n View > View > TextView[text="广告"]',
+            'Image[text=""] < @View + View +n View > View > TextView[text="广告"]',
+          delay: 1000,
           snapshotUrls: [
             'https://gkd-kit.songe.li/import/12868667',
             'https://gkd-kit.songe.li/import/12881946',
@@ -97,9 +100,15 @@ export default defineAppConfig({
         // 腾讯广告
         {
           key: 20,
-          activityIds: 'com.xunlei.downloadprovider.frame.MainTabActivity',
+          activityIds: [
+            'com.xunlei.downloadprovider.frame.MainTabActivity',
+            'com.xunlei.downloadprovider.launch.LaunchActivity',
+          ],
           matches: 'ImageView - FrameLayout > FrameLayout > ImageView',
-          snapshotUrls: 'https://gkd-kit.songe.li/import/12882132',
+          snapshotUrls: [
+            'https://gkd-kit.songe.li/import/12882132',
+            'https://gkd-kit.songe.li/import/12901374',
+          ],
         },
         {
           key: 21,
@@ -158,9 +167,15 @@ export default defineAppConfig({
         },
         {
           key: 1,
-          activityIds: 'com.xunlei.downloadprovider.frame.MainTabActivity',
+          activityIds: [
+            'com.xunlei.downloadprovider.frame.MainTabActivity',
+            'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
+          ],
           matches: '[id="com.xunlei.downloadprovider:id/btn_ad_feedback"]',
-          snapshotUrls: 'https://gkd-kit.songe.li/import/12892893',
+          snapshotUrls: [
+            'https://gkd-kit.songe.li/import/12892893',
+            'https://gkd-kit.songe.li/import/12901395',
+          ],
         },
         {
           preKeys: [0, 1],
@@ -205,14 +220,6 @@ export default defineAppConfig({
         },
       ],
     },
-    {
-      key: 11,
-      name: '传输界面-广告弹窗',
-      desc: '自动点击 右上角x 关闭',
-      activityIds:
-        'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity',
-      rules: '@View +4 TextView[text="反馈"] + View TextView[text="广告"]',
-      snapshotUrls: 'https://gkd-kit.songe.li/import/12865892',
-    },
+    // key = 11 已被使用，后续不可再使用
   ],
 });