From fb36c5c1d5d65ceff6514d306c16f8ee76ca01d6 Mon Sep 17 00:00:00 2001 From: aisouler Date: Thu, 1 Feb 2024 18:37:28 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit db634f2fb10e641d026cbaac409830d24f7d8b72 Author: aisouler Date: Sat Jan 27 21:51:48 2024 +0800 feat:分段广告误触说明 commit 46dfc92b431bdc04ccdd79ba57aebca2fb43db9d Author: aisouler Date: Thu Jan 25 10:33:25 2024 +0800 feat(网易云音乐):播放页巨幅卡片式广告（补充规则）、VIP支付弹窗（补充规则） commit 13388477e44933ab0f47bbbf989c1def411c856c Author: aisouler Date: Wed Jan 24 18:57:49 2024 +0800 feat(网易云音乐):音乐回忆弹窗、规则分类 commit 20b8cb28f28741a950ac7fea849f615ac1db884e Author: aisouler Date: Mon Jan 22 13:07:20 2024 +0800 feat(网易云音乐):分段广告（补充activityid） commit 85ff3e43dacb20febbf4083d08e3ed20032b625f Author: aisouler Date: Sat Jan 20 13:22:41 2024 +0800 feat:规则分类 commit bb4020d53e8f3c67d733222fbdd54b9455db3f85 Author: aisouler Date: Sat Jan 20 13:21:46 2024 +0800 feat(网易云音乐):优化规则，提高通用性 commit a70c2b638cc7ed34ebe6d1d5925efaaabd7d72fd Author: aisouler Date: Wed Jan 17 19:13:30 2024 +0800 feat(网易云音乐):抢新春好礼弹窗 --- src/apps/com.netease.cloudmusic.ts | 64 ++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/src/apps/com.netease.cloudmusic.ts b/src/apps/com.netease.cloudmusic.ts index 5b1afb27..8504adfc 100644 --- a/src/apps/com.netease.cloudmusic.ts +++ b/src/apps/com.netease.cloudmusic.ts @@ -7,8 +7,8 @@ export default defineAppConfig({ { enable: false, key: 1, - name: '分段广告', - desc: '有二次确认弹窗', + name: '分段广告-有二次确认弹窗', + desc: '⚠️该规则有概率误触', quickFind: true, // matchDelay: 3000, 我又想不起来为什么要有这个了 rules: [ @@ -32,6 +32,7 @@ export default defineAppConfig({ 'https://i.gkd.li/import/12829964', 'https://i.gkd.li/import/12829953', 'https://i.gkd.li/import/13859634', //vid="adTagClose" + 'https://i.gkd.li/import/14070500', // 误触快照，节点被遮罩时触发点击 ], }, { @@ -59,6 +60,7 @@ export default defineAppConfig({ 'com.netease.cloudmusic.module.ad.feedback.AdFeedbackBottomSheet', 'com.netease.cloudmusic.music.biz.search.activity.SearchActivity', 'com.netease.cloudmusic.activity.MainActivity', + 'com.netease.cloudmusic.music.biz.comment.activity.CommentActivity', ], matches: '[text="直接关闭"]', snapshotUrls: [ @@ -80,7 +82,7 @@ export default defineAppConfig({ }, { key: 2, - name: '我的页面-中间滚动广告', + name: '局部广告-我的页面-中间滚动广告', quickFind: true, activityIds: ['com.netease.cloudmusic.activity.MainActivity'], rules: @@ -97,7 +99,7 @@ export default defineAppConfig({ }, { key: 4, - name: '弹窗广告', + name: '全屏广告-弹窗广告', activityIds: 'com.netease.cloudmusic.activity.MainActivity', rules: [ { @@ -118,12 +120,19 @@ export default defineAppConfig({ '[id="com.netease.cloudmusic:id/dsl_dialog_root"] >n ViewGroup[childCount=2] > ImageView + ImageView[clickable=true]', snapshotUrls: 'https://i.gkd.li/import/13684724', }, + { + key: 3, + name: '抢新春好礼弹窗', + matches: + '[id="com.netease.cloudmusic:id/dsl_dialog_root"] ImageView[visibleToUser=true][index=2]', + snapshotUrls: 'https://i.gkd.li/import/13962214', + }, ], }, { enable: false, key: 5, - name: 'VIP 弹窗', + name: '全屏广告-VIP弹窗', quickFind: true, matchTime: 10000, actionMaximum: 1, @@ -134,10 +143,11 @@ export default defineAppConfig({ activityIds: 'com.netease.cloudmusic.music.biz.rn.activity.MainProcessLayerReactNativeActivity', matches: - 'ImageView < @ViewGroup[clickable=true] <2 ViewGroup < ViewGroup + ScrollView [text="会员套餐"]', + 'ImageView < ImageView', snapshotUrls: 'https://i.gkd.li/import/13391498', }, + { + key: 5, + name: '搭配高清臻音-VIP支付弹窗', + activityIds: + 'com.netease.cloudmusic.music.biz.rn.activity.MainProcessLayerReactNativeActivity', + matches: + '@ImageView[index=4] +5 ViewGroup[childCount=4] [text*="确认协议并支付"]', + snapshotUrls: 'https://i.gkd.li/import/14045917', + }, ], }, { key: 6, - name: '更新弹窗', + name: '更新提示', quickFind: true, rules: [ @@ -197,7 +216,7 @@ export default defineAppConfig({ { enable: false, key: 7, - name: '播放界面广告', + name: '局部广告-播放界面广告', desc: '右上角VIP小悬浮、巨幅卡片式广告', quickFind: true, activityIds: 'com.netease.cloudmusic.activity.PlayerActivity', @@ -215,15 +234,22 @@ export default defineAppConfig({ }, { key: 1, - name: '巨幅卡片式广告', + name: '巨幅卡片式广告1', matches: '[text^="跳过广告"][text.length<=10]', snapshotUrls: 'https://i.gkd.li/import/13527105', }, + { + key: 2, + name: '巨幅卡片式广告2', + matches: + '@TextView[index=2] <3 ViewGroup[childCount=3] <