From 5a183cfde90de50e4a0c5dd5313cc3eb56e31d7d Mon Sep 17 00:00:00 2001
From: jiuqianyuan <39406781+jiuqianyuan@users.noreply.github.com>
Date: Sat, 4 Nov 2023 00:35:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=BD=91=E6=98=93=E4=BA=91=E9=9F=B3?=
 =?UTF-8?q?=E4=B9=90):=20=E5=B9=BF=E5=91=8A=E5=8D=A1=E7=89=87=E3=80=81VIP?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=20(#1768)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(网易云音乐): 广告卡片-规则优化

* feat(网易云音乐):VIP弹窗

* chore(actions): check_format_lint

* Update com.netease.cloudmusic.ts

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

close #1756
close #1735
close #1736
---
 src/apps/com.netease.cloudmusic.ts | 32 ++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/apps/com.netease.cloudmusic.ts b/src/apps/com.netease.cloudmusic.ts
index 498d9433..d7b6647d 100644
--- a/src/apps/com.netease.cloudmusic.ts
+++ b/src/apps/com.netease.cloudmusic.ts
@@ -15,8 +15,12 @@ export default defineAppConfig({
       snapshotUrls: ['https://gkd-kit.gitee.io/import/12700920'],
     },
     {
+      enable: false,
       key: 1,
       name: '广告卡片',
+      desc: '点击【x】-【直接关闭】',
+      quickFind: true,
+      matchDelay: 3000,
       rules: [
         {
           key: 0,
@@ -26,7 +30,7 @@ export default defineAppConfig({
             'com.netease.cloudmusic.music.biz.comment.activity.ReplyCommentActivity2',
             'com.netease.cloudmusic.music.biz.search.activity.SearchActivity',
           ],
-          matches: '[id="com.netease.cloudmusic:id/adTagClose"]',
+          matches: '[id="com.netease.cloudmusic:id/adTagView"]',
           snapshotUrls: [
             'https://i.gkd.li/import/12829944',
             'https://gkd-kit.gitee.io/import/12723229',
@@ -36,7 +40,7 @@ export default defineAppConfig({
           ],
         },
         {
-          preKeys: 1,
+          preKeys: 0,
           matches: '[text="直接关闭"]',
           snapshotUrls: ['https://i.gkd.li/import/12829967'],
         },
@@ -45,6 +49,7 @@ export default defineAppConfig({
     {
       key: 2,
       name: '我的页面-中间滚动广告',
+      quickFind: true,
       activityIds: ['com.netease.cloudmusic.activity.MainActivity'],
       rules:
         '[id="com.netease.cloudmusic:id/auto_scroll_switcher"] + [id="com.netease.cloudmusic:id/close_btn"]',
@@ -53,6 +58,7 @@ export default defineAppConfig({
     {
       key: 3,
       name: '主页-免费听歌',
+      quickFind: true,
       activityIds: ['com.netease.cloudmusic.activity.MainActivity'],
       rules: ['@ImageView + ViewGroup > TextView[text="VIP歌曲免费听30分钟"]'],
       snapshotUrls: ['https://i.gkd.li/import/12843383'],
@@ -80,13 +86,16 @@ export default defineAppConfig({
       enable: false,
       key: 5,
       name: 'VIP 弹窗',
+      quickFind: true,
+      matchTime: 10000,
+      actionMaximum: 1,
+      resetMatch: 'app',
       rules: [
         {
           key: 0,
           activityIds:
             'com.netease.cloudmusic.music.biz.rn.activity.MainProcessLayerReactNativeActivity',
-          matches:
-            '[text*="开通VIP"] + @ViewGroup[childCount=1][clickable=true] > ImageView',
+          matches: 'ImageView < @ViewGroup[clickable=true] - [text*="开通VIP"]',
           snapshotUrls: 'https://gkd-kit.gitee.io/import/13189055',
         },
         {
@@ -95,6 +104,21 @@ export default defineAppConfig({
           matches: '@ImageView - ViewGroup > [text="解锁千万级会员曲库"]',
           snapshotUrls: 'https://i.gkd.li/import/13228955',
         },
+        {
+          key: 2,
+          activityIds: 'com.netease.cloudmusic.activity.PlayerActivity',
+          matches: '@ImageView -2 ViewGroup [text="解锁更高音质"]',
+          snapshotUrls: 'https://i.gkd.li/import/13230603',
+        },
+        {
+          key: 3,
+          name: 'VIP续费',
+          activityIds:
+            'com.netease.cloudmusic.music.biz.rn.activity.MainProcessLayerReactNativeActivity',
+          matches:
+            'ImageView < @ViewGroup -3 ViewGroup [text="您的黑胶VIP已过期"]',
+          snapshotUrls: 'https://i.gkd.li/import/13230605',
+        },
       ],
     },
     {