From 67b4bcdcf8e7f1d2744c893ac880887c85a30cfe Mon Sep 17 00:00:00 2001
From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com>
Date: Sun, 24 Dec 2023 20:26:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(OMOFUN):=20=E5=BC=B9=E7=AA=97=E5=B9=BF?=
 =?UTF-8?q?=E5=91=8A=EF=BC=88=E4=BC=98=E5=8C=96=E8=A7=84=E5=88=99=EF=BC=89?=
 =?UTF-8?q?=E3=80=81=E5=BC=80=E5=B1=8F=E5=B9=BF=E5=91=8A=EF=BC=88=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=A7=84=E5=88=99=EF=BC=89=20(#3293)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

* feat 开屏广告（优化规则）
---
 src/apps/com.cyl.musiccy.ou.ts | 41 ++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/apps/com.cyl.musiccy.ou.ts b/src/apps/com.cyl.musiccy.ou.ts
index 43a790b9..938536f3 100644
--- a/src/apps/com.cyl.musiccy.ou.ts
+++ b/src/apps/com.cyl.musiccy.ou.ts
@@ -7,12 +7,13 @@ export default defineAppConfig({
     {
       key: 0,
       name: '开屏广告',
-      quickFind: true,
       matchTime: 10000,
       actionMaximum: 1,
       resetMatch: 'app',
       rules: [
         {
+          key: 0,
+          quickFind: true,
           matches: '[text*="跳过"][text.length<=10]',
           snapshotUrls: [
             'https://i.gkd.li/import/12775918',
@@ -23,6 +24,7 @@ export default defineAppConfig({
           ],
         },
         {
+          key: 1,
           matches:
             '[id="com.cyl.musiccy.ou:id/ksad_splash_root_container"] [childCount=3] > @ImageView[clickable=true] - [text="|"]',
           snapshotUrls: ['https://i.gkd.li/import/12775919'],
@@ -45,19 +47,18 @@ export default defineAppConfig({
     },
     {
       key: 2,
-      name: '插屏广告',
-      matchLauncher: true,
+      name: '弹窗广告',
       actionDelay: 300,
-      activityIds: [
-        'com.cyl.musiccy.ou.MainActivity',
-        'com.sigmob.sdk.base.common.TransparentAdActivity',
-        'com.miui.wakepath.ui.ConfirmStartActivity',
-      ],
       rules: [
         {
           key: 0,
-          quickFind: true,
-          matches: '[id="com.cyl.musiccy.ou:id/ksad_container"] [text="跳过"]',
+          activityIds: [
+            'com.cyl.musiccy.ou.MainActivity',
+            'com.ksf.yyx.MainActivity',
+          ],
+          name: '快手广告-1',
+          matches:
+            '[id$="ksad_container"] >n @ViewGroup[clickable=true] > [text="跳过"]',
           snapshotUrls: [
             'https://i.gkd.li/import/12775922',
             'https://i.gkd.li/import/13063222',
@@ -65,21 +66,33 @@ export default defineAppConfig({
         },
         {
           key: 1,
+          name: '快手广告-2',
+          activityIds: 'com.ksf.yyx.MainActivity',
           matches:
-            '[id="com.cyl.musiccy.ou:id/ksad_container"] [text="广告"] <2 ViewGroup -2 ViewGroup > @ViewGroup[clickable=true][childCount=1] ImageView',
+            '[text="广告"] <2 ViewGroup -2 ViewGroup > @ViewGroup[clickable=true] > ImageView',
           snapshotUrls: 'https://i.gkd.li/import/12775923',
         },
         {
           key: 2,
-          quickFind: true,
+          name: 'Sigmob广告',
+          activityIds: [
+            'com.cyl.musiccy.ou.MainActivity',
+            'com.sigmob.sdk.base.common.TransparentAdActivity',
+          ],
           matches: '[id="ad_area"] [id="close_btn"][clickable=true]',
           snapshotUrls: [
+            'https://i.gkd.li/import/13759345',
             'https://i.gkd.li/import/12775925',
             'https://i.gkd.li/import/12775924',
           ],
         },
         {
           key: 3,
+          name: '腾讯广告-1',
+          activityIds: [
+            'com.ksf.yyx.MainActivity',
+            'com.android.internal.app.ResolverActivity',
+          ],
           matches:
             'ImageView <n FrameLayout > FrameLayout[index=1] > FrameLayout[index=2] > ImageView',
           snapshotUrls: [
@@ -92,12 +105,16 @@ export default defineAppConfig({
         },
         {
           key: 4,
+          name: '腾讯广告-2',
+          activityIds: 'com.cyl.musiccy.ou.MainActivity',
           matches:
             'ImageView <n FrameLayout - FrameLayout > FrameLayout[index=1] > ImageView',
           snapshotUrls: 'https://i.gkd.li/import/13063249',
         },
         {
           key: 5,
+          name: '腾讯广告-3',
+          activityIds: 'com.cyl.musiccy.ou.MainActivity',
           matches:
             'ImageView <n FrameLayout > FrameLayout[index=0] > FrameLayout FrameLayout > ImageView',
           snapshotUrls: 'https://i.gkd.li/import/13422363',