From db71c1ad2a3a9e435d272bbb2d4308b861898fad Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Fri, 24 Nov 2023 00:15:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=B9=90=E6=A0=A1=E9=80=9A):=20=E5=BC=80?=
 =?UTF-8?q?=E5=B1=8F=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=E3=80=81=E5=8D=A1=E7=89=87=E5=BC=8F=E5=B9=BF?=
 =?UTF-8?q?=E5=91=8A=EF=BC=88=E8=A1=A5=E5=85=85=E8=A7=84=E5=88=99=EF=BC=89?=
 =?UTF-8?q?=20(#2468)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

* feat 卡片式广告（补充规则）
---
 src/apps/client.android.yixiaotong.ts | 36 ++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/apps/client.android.yixiaotong.ts b/src/apps/client.android.yixiaotong.ts
index 2ca9e372..c286ac5a 100644
--- a/src/apps/client.android.yixiaotong.ts
+++ b/src/apps/client.android.yixiaotong.ts
@@ -7,10 +7,11 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      activityIds: 'client.android.yixiaotong.ui.WelcomeActivity',
-      matchLauncher: true,
-      rules:
-        '[id="client.android.yixiaotong:id/rel_advlogo"] - * >n [text^="跳过"]',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: '[text^="跳过"][text.length<=10]',
       snapshotUrls: 'https://i.gkd.li/import/13055542',
     },
     {
@@ -40,11 +41,28 @@ export default defineAppConfig({
     },
     {
       key: 2,
-      name: '应用内广告卡片',
-      activityIds:
-        'client.android.yixiaotong.v3.ui.appcontrol.bath.BathDetailActivity',
-      rules: 'ImageView - FrameLayout - FrameLayout > ImageView',
-      snapshotUrls: 'https://i.gkd.li/import/13055542',
+      name: '卡片式广告',
+
+      rules: [
+        {
+          key: 0,
+          name: '腾讯广告',
+          activityIds:
+            'client.android.yixiaotong.v3.ui.appcontrol.bath.BathDetailActivity',
+          matches:
+            'ImageView - FrameLayout - FrameLayout[childCount=1] > ImageView[childCount=0]',
+          snapshotUrls: 'https://i.gkd.li/import/13451010',
+        },
+        {
+          key: 1,
+          name: '快手广告',
+          activityIds:
+            'client.android.yixiaotong.v3.ui.appcontrol.bath.BathDetailActivity',
+          matches:
+            '[id="client.android.yixiaotong:id/ksad_container"] >n @TextView + View > [text="广告"]',
+          snapshotUrls: 'https://i.gkd.li/import/13450887',
+        },
+      ],
     },
     {
       key: 3,