diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts index 3e4c364f..ddd44796 100644 --- a/src/appDeprecatedKeys.ts +++ b/src/appDeprecatedKeys.ts @@ -592,6 +592,11 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ name: '应用包管理组件', deprecatedKeys: [8, 9, 10, 11, 12], }, + { + id: 'com.miui.player', + name: '小米音乐', + deprecatedKeys: [4, 10], + }, ]; const map: Map = new Map(); diff --git a/src/apps/com.miui.player.ts b/src/apps/com.miui.player.ts index 6c4e2039..4d477273 100644 --- a/src/apps/com.miui.player.ts +++ b/src/apps/com.miui.player.ts @@ -6,14 +6,27 @@ export default defineGkdApp({ groups: [ { key: 1, - name: '局部广告-浮窗广告', - desc: '关闭右侧飘窗广告', - fastQuery: true, - activityIds: - 'com.tencent.qqmusiclite.activity.player.MusicPlayerActivity', - rules: - '[id="com.miui.player:id/free_mode_tips_layout"] + [id="com.miui.player:id/iv_close"]', - snapshotUrls: 'https://i.gkd.li/i/13303283', + name: '局部广告-悬浮广告', + desc: '点击关闭', + rules: [ + { + key: 0, + fastQuery: true, + activityIds: + 'com.tencent.qqmusiclite.activity.player.MusicPlayerActivity', + matches: + '[id="com.miui.player:id/free_mode_tips_layout"] + [id="com.miui.player:id/iv_close"]', + snapshotUrls: 'https://i.gkd.li/i/13303283', + }, + { + key: 1, + fastQuery: true, + activityIds: 'com.tencent.qqmusiclite.activity.MainActivity', + matches: + '[id="com.miui.player:id/cl_floating_promote"] > [id="com.miui.player:id/iv_close"]', + snapshotUrls: 'https://i.gkd.li/i/13562649', + }, + ], }, { key: 2, @@ -44,19 +57,25 @@ export default defineGkdApp({ }, { key: 3, - name: '全屏广告-看广告免费听弹窗', - activityIds: 'com.tencent.qqmusiccommon.hybrid.HybridViewActivity', - rules: 'ViewGroup > @ViewGroup + ViewGroup[childCount=5]', - snapshotUrls: ['https://i.gkd.li/i/13304343'], - }, - { - key: 4, - name: '局部广告-首页右侧悬浮卡片', - activityIds: 'com.tencent.qqmusiclite.activity.MainActivity', - fastQuery: true, - rules: - '[id="com.miui.player:id/cl_floating_promote"] > [id="com.miui.player:id/iv_close"]', - snapshotUrls: ['https://i.gkd.li/i/13562649'], + name: '全屏广告-弹窗广告', + desc: '点击关闭', + rules: [ + { + key: 0, + fastQuery: true, + activityIds: 'com.tencent.qqmusiccommon.hybrid.HybridViewActivity', + matches: + '@ViewGroup[clickable=true][childCount=0][visibleToUser=true] < ViewGroup[childCount=1] < ViewGroup[childCount=2] < FrameLayout < FrameLayout < [vid="webview_container"]', + exampleUrls: 'https://e.gkd.li/5e6fd5f8-6ad3-4a46-ab34-c9b6b2d7a112', + snapshotUrls: 'https://i.gkd.li/i/17783777', + }, + { + key: 1, + activityIds: 'com.tencent.qqmusiccommon.hybrid.HybridViewActivity', + matches: '[id=null][desc="关闭弹框按钮"][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/12700955', + }, + ], }, { key: 5, @@ -67,21 +86,6 @@ export default defineGkdApp({ rules: '[id="com.miui.player:id/iv_close_dialog_button"]', snapshotUrls: ['https://i.gkd.li/i/13623503'], }, - { - key: 10, - name: '全屏广告-会员过期续费弹窗', - activityIds: 'com.tencent.qqmusiccommon.hybrid.HybridViewActivity', - rules: '[id=null][desc="关闭弹框按钮"][clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/12700955', - }, - { - key: 11, - name: '局部广告-"我的"页面顶部卡片广告', - activityIds: 'com.tencent.qqmusiclite.activity.MainActivity', - rules: - '[id="com.miui.player:id/banner_image"] + [id="com.miui.player:id/close_banner"]', - snapshotUrls: 'https://i.gkd.li/i/12700984', - }, { key: 12, name: '功能类-看广告视频领VIP',