diff --git a/src/apps/com.xunlei.downloadprovider.ts b/src/apps/com.xunlei.downloadprovider.ts index f930dd4e..ffaf1ea2 100644 --- a/src/apps/com.xunlei.downloadprovider.ts +++ b/src/apps/com.xunlei.downloadprovider.ts @@ -42,131 +42,42 @@ export default defineGkdApp({ }, { key: 1, - name: '分段广告-视频详情页广告', + name: '分段广告', rules: [ { key: 0, - name: '点击关闭-1', - activityIds: - 'com.xunlei.downloadprovider.download.taskdetails.newui.DownloadDetailsActivity', fastQuery: true, + activityIds: '.download.taskdetails.newui.DownloadDetailsActivity', matches: - '[id="com.xunlei.downloadprovider:id/hermes_ad_banner_negative"]', - snapshotUrls: 'https://i.gkd.li/i/12707701', - }, - { - key: 2, - name: '点击关闭-2', - activityIds: 'com.xunlei.downloadprovider.feedback.view', - fastQuery: true, - matches: '[id="com.xunlei.downloadprovider:id/ad_ima_skip"]', - snapshotUrls: 'https://i.gkd.li/i/12882988', - }, - { - key: 3, - name: '点击关闭-3', - activityIds: - 'com.xunlei.downloadprovider.download.taskdetails.newui.DownloadDetailsActivity', - fastQuery: true, - matches: - '[id="com.xunlei.downloadprovider:id/play_detail_ad_title"] + [id="com.xunlei.downloadprovider:id/close_iv"]', - snapshotUrls: 'https://i.gkd.li/i/13228423', - }, - { - preKeys: [0, 2, 3], - key: 1, - name: '点击不感兴趣', - fastQuery: true, - activityIds: [ - 'com.xunlei.downloadprovider.frame.MainTabActivity', - 'com.xunlei.downloadprovider.download.taskdetails.newui.DownloadDetailsActivity', - 'com.xunlei.downloadprovider.feedback.view', - ], - matches: - '[id="com.xunlei.downloadprovider:id/feedback_not_interested_layout"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13625418', - 'https://i.gkd.li/i/12707717', - 'https://i.gkd.li/i/12707702', - ], - }, - ], - }, - { - key: 2, - name: '分段广告-视频详情页直播推荐', - desc: '自动点击"减少推荐"', - fastQuery: true, - rules: [ - { - key: 0, - activityIds: - 'com.xunlei.downloadprovider.download.taskdetails.newui.DownloadDetailsActivity', - matches: - '[id="com.xunlei.downloadprovider:id/title_tv"] + [id="com.xunlei.downloadprovider:id/more"]', - snapshotUrls: 'https://i.gkd.li/i/12707701', + '[vid="hermes_ad_banner_negative" || vid="close_iv"][visibleToUser=true]', + exampleUrls: 'https://e.gkd.li/95d56e24-3223-4112-9222-de6d489aa79b', + snapshotUrls: 'https://i.gkd.li/i/23762793', }, { preKeys: [0], - key: 1, - activityIds: [ - 'com.xunlei.downloadprovider.download.center.newcenter', - 'com.xunlei.downloadprovider.download.taskdetails.newui.DownloadDetailsActivity', - ], - matches: '[id="com.xunlei.downloadprovider:id/close_ad"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12707710', - 'https://i.gkd.li/i/14005330', - ], + fastQuery: true, + activityIds: '.download.taskdetails.newui.DownloadDetailsActivity', + matches: '[text="不感兴趣"][visibleToUser=true]', + exampleUrls: 'https://e.gkd.li/490bd679-86a5-432e-b0de-427da5513484', + snapshotUrls: 'https://i.gkd.li/i/23762972', }, ], }, { key: 3, - name: '全屏广告-弹窗广告', + name: '全屏广告', desc: '点击关闭', rules: [ { key: 0, fastQuery: true, - activityIds: [ - 'com.xunlei.downloadprovider.frame.MainTabActivity', - 'com.xunlei.downloadprovider.launch.LaunchActivity', - ], - matches: ['@[text="关闭"]', '[text*="广告"]'], - snapshotUrls: [ - 'https://i.gkd.li/i/12892871', - 'https://i.gkd.li/i/13799878', - ], - }, - { - key: 2, - activityIds: 'com.xunlei.downloadprovider.frame.MainTabActivity', - matches: - 'ImageView < @ViewGroup[visibleToUser=true] < ViewGroup +n ViewGroup > [text="广告"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12879452', - 'https://i.gkd.li/i/12882199', // n = 1 - 'https://i.gkd.li/i/12881911', // n = 2 - 'https://i.gkd.li/i/12892912', // 点击目标为具备 clickable=true 的 ViewGroup，防止在这个快照中点击到下落的礼物 - 'https://i.gkd.li/i/12881976', // 限定 visibleToUser=true，防止在这个快照中误触 - ], - }, - { - key: 3, - fastQuery: true, - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', activityIds: 'com.xunlei.downloadprovider.frame.MainTabActivity', matches: '[vid="close_btn"][visibleToUser=true]', exampleUrls: 'https://e.gkd.li/71c2dc44-a976-4910-8e44-26e39865406e', snapshotUrls: 'https://i.gkd.li/i/16388890', }, - - // 字节广告 { - key: 10, + key: 1, activityIds: 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', matches: @@ -177,10 +88,8 @@ export default defineGkdApp({ 'https://i.gkd.li/i/13295179', ], }, - - // 腾讯广告 { - key: 20, + key: 2, fastQuery: true, activityIds: [ 'com.xunlei.downloadprovider.frame.MainTabActivity', @@ -195,64 +104,31 @@ export default defineGkdApp({ ], }, { - key: 23, + key: 3, fastQuery: true, activityIds: - 'com.xunlei.downloadprovider.download.taskdetails.newui.DownloadDetailsActivity', + 'com.xunlei.web.XLWebViewActivity$XLWebViewActivityImpl2', matches: - '[id="com.xunlei.downloadprovider:id/hermes_ad_banner_negative"]', - snapshotUrls: 'https://i.gkd.li/i/13597068', + '[text="支付优惠卡"] >3 View[childCount=2] >2 View[childCount=9] > @View[clickable=true][visibleToUser=true][childCount=0][index=0][desc!=null] <3 [text="广告"]', - snapshotUrls: 'https://i.gkd.li/i/13761275', - }, - ], - }, - { - key: 4, - name: '分段广告-"下载页"卡片广告', - desc: '需选二次弹窗关闭原因', - fastQuery: true, - rules: [ - { - key: 0, - name: '点击更多"···"', - activityIds: 'com.xunlei.downloadprovider.frame.MainTabActivity', - matches: '[id="com.xunlei.downloadprovider:id/ad_more"]', - snapshotUrls: 'https://i.gkd.li/i/12881865', - }, - { - key: 1, - name: '点击"x"', - activityIds: [ - 'com.xunlei.downloadprovider.frame.MainTabActivity', - 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', - ], - matches: '[id="com.xunlei.downloadprovider:id/btn_ad_feedback"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12892893', - 'https://i.gkd.li/i/12901395', - ], - }, - { - preKeys: [0, 1], - name: '关闭原因选"减少推荐"', - key: 2, - activityIds: [ - 'com.xunlei.downloadprovider.download.center.newcenter', - 'com.xunlei.downloadprovider.frame.MainTabActivity', - ], - matches: '[id="com.xunlei.downloadprovider:id/close_ad"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12881877', - 'https://i.gkd.li/i/13198070', - 'https://i.gkd.li/i/13484249', - ], + '@ImageView[childCount=0] < ViewGroup[childCount=1] < ViewGroup[childCount=1] < ViewGroup[childCount=1] < ViewGroup[childCount=1] + ViewGroup >4 [text="反馈"][visibleToUser=true]', + snapshotUrls: 'https://i.gkd.li/i/23762955', }, ], }, @@ -271,59 +147,6 @@ export default defineGkdApp({ }, ], }, - { - key: 10, - name: '全屏广告-会员广告', - fastQuery: true, - rules: [ - { - key: 0, - name: '"我的"', - activityIds: [ - 'com.xunlei.downloadprovider.homepage.member', - 'com.xunlei.downloadprovider.frame.MainTabActivity', - ], - matches: - '@[id="com.xunlei.downloadprovider:id/close_btn"] - LinearLayout [text="您的会员已过期"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12707698', - 'https://i.gkd.li/i/13448909', - ], - }, - { - key: 1, - name: '"下载页"1', - activityIds: 'com.xunlei.downloadprovider.frame.MainTabActivity', - matches: - '[id="com.xunlei.downloadprovider:id/all_picture_image"] + [id="com.xunlei.downloadprovider:id/close_btn"]', - snapshotUrls: 'https://i.gkd.li/i/12882928', - }, - { - key: 3, - name: '"首页"', - activityIds: 'com.xunlei.downloadprovider.frame.MainTabActivity', - matches: - '[text="您的会员已过期"] < LinearLayout +n [id="com.xunlei.downloadprovider:id/touch_bottom_bar_bubble_close_iv"]', - snapshotUrls: 'https://i.gkd.li/i/13259268', - }, - { - key: 4, - activityIds: - 'com.xunlei.web.XLWebViewActivity$XLWebViewActivityImpl2', - matches: - '[text="支付优惠卡"] >3 View[childCount=2] >2 View[childCount=9] > @View[clickable=true][visibleToUser=true][childCount=0][index=0][desc!=null] <