diff --git a/src/apps/com.baidu.tieba.ts b/src/apps/com.baidu.tieba.ts index c98e01a89..4183f27d6 100644 --- a/src/apps/com.baidu.tieba.ts +++ b/src/apps/com.baidu.tieba.ts @@ -43,6 +43,7 @@ export default defineGkdApp({ desc: '关闭首页、帖子内的广告和直播推广', enable: false, fastQuery: true, + forcedTime: 10000, activityIds: [ '.tblauncher.MainTabActivity', '.pb.pb.main.PbActivity', @@ -91,25 +92,71 @@ export default defineGkdApp({ matches: 'ImageView[index=parent.childCount.minus(1)] < @[vid="obfuscated"][clickable=true] -n * < RelativeLayout + FrameLayout >n [text="广告"]', snapshotUrls: [ + 'https://i.gkd.li/i/16595301', + 'https://i.gkd.li/i/16596195', + 'https://i.gkd.li/i/16596775', 'https://i.gkd.li/i/21524232', 'https://i.gkd.li/i/21529443', 'https://i.gkd.li/i/21556758', 'https://i.gkd.li/i/24520138', 'https://i.gkd.li/i/25710401', + 'https://i.gkd.li/i/29640762', // ❗无快查,但是一截完快照它就触发了 (等第2次遇到再修) ], }, { key: 5, activityIds: '.pb.pb.main.PbActivity', matches: - 'ImageView[childCount=0] < @FrameLayout[clickable=true][childCount=1][visibleToUser=true] <2 RelativeLayout + RelativeLayout >3 [text="广告"]', - snapshotUrls: 'https://i.gkd.li/i/24541094', + '@[clickable=true][visibleToUser=true] <(1,2) RelativeLayout <(1,4) RelativeLayout[childCount>1] >(3,4) [text="广告"]', + snapshotUrls: [ + 'https://i.gkd.li/i/16595124', + 'https://i.gkd.li/i/16596297', + 'https://i.gkd.li/i/24541094', + ], + excludeSnapshotUrls: 'https://i.gkd.li/i/16632851', // [childCount>1] 防止误触 + }, + { + key: 6, + activityIds: '.tblauncher.MainTabActivity', + matches: + '@ImageView[childCount=0][clickable=true][visibleToUser=true] < LinearLayout[childCount=1] <4 RelativeLayout +3 LinearLayout >4 [text="小游戏"]', + snapshotUrls: [ + 'https://i.gkd.li/i/17943902', + 'https://i.gkd.li/i/18217417', + ], + }, + { + key: 7, + activityIds: '.tblauncher.MainTabActivity', + matches: + 'ImageView < @[clickable=true] <2 FrameLayout[childCount=2] -n ViewGroup > [text="广告"]', + snapshotUrls: [ + 'https://i.gkd.li/i/28345921', + 'https://i.gkd.li/i/28432320', + ], + }, + { + key: 8, + activityIds: '.pb.pb.main.PbActivity', + matches: + 'ImageView < @[clickable=true][width<82 && height<82] <5 [childCount=5] + [childCount=1] >4 [text="权限" || text="隐私" || text="功能"] -(1,2,3) [text$="有限公司"]', + snapshotUrls: [ + 'https://i.gkd.li/i/28389197', + 'https://i.gkd.li/i/29578950', + ], + }, + { + key: 9, + activityIds: '.tblauncher.MainTabActivity', + matches: + '@ImageView[clickable=true][width<78] <2 [childCount=2] >4 [text="语音中"]', + snapshotUrls: 'https://i.gkd.li/i/28432229', }, // 第二段 { key: 50, - preKeys: [0, 1, 2, 3, 4, 5], + preKeys: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], name: '②点击[不感兴趣]', // 直接结束, 无需第三段 matches: '@View[clickable=true][visibleToUser=true] - [text^="选择不喜欢"]', @@ -121,20 +168,24 @@ export default defineGkdApp({ }, { key: 51, - preKeys: [0, 1, 2, 3, 4, 5], + preKeys: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], name: '②选一个[理由]', matches: - '[text="已经看过" || text="广告重复" || text="不感兴趣"][clickable=true]', + '[text="已经看过" || text="内容质量差" || text="不感兴趣" || text="广告重复"][clickable=true]', snapshotUrls: [ - 'https://i.gkd.li/i/26634661', // [已经看过] + 'https://i.gkd.li/i/26634661', // 已经看过、内容质量差 + 'https://i.gkd.li/i/28432358', // 已经看过、内容质量差、不感兴趣 ], }, { key: 52, - preKeys: [0, 1, 2, 3, 4, 5], + preKeys: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], name: '②选[不喜欢]该直播', matches: '@[clickable=true] >3 [text="不喜欢"]', - snapshotUrls: 'https://i.gkd.li/i/27052244', // [不喜欢] 直播 + snapshotUrls: [ + 'https://i.gkd.li/i/27052244', // [不喜欢] 直播 + 'https://i.gkd.li/i/28432247', + ], }, // 第三段 @@ -152,7 +203,6 @@ export default defineGkdApp({ name: '局部广告-首页、推荐列表顶部卡片式广告', desc: '关闭首页顶部的卡片广告和小游戏推广', matchTime: 10000, - forcedTime: 10000, actionMaximum: 1, activityIds: ['.tblauncher.MainTabActivity', '.frs.FrsActivity'], rules: [ @@ -195,11 +245,12 @@ export default defineGkdApp({ 'com.baidu.tbadk.browser.TBWebContainerActivity', ], matches: - 'WebView[text!=null] > View[childCount=1] > View[childCount=3] > @[visibleToUser=true][index=2]', + 'WebView[text!=null] > View[childCount=1] > View[childCount=3] > @[visibleToUser=true][index=2][width<150]', snapshotUrls: [ 'https://i.gkd.li/i/13060891', 'https://i.gkd.li/i/16703244', ], + excludeSnapshotUrls: 'https://i.gkd.li/i/29640529', // [width<150] }, ], }, @@ -346,58 +397,6 @@ export default defineGkdApp({ }, ], }, - { - key: 15, - name: '局部广告-信息流广告', - desc: '点击关闭', - fastQuery: true, - forcedTime: 10000, - rules: [ - { - key: 0, - activityIds: '.pb.pb.main.PbActivity', - matches: - '@[clickable=true][visibleToUser=true] <(1,2) RelativeLayout <(1,4) RelativeLayout[childCount>1] >(3,4) [text="广告"]', - snapshotUrls: [ - 'https://i.gkd.li/i/16595124', - 'https://i.gkd.li/i/16596297', - ], - excludeSnapshotUrls: 'https://i.gkd.li/i/16632851', // [childCount>1] 防止误触 - }, - { - key: 1, - activityIds: [ - '.tblauncher.MainTabActivity', - '.pb.pb.main.PbActivity', - '.forum.ForumActivity', - ], - matches: - '@FrameLayout[clickable=true][visibleToUser=true] <4 RelativeLayout + FrameLayout >7 [text="广告"]', - snapshotUrls: [ - 'https://i.gkd.li/i/16595301', - 'https://i.gkd.li/i/16596195', - 'https://i.gkd.li/i/16596775', - ], - }, - { - key: 2, - activityIds: '.tblauncher.MainTabActivity', - matches: - '@ImageView[childCount=0][clickable=true][visibleToUser=true] < LinearLayout[childCount=1] <4 RelativeLayout +3 LinearLayout >4 [text="小游戏"]', - snapshotUrls: [ - 'https://i.gkd.li/i/17943902', - 'https://i.gkd.li/i/18217417', - ], - }, - { - key: 3, - activityIds: '.tblauncher.MainTabActivity', - matches: - 'ImageView < @[clickable=true] <2 FrameLayout[childCount=2] -3 ViewGroup > [text="广告"]', - snapshotUrls: 'https://i.gkd.li/i/28345921', - }, - ], - }, { key: 16, name: '局部广告-感兴趣的吧推广', diff --git a/src/apps/com.chinamworld.bocmbci.ts b/src/apps/com.chinamworld.bocmbci.ts index c6b8c818d..4f9e02c04 100644 --- a/src/apps/com.chinamworld.bocmbci.ts +++ b/src/apps/com.chinamworld.bocmbci.ts @@ -9,33 +9,27 @@ export default defineGkdApp({ name: '全屏广告-弹窗广告', desc: '点击关闭', enable: false, + fastQuery: true, actionMaximum: 1, resetMatch: 'app', + matchRoot: true, // 出现Ad时未关闭,录屏or截快照才响应 + activityIds: + 'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity', rules: [ { key: 0, - fastQuery: true, - activityIds: - 'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity', matches: '@[desc="关闭"] > [vid="btn_action"]', snapshotUrls: 'https://i.gkd.li/i/17691747', }, { key: 1, - fastQuery: true, - activityIds: - 'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity', matches: - '@Image[clickable=true][childCount=0][visibleToUser=true][width<150 && height<150] <2 View[childCount=2] < View <4 View < View < WebView < WebView < [vid="webview_layout"]', - snapshotUrls: 'https://i.gkd.li/i/19567854', - }, - { - key: 2, - activityIds: - 'com.boc.bocsoft.mobile.bocmobile.buss.system.main.ui.MainActivity', - matches: - '@Image[width<80 && height<80] <2 View[childCount=2] <<2 View[index=parent.childCount.minus(1)] 3] <<(2,4) ViewGroup 3 && childCount<8] < [childCount=2] <(1,2) ViewGroup fork 未实现 + 'https://i.gkd.li/i/29379961', // 会员评论 + 'https://i.gkd.li/i/27276425', // 控件类名不一致 ], }, ], diff --git a/src/apps/com.jingdong.app.mall.ts b/src/apps/com.jingdong.app.mall.ts index 29b9fcfbe..992ebc7b1 100644 --- a/src/apps/com.jingdong.app.mall.ts +++ b/src/apps/com.jingdong.app.mall.ts @@ -256,16 +256,20 @@ export default defineGkdApp({ }, { key: 13, - name: '功能类-支付订单后点击[完成]', - desc: '点击支付完成后的完成按钮', + name: '功能类-支付订单后点击[完成/回首页]', + desc: '点击支付完成后的[完成/回首页]按钮', enable: false, rules: [ { fastQuery: true, activityIds: '.bundle.cashierfinish.view.CashierUserContentCompleteActivity', - matches: '[vid="lib_cashier_finish_back_page_text"]', - snapshotUrls: 'https://i.gkd.li/i/17358003', + matches: + '[vid="lib_cashier_finish_back_page_text" || text="回首页"][clickable=true][visibleToUser=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/17358003', + 'https://i.gkd.li/i/29404312', + ], }, ], }, diff --git a/src/apps/com.miui.player.ts b/src/apps/com.miui.player.ts index c2647a28c..86ab86138 100644 --- a/src/apps/com.miui.player.ts +++ b/src/apps/com.miui.player.ts @@ -41,6 +41,16 @@ export default defineGkdApp({ '@ViewGroup[clickable=true][childCount=0][visibleToUser=true] < ViewGroup[childCount=1] < ViewGroup[childCount=2] < FrameLayout < FrameLayout < [vid="webview_container"]', snapshotUrls: 'https://i.gkd.li/i/17783777', }, + { + key: 4, + name: '体验臻品音质', + fastQuery: true, + activityIds: + 'com.tencent.qqmusiclite.activity.player.MusicPlayerActivity', + matches: + '[text$="钟免费体验"] < * - [text$="臻品音质"] <2 * - @View[clickable=true][text=null][childCount=0] <<4 [id="android:id/content"]', + snapshotUrls: 'https://i.gkd.li/i/29175549', + }, ], }, { diff --git a/src/apps/com.sinovatech.unicom.ui.ts b/src/apps/com.sinovatech.unicom.ui.ts index 428fe0cad..eb6c82151 100644 --- a/src/apps/com.sinovatech.unicom.ui.ts +++ b/src/apps/com.sinovatech.unicom.ui.ts @@ -27,14 +27,15 @@ export default defineGkdApp({ name: '全屏广告-弹窗广告', desc: '关闭各页面的全屏广告弹窗', enable: false, - fastQuery: true, - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', rules: [ { key: 0, + name: '首页弹窗1', forcedTime: 10000, + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', activityIds: 'com.sinovatech.unicom.basic.ui.activity.MainActivity', matches: '[text="首页弹窗"] >2 View > @Image[clickable=true][text!=null] < View[id="app"] >2 View[childCount>3] > View[childCount=1] > @TextView[childCount=0][visibleToUser=true][text=""][width<150&&height<150] < [text="뉜"]', snapshotUrls: 'https://i.gkd.li/i/25658605', diff --git a/src/apps/com.tencent.mm.ts b/src/apps/com.tencent.mm.ts index ca7341678..64aa4e6de 100644 --- a/src/apps/com.tencent.mm.ts +++ b/src/apps/com.tencent.mm.ts @@ -94,13 +94,15 @@ export default defineGkdApp({ preKeys: [25], key: 50, name: '点击[关闭]', - matches: '[text*="关闭" || text="Close"][clickable=true]', + matches: + '[text="直接关闭" || text="Close" || text="关闭广告"][clickable=true]', snapshotUrls: [ 'https://i.gkd.li/i/12663984', 'https://i.gkd.li/i/12905846', 'https://i.gkd.li/i/14647940', 'https://i.gkd.li/i/14783534', ], + excludeSnapshotUrls: 'https://i.gkd.li/i/28927197', // [text="关闭该广告"] , 这是第二段的,用[text*="关闭"]会点击错, https://github.com/Lin-arm/GKD_subscription/issues/194 }, // 预留key diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts index 05186408e..d0a0b6007 100644 --- a/src/apps/com.tencent.mobileqq.ts +++ b/src/apps/com.tencent.mobileqq.ts @@ -85,6 +85,7 @@ export default defineGkdApp({ 'https://i.gkd.li/i/28426083', 'https://i.gkd.li/i/28425887', 'https://i.gkd.li/i/28425944', + 'https://i.gkd.li/i/29140037', ], excludeSnapshotUrls: [ 'https://i.gkd.li/i/14414585', // 误触 @@ -770,5 +771,61 @@ export default defineGkdApp({ }, ], }, + { + key: 29, + name: '分段广告-QQ空间空友爱看', + desc: '点击卡片右侧[推荐] ②点击[关闭推荐]', + enable: false, + fastQuery: true, + activityIds: + 'com.qzone.reborn.feedpro.activity.QzoneFriendFeedProActivity', + rules: [ + { + key: 0, + matches: '[text="推荐"] < * < @[clickable=true] -2 [text="空友爱看"]', + snapshotUrls: 'https://i.gkd.li/i/27521340', + }, + { + key: 1, + preKeys: 0, + matches: '@[clickable=true] >2 [text="关闭推荐"]', + snapshotUrls: 'https://i.gkd.li/i/27521350', + }, + ], + }, + { + key: 30, + name: '分段广告-空友爱看内的广告', + desc: '点击[广告],点击[关闭这条],点击[直接关闭]', + enable: false, + fastQuery: true, + activityIds: 'com.qzone.reborn.base.QZoneShellActivity', + rules: [ + { + key: 0, + name: '点击[广告]', + matches: '@[desc="更多"][clickable=true] > [text="广告"]', + snapshotUrls: 'https://i.gkd.li/i/28888622', + }, + { + key: 20, + preKeys: [0], + name: '点击[关闭这条]', + matches: + '@[clickable=true] > [text="关闭此条广告" || text="关闭这条"]', + snapshotUrls: [ + 'https://i.gkd.li/i/28888643', + 'https://i.gkd.li/i/28942736', + ], + }, + { + key: 50, + preKeys: [20], + name: '点击[直接关闭]', + matches: '[text="直接关闭"][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/28942737', + }, + ], + }, ], }); diff --git a/src/apps/com.twitter.android.ts b/src/apps/com.twitter.android.ts index e63d87aed..9c47336c5 100644 --- a/src/apps/com.twitter.android.ts +++ b/src/apps/com.twitter.android.ts @@ -20,42 +20,49 @@ export default defineGkdApp({ key: 0, name: '视频广告-点击右上角关闭', matches: - '@[vid="tweet_curation_action"] <2 * + * >3 [text="视频将在广告后播放"]', + '@[id$="_action"] <2 * + * >(1,3) [text$="广告后播放" || text$="推荐"]', snapshotUrls: [ 'https://i.gkd.li/i/12798795', 'https://i.gkd.li/i/14782884', - ], - }, - { - key: 1, - name: '推荐广告-点击右上角关闭', - matches: '@[vid="tweet_curation_action"] <2 * + * > [text$="推荐"]', - snapshotUrls: [ 'https://i.gkd.li/i/12813235', 'https://i.gkd.li/i/14782897', 'https://i.gkd.li/i/17182889', ], }, { - key: 2, + key: 1, matches: '@[vid="tweet_curation_action"] - [vid="tweet_ad_badge_top_right"][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/24359526', }, { - preKeys: [0, 1, 2], + key: 2, //无快查 + activityIds: 'com.x.android.main.MainActivity', + matches: + '@ImageView[desc="发帖选项"] - [visibleToUser=true][text="Ad"]', + snapshotUrls: 'https://i.gkd.li/i/29085434', + }, + + // 第二段 + { key: 10, - name: '点击[我不喜欢这个广告]', + preKeys: [0, 1], matches: - '@ViewGroup[clickable=true] > [text="我不喜欢这个广告" || text="我不喜歡這個廣告" || text^="屏蔽" || text="封鎖" || text^="Block" ][visibleToUser=true]', + '@[clickable=true] > [text^="我不喜" || text^="屏蔽" || text^="封鎖" || text^="Block"][visibleToUser=true]', snapshotUrls: [ - 'https://i.gkd.li/i/12798810', - 'https://i.gkd.li/i/14782902', - 'https://i.gkd.li/i/24359537', - 'https://i.gkd.li/i/28415651', // 我不喜欢*-zh_TW - 'https://i.gkd.li/i/20239421', // ^屏蔽 + 'https://i.gkd.li/i/14782902', // 我不喜欢这个广告、屏蔽 + 'https://i.gkd.li/i/28415651', // 我不喜歡這個廣告、封鎖 + 'https://i.gkd.li/i/20239421', // 屏蔽 ], }, + { + key: 11, //无快查 + preKeys: [2], + activityIds: 'com.x.android.main.MainActivity', + matches: + '@[clickable=true] > [visibleToUser=true][text^="我不喜" || text^="屏蔽" || text^="封鎖" || text^="Block"]', + snapshotUrls: 'https://i.gkd.li/i/29085445', + }, ], }, { diff --git a/src/apps/com.xiaomi.smarthome.ts b/src/apps/com.xiaomi.smarthome.ts index 3107fe04e..09386ee12 100644 --- a/src/apps/com.xiaomi.smarthome.ts +++ b/src/apps/com.xiaomi.smarthome.ts @@ -6,15 +6,26 @@ export default defineGkdApp({ groups: [ { key: 0, - name: '局部广告-卡片广告', - desc: '关闭卡片式广告', + name: '局部广告-各类广告', + desc: '关闭各类局部广告', rules: [ { + key: 0, + name: '卡片广告1', activityIds: 'com.xiaomi.smarthome.SmartHomeMainActivity', matches: 'RelativeLayout[childCount=2] > ImageView[id!=null] + ImageView[clickable=true][id!=null]', snapshotUrls: 'https://i.gkd.li/i/12639658', }, + { + key: 1, + name: '顶部横幅1', + fastQuery: true, + activityIds: '.framework.plugin.rn.PluginRNActivity', + matches: + '@[desc="关闭"] <3 ViewGroup < [visibleToUser=true] <2 [childCount=2] < [id="android:id/content"]', + snapshotUrls: 'https://i.gkd.li/i/29299389', + }, ], }, ], diff --git a/src/apps/com.zhihu.android.ts b/src/apps/com.zhihu.android.ts index 0a73a3af0..0f7ab3517 100644 --- a/src/apps/com.zhihu.android.ts +++ b/src/apps/com.zhihu.android.ts @@ -14,7 +14,7 @@ export default defineGkdApp({ { key: 0, activityIds: [ - '.feature.short_container_feature.ui', + '.feature.short_container_feature.ui.', '.ContentActivity', ], matches: @@ -148,8 +148,10 @@ export default defineGkdApp({ rules: [ { key: 0, - matches: - '@[text="×"||(name*=".Image"&&id=null)][index!=0][visibleToUser=true][!(vid="medal")] [name!*="WebView"][(text$="热度"||text$="广告"||text="创作者小助手"||(text^="知乎"&&text!*="·"))||(text="查看详情")][text.length>2&&text.length<20]', + anyMatches: [ + '@[clickable=true][visibleToUser=true] -(1,2) TextView[childCount=0][id=null][text=null][desc=null] n [text*="广告"][childCount=0][id=null][desc=null]', + 'ImageView < @[index=parent.childCount.minus(1)][clickable=true][width<150] 3 [text="广告"]', + ], snapshotUrls: [ 'https://i.gkd.li/import/14178980', 'https://i.gkd.li/import/14206949', @@ -165,6 +167,9 @@ export default defineGkdApp({ 'https://i.gkd.li/i/15282584', 'https://i.gkd.li/i/15285359', 'https://i.gkd.li/i/20648888', + 'https://i.gkd.li/i/28590141', + 'https://i.gkd.li/i/28661886', + 'https://i.gkd.li/i/14232195', ], excludeSnapshotUrls: ['https://i.gkd.li/i/17088832'], }, diff --git a/src/apps/tv.danmaku.bili.ts b/src/apps/tv.danmaku.bili.ts index eacfee576..641da2559 100644 --- a/src/apps/tv.danmaku.bili.ts +++ b/src/apps/tv.danmaku.bili.ts @@ -43,6 +43,7 @@ export default defineGkdApp({ anyMatches: [ '[height > prev.bottom.plus(200)] >n [(((desc*="广告"||desc*="来自淘宝")&&desc*="查看")||desc$=",,轻点两下查看详情"||(desc^="【有奖调研】"&&desc.length=22))||(id*="/ad_")][visibleToUser=true] >(2,3,4) @ImageView[visibleToUser=true] < [vid^="more" || id^="tv.danmaku.bili.adbiz:id/more"][visibleToUser=true]', '[id$="ad_tint_frame" || id$="root_container" || id$="constraintLayout"][visibleToUser=true] >(1,2,3) [vid="more" || id="tv.danmaku.bili.adbiz:id/more"]', + '[text="课堂" || text="纪录片" || text="游戏" || vid="bottom_container" || vid="live_lottie_layout"][index=2] +n [vid="more"][visibleToUser=true]', ], snapshotUrls: [ 'https://i.gkd.li/import/12642260', // n = 2 @@ -73,6 +74,13 @@ export default defineGkdApp({ 'https://i.gkd.li/i/23687196', 'https://i.gkd.li/i/27153803', 'https://i.gkd.li/i/27686976', + 'https://i.gkd.li/i/23934632', // 课堂 + 'https://i.gkd.li/i/23933866', // 纪录片 + 'https://i.gkd.li/i/24015674', // 游戏 + 'https://i.gkd.li/i/23933925', // vid="bottom_container" + 'https://i.gkd.li/i/17675894', // 直播 vid="live_lottie_layout" + 'https://i.gkd.li/i/18306858', // 直播 + 'https://i.gkd.li/i/28908101', // [vid="more_layout"] 视频暂停播放时出现的广告 ], excludeSnapshotUrls: ['https://i.gkd.li/i/23833031'], // 会出现按钮在底部导航栏后且visibleToUser=true的情况,需要使用 [height > prev.bottom.plus(200)] 排除,原理是根元素的高度必须大于右侧元素(视频卡片元素)bottom+200 }, @@ -90,7 +98,7 @@ export default defineGkdApp({ fastQuery: true, name: '点击[不感兴趣]', matches: - '@[clickable=true] > [text="这个内容" || text="不感兴趣" || text="相似内容过多" || text="up主不感兴趣" || text="此类内容过多" || text="对该up的直播不感兴趣"|| text="我不想看"]', + '@[clickable=true] > [text="这个内容" || text="不感兴趣" || text="相似内容过多" || text="up主不感兴趣" || text="此类内容过多" || text="对该up的直播不感兴趣"|| text*="不想看" || text$="质量差"]', snapshotUrls: [ 'https://i.gkd.li/import/13495649', 'https://i.gkd.li/i/13742257', @@ -120,6 +128,8 @@ export default defineGkdApp({ 'https://i.gkd.li/i/20739391', 'https://i.gkd.li/i/23687208', 'https://i.gkd.li/i/24836772', + 'https://i.gkd.li/i/24015691', // 我不想看 + 'https://i.gkd.li/i/28659010', // 不想看该内容、广告质量差 ], }, { @@ -247,16 +257,20 @@ export default defineGkdApp({ rules: [ { key: 1, - matches: - '@[vid="more"][clickable=true][visibleToUser=true] -(3,4) [vid="tag_layout"]', + name: '点击右下角[菜单]', + matches: '[vid="ad_tint_frame"] > [vid="more"][clickable=true]', snapshotUrls: [ 'https://i.gkd.li/i/17269053', 'https://i.gkd.li/i/17964354', + 'https://i.gkd.li/i/28495212', ], }, { + key: 2, preKeys: [1], - matches: '@[clickable=true] > [text$="不感兴趣"]', + name: '点击[不感兴趣]', + matches: + '@[clickable=true] > [text$="不感兴趣" || text*="不想看" || text$="质量差"]', snapshotUrls: [ 'https://i.gkd.li/i/17269055', 'https://i.gkd.li/i/17964356', @@ -375,5 +389,20 @@ export default defineGkdApp({ }, ], }, + { + key: 21, + name: '局部广告-视频页-即将展示Ad', + desc: '视频途中[x秒后展示广告] -> 取消', + rules: [ + { + fastQuery: true, + activityIds: + 'com.bilibili.ship.theseus.detail.UnitedBizDetailsActivity', + matches: + '@[text="取消"][clickable=true][visibleToUser=true] - [text="后将展示广告"] <2 View[childCount=3] <<2 ComposeView <<3 FrameLayout[childCount=1] n [text="广告"]`, + matches: `ImageView${COMMON_PREFIX} < @ViewGroup[childCount=1][clickable=true] <n [text="广告"][visibleToUser=true]`, }, { key: 1, name: '快手SDK-类型2', fastQuery: true, - matches: `[text="跳过"]${COMMON_PREFIX} < @ViewGroup[childCount=4][clickable=true] <n [text="广告"]`, + matches: `[text="跳过"]${COMMON_PREFIX} < @ViewGroup[childCount=4][clickable=true] <n [text="广告"][visibleToUser=true]`, }, { key: 2, name: '快手SDK-类型3', fastQuery: true, - matches: `@ImageView${COMMON_PREFIX} <n [text="广告"]`, + matches: `@ImageView${COMMON_PREFIX} <n [text="广告"][visibleToUser=true]`, snapshotUrls: ['https://i.gkd.li/i/13625303'], }, { key: 3, name: '快手SDK-类型4', matches: - 'ImageView[childCount=0][text=null] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] <<(1, 3) ViewGroup +(1, 2, 4) ViewGroup[childCount=2] >(1,3) [text="广告"]', + 'ImageView[childCount=0][text=null] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] <<(1, 3) ViewGroup +(1, 2, 4) ViewGroup[childCount=2] >(1,3) [text="广告"][visibleToUser=true]', snapshotUrls: [ 'https://i.gkd.li/import/13259198', 'https://i.gkd.li/i/16837806', @@ -268,7 +268,7 @@ export default defineGkdGlobalGroups([ name: '快手SDK-类型5', fastQuery: true, matches: [ - '[text="广告"]', + '[text="广告"][visibleToUser=true]', '@ImageView[clickable=true] - [text="|"] - [text$="s"]', ], snapshotUrls: ['https://i.gkd.li/i/13625303'],