From 0e2a0a65b5c431e2c327e2bbbd6b0d9052bca613 Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Sun, 19 Nov 2023 00:02:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=A4=A7=E5=B8=88=E5=85=84=E5=BD=B1?=
 =?UTF-8?q?=E8=A7=86):=20=E5=BC=80=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=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=B9=BF=E5=91=8A=EF=BC=88=E4=BC=98=E5=8C=96=E3=80=81?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=20activityId=EF=BC=89=20(#2250)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

* feat 弹窗广告（优化、补充 activityId）
---
 src/apps/com.zhiyin.qingdan.dashixiong.ts | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/apps/com.zhiyin.qingdan.dashixiong.ts b/src/apps/com.zhiyin.qingdan.dashixiong.ts
index 54e18845..f1b6181e 100644
--- a/src/apps/com.zhiyin.qingdan.dashixiong.ts
+++ b/src/apps/com.zhiyin.qingdan.dashixiong.ts
@@ -7,30 +7,24 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      activityIds: 'com.zhiyin.qingdan.dashixiong.MainActivity',
-      matchLauncher: true,
       quickFind: true,
-      rules: [
-        {
-          key: 0,
-          matches: 'ImageView -n LinearLayout > [text^="跳过"]',
-          snapshotUrls: 'https://i.gkd.li/import/12843284',
-        },
-        {
-          key: 1,
-          matches:
-            '[id="com.zhiyin.qingdan.dashixiong:id/ksad_splash_circle_skip_view"] > [text="跳过"]',
-          snapshotUrls: 'https://i.gkd.li/import/12843283',
-        },
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
+      rules: '[text^="跳过"][text.length<=10]',
+      snapshotUrls: [
+        'https://i.gkd.li/import/12843284',
+        'https://i.gkd.li/import/12843283',
       ],
     },
     {
       key: 1,
-      name: '应用内广告弹窗',
+      name: '弹窗广告',
       activityIds: 'com.zhiyin.qingdan.dashixiong.MainActivity',
       rules: [
         {
           key: 0,
+          name: '快手广告',
           quickFind: true,
           matches:
             '@ImageView <n ViewGroup -2 ViewGroup > ViewGroup > [text="广告"]',
@@ -38,20 +32,26 @@ export default defineAppConfig({
         },
         {
           key: 1,
+          name: '腾讯广告-1',
           matches:
-            'ImageView - LinearLayout - FrameLayout > FrameLayout > ImageView',
+            'ImageView - LinearLayout - FrameLayout > FrameLayout[childCount=1] > ImageView[childCount=0]',
           snapshotUrls: 'https://i.gkd.li/import/12843282',
         },
         {
           key: 2,
-          matches: 'ImageView - FrameLayout > FrameLayout > ImageView',
+          name: '腾讯广告-2',
+          activityIds: 'com.qq.e.ads.ADActivity',
+          matches:
+            'ImageView - FrameLayout > FrameLayout[childCount=1] > ImageView[childCount=0]',
           snapshotUrls: [
             'https://i.gkd.li/import/12843345',
             'https://i.gkd.li/import/12843333',
+            'https://i.gkd.li/import/13400656', // com.qq.e.ads.ADActivity
           ],
         },
         {
           key: 3,
+          name: '字节广告',
           quickFind: true,
           matches: '@Image < View +n View > View > View > [text="广告"]',
           snapshotUrls: 'https://i.gkd.li/import/12843323',