diff --git a/src/apps/cn.wps.moffice_eng.ts b/src/apps/cn.wps.moffice_eng.ts index 717305a3f..919973977 100644 --- a/src/apps/cn.wps.moffice_eng.ts +++ b/src/apps/cn.wps.moffice_eng.ts @@ -48,7 +48,7 @@ export default defineGkdApp({ 'cn.wps.moffice.main.AfterLoginActivity', 'com.android.packageinstaller.permission.ui.GrantPermissionsActivity', ], - matches: '[id="cn.wps.moffice_eng:id/afterlogin_cancel"]', + matches: '[vid="afterlogin_cancel"]', snapshotUrls: [ 'https://i.gkd.li/i/13259097', 'https://i.gkd.li/i/12882712', @@ -59,7 +59,7 @@ export default defineGkdApp({ fastQuery: true, activityIds: 'cn.wps.moffice.main.local.HomeRootActivity', matches: - 'View[childCount=3] > Image[text!=null] +2 @TextView[clickable=true] <2 [id="cn.wps.moffice_eng:id/btn_close"]', + matches: '[vid="doc_end_ad_container_main"] >2 [vid="btn_close"]', snapshotUrls: 'https://i.gkd.li/i/13513911', }, { @@ -133,7 +131,7 @@ export default defineGkdApp({ fastQuery: true, activityIds: 'cn.wps.moffice.main.local.HomeRootActivity', matches: - '[id="cn.wps.moffice_eng:id/home_banner_ad_spread_close" || vid="phone_message_close_button" || vid="close_home_ad_banner_iv" || vid="iv_item_close" || vid="iv_cloud_sync_close"][visibleToUser=true]', + '[vid="home_banner_ad_spread_close" || vid="phone_message_close_button" || vid="close_home_ad_banner_iv" || vid="iv_item_close" || vid="iv_cloud_sync_close"][visibleToUser=true]', snapshotUrls: [ 'https://i.gkd.li/i/13804525', 'https://i.gkd.li/i/17893252', diff --git a/src/apps/com.alicloud.databox.ts b/src/apps/com.alicloud.databox.ts index f50e77e3c..bb6d77e5d 100644 --- a/src/apps/com.alicloud.databox.ts +++ b/src/apps/com.alicloud.databox.ts @@ -94,7 +94,7 @@ export default defineGkdApp({ rules: [ { matches: - '[text^="立即了解"] -3 @View[clickable=true] < [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)] 4 [vid="overflow_button"][clickable=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/23790199', + 'https://i.gkd.li/i/26672553', + ], + }, + { + key: 2, + preKeys: [1], matches: '@[clickable=true] >(1,2) [vid="list_item_text"][text="关闭"]', snapshotUrls: [ diff --git a/src/apps/com.taobao.idlefish.ts b/src/apps/com.taobao.idlefish.ts index 67f6a17df..14e8710a5 100644 --- a/src/apps/com.taobao.idlefish.ts +++ b/src/apps/com.taobao.idlefish.ts @@ -46,10 +46,11 @@ export default defineGkdApp({ activityIds: 'com.taobao.idlefish.maincontainer.activity.MainActivity', matches: - 'WebView[text="Rax App"] > [id="root"] >(3,6) View[index=parent.childCount.minus(1)][clickable=true]', + 'WebView[text="Rax App"] > [id="root"] >(3,6) View[index=parent.childCount.minus(1)][index>=1]', snapshotUrls: [ 'https://i.gkd.li/i/14551046', 'https://i.gkd.li/i/24981766', + 'https://i.gkd.li/i/26865707', ], }, { @@ -176,6 +177,32 @@ export default defineGkdApp({ }, { key: 9, + name: '局部广告', + desc: '关闭各类局部广告', + rules: [ + { + key: 0, + fastQuery: true, + activityIds: '.maincontainer.activity.MainActivity', + matches: + '@ImageView[clickable=true][width<100] <(2,5) FrameLayout <<(3,4) [vid="fish_layer_container_id"]', + snapshotUrls: [ + 'https://i.gkd.li/i/25796897', + 'https://i.gkd.li/i/26184285', + ], + }, + { + key: 1, + fastQuery: true, + activityIds: '.detail.DetailActivity', + matches: + 'Image[width<60 && height<60] < @View [text$="推荐你"]', + '@[text="关闭"||text="不感兴趣"] < FrameLayout -n FrameLayout > [text$="推荐你"]', snapshotUrls: [ 'https://i.gkd.li/import/13438414', 'https://i.gkd.li/i/15520321', + 'https://i.gkd.li/i/26426385', + 'https://i.gkd.li/i/26826092', ], }, { diff --git a/src/apps/com.tencent.mm.ts b/src/apps/com.tencent.mm.ts index 7d44d5c4b..1ea14bf93 100644 --- a/src/apps/com.tencent.mm.ts +++ b/src/apps/com.tencent.mm.ts @@ -136,7 +136,7 @@ export default defineGkdApp({ key: 0, name: 'PC 微信扫码登录', matches: [ - '[text^="登录 Win" || text^="登录桌面" || text^="登入 WeChat" || text^="Log in to Weixin for"][visibleToUser=true]', + '[text^="登录 Win" || text^="登录 Mac" || text^="登录桌面" || text^="登入 WeChat" || text^="登入 微信" || text^="Log in to Weixin for"][visibleToUser=true]', '[text="登录" || text="登入" || text="Log In"][visibleToUser=true]', ], snapshotUrls: [ @@ -146,6 +146,7 @@ export default defineGkdApp({ 'https://i.gkd.li/i/22356438', // En_US 'https://i.gkd.li/i/25315046', // zh_TW 'https://i.gkd.li/i/25815630', // Linux_zh_CN + 'https://i.gkd.li/i/26865671', ], }, { @@ -230,7 +231,7 @@ export default defineGkdApp({ }, { key: 5, - name: '功能类-自动领取微信红包', + name: '功能类-自动领取红包', desc: '自动领取私聊红包,群聊红包', enable: false, fastQuery: true, @@ -243,10 +244,11 @@ export default defineGkdApp({ '.ui.chatting.variants.ChattingMainUI', ], matches: - 'LinearLayout[childCount=1] >2 @FrameLayout[clickable=true] >2 LinearLayout[getChild(1).childCount=1] +2 RelativeLayout > [text="微信红包"]', + 'LinearLayout[childCount=1] >2 @FrameLayout[clickable=true] >3 [childCount=1] <2 LinearLayout +(1,2) RelativeLayout > [text="微信红包"]', snapshotUrls: [ 'https://i.gkd.li/i/18134826', 'https://i.gkd.li/i/24347101', + 'https://i.gkd.li/i/26586606', ], excludeSnapshotUrls: [ 'https://i.gkd.li/i/18134823', // 自己发的, LinearLayout[childCount=1] 区分 @@ -464,7 +466,7 @@ export default defineGkdApp({ rules: [ { key: 0, - name: '开屏广告', + name: '开屏广告-1', actionDelay: 800, // 过早点击首次大概率跳不过 forcedTime: 10000, fastQuery: true, @@ -516,6 +518,16 @@ export default defineGkdApp({ 'https://i.gkd.li/import/14156176', // 误触快照 ], }, + { + key: 3, + name: '开屏广告-2', + matchRoot: true, + actionCd: 500, + matches: + '@TextView[text*="跳过"] < View < * < WebView < * < * < * < * < * < * < * < * < * <2 FrameLayout[childCount=2] < * < [id="android:id/content"]', + // matches: '@TextView[text*="跳过"][text.length<10][height<150] <<12 * <2 FrameLayout[childCount=2] < * < [id="android:id/content"]', // 用 << 会被GKD判为缓慢查询,等类似的多了再用吧 + snapshotUrls: 'https://i.gkd.li/i/26677309', + }, ], }, { diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts index 8a454448a..5b1d334c8 100644 --- a/src/apps/com.tencent.mobileqq.ts +++ b/src/apps/com.tencent.mobileqq.ts @@ -11,7 +11,10 @@ export default defineGkdApp({ fastQuery: true, matchTime: 10000, actionMaximum: 1, + scopeKeys: [13], // 规则组key13也是开屏广告 + actionMaximumKey: 0, // key13-0 resetMatch: 'app', + priorityTime: 10000, excludeActivityIds: [ 'com.tencent.mobileqq.activity.ChatActivity', // 在聊天界面禁用 'com.tencent.mobileqq.search.activity.UniteSearchActivity', // 在搜索页面禁用 @@ -44,7 +47,7 @@ export default defineGkdApp({ name: '消息页面顶部广告', activityIds: 'com.tencent.mobileqq.activity.SplashActivity', matches: - 'ImageView[longClickable!=true][vid!="chat_item_head_icon"][desc=null&&text=null] n TextView[clickable=false][text.length>0][!(text~="(?is).*([01]?[0-9]|2[0-3])[::][0-5][0-9].*")][text!$="G"&&text!$="M"&&text!$="k"][visibleToUser=true] < [name$="ImageView"||name$="Button"][desc="关闭"||(desc=null&&text=null)][vid!="chat_item_head_icon"][childCount=0][visibleToUser=true][clickable=true][longClickable!=true][left>0]', + '[longClickable!=true][vid!="chat_item_head_icon"][desc=null&&text=null] n TextView[clickable=false][text.length>0][!(text~="(?is).*([01]?[0-9]|2[0-3])[::][0-5][0-9].*")][text!$="G"&&text!$="M"&&text!$="k"][visibleToUser=true] < [name$="ImageView"||name$="Button"][desc="关闭"||(desc=null&&text=null)][vid!="chat_item_head_icon"][childCount=0][visibleToUser=true][clickable=true][longClickable!=true][left>0]', excludeMatches: [ '[id^="com.tencent.mobileqq.qzone"]', // QQ空间 '[text="互动标识"]', // 侧滑抽屉 @@ -78,6 +81,7 @@ export default defineGkdApp({ 'https://i.gkd.li/i/23837678', 'https://i.gkd.li/i/24230528', 'https://i.gkd.li/i/25235782', + 'https://i.gkd.li/i/26159150', ], excludeSnapshotUrls: [ 'https://i.gkd.li/i/14414585', // 误触 @@ -561,19 +565,21 @@ export default defineGkdApp({ enable: false, fastQuery: true, actionMaximum: 1, - activityIds: [ - 'com.tencent.mobileqq.mini.appbrand.ui.AppBrandUI', - 'com.tencent.mobileqq.activity.miniaio.MiniChatActivity', - ], + priorityTime: 10000, rules: [ { + key: 0, + activityIds: [ + '.mini.appbrand.ui.AppBrandUI', + '.activity.miniaio.MiniChatActivity', + ], matches: [ '[text="广告"][visibleToUser=true]', '[text="跳过"][visibleToUser=true]', ], snapshotUrls: [ - 'https://i.gkd.li/import/12877215', - 'https://i.gkd.li/import/12919195', + 'https://i.gkd.li/i/12877215', + 'https://i.gkd.li/i/12919195', 'https://i.gkd.li/i/15130235', ], }, diff --git a/src/apps/com.tencent.qqmusic.ts b/src/apps/com.tencent.qqmusic.ts index 7337a37c4..64cc2ba85 100644 --- a/src/apps/com.tencent.qqmusic.ts +++ b/src/apps/com.tencent.qqmusic.ts @@ -8,12 +8,12 @@ export default defineGkdApp({ key: 1, name: '局部广告-卡片广告', desc: '关闭播放界面、歌单页、我的页等位置的各类卡片广告', + activityIds: '.activity.AppStarterActivity', rules: [ { key: 1, fastQuery: true, - activityIds: - 'com.tencent.qqmusic.business.playernew.view.NewPlayerActivity', + activityIds: '.business.playernew.view.NewPlayerActivity', matches: '[text^="广告"] + [text="跳过"][clickable=true][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/13985169', // 播放界面 @@ -21,7 +21,6 @@ export default defineGkdApp({ { key: 2, fastQuery: true, - activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity', matches: '@[desc="关闭"][clickable=true] -(1,2) [text="广告"][visibleToUser=true]', snapshotUrls: [ @@ -32,37 +31,33 @@ export default defineGkdApp({ { key: 3, fastQuery: true, - activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity', matches: - '@ImageView - ImageView - RelativeLayout >n [text="听歌入会赢绿钻"||text="摇动点击广告跳转"][visibleToUser=true]', + '@ImageView - ImageView - RelativeLayout >3 [text="听歌入会赢绿钻" || text="摇动点击广告跳转"][visibleToUser=true]', snapshotUrls: [ - 'https://i.gkd.li/i/13206982', - 'https://i.gkd.li/i/13218134', + 'https://i.gkd.li/i/13206982', // (首页) 听歌入会赢绿钻 + 'https://i.gkd.li/i/13218134', // (首页) 摇动点击广告跳转 ], }, { key: 4, fastQuery: true, - activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity', - matches: - '@[clickable=true][visibleToUser=true] > [text="广告"][visibleToUser=true]', + matches: '@[clickable=true] > [text="广告"][visibleToUser=true]', snapshotUrls: [ - 'https://i.gkd.li/i/15041019', - 'https://i.gkd.li/i/18227243', + 'https://i.gkd.li/i/15041019', // 首页 + 'https://i.gkd.li/i/18227243', // 搜索页 ], - excludeSnapshotUrls: 'https://i.gkd.li/i/18219557', + excludeSnapshotUrls: 'https://i.gkd.li/i/18219557', // [text="广告"][visibleToUser=false] }, { key: 5, - activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity', + fastQuery: true, matches: - 'RecyclerView > LinearLayout[childCount=3] >5 ViewGroup[childCount=3] > @ViewGroup[clickable=true] >2 ImageView[text=null][desc=null][visibleToUser=true]', - snapshotUrls: 'https://i.gkd.li/i/15756931', + '@ImageView[clickable=true][height<87] <2 RelativeLayout - * > [text="广告"]', + snapshotUrls: 'https://i.gkd.li/i/26806364', // 首页 }, { key: 6, fastQuery: true, - activityIds: '.activity.AppStarterActivity', matches: '@ImageView[clickable=true] - [text="广告"][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/17450309', @@ -70,23 +65,14 @@ export default defineGkdApp({ { key: 7, fastQuery: true, - activityIds: '.activity.AppStarterActivity', matches: '[text="广告 | 关闭"][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/18227204', }, + + // 不支持快查的放后面,以防阻塞前面快查的 { - key: 8, - name: '播放页[猜你也会喜欢]推荐', - fastQuery: true, - activityIds: '.business.playernew.view.NewPlayerActivity', - matches: - '@ImageView[childCount=0][clickable=true] -2 [text="猜你也会喜欢"][visibleToUser=true]', - snapshotUrls: 'https://i.gkd.li/i/18410610', - }, - { - key: 9, + key: 20, matchTime: 10000, - activityIds: '.activity.AppStarterActivity', matches: 'RecyclerView > FrameLayout[desc!=null] >3 LinearLayout[id!=null] > ViewPager > FrameLayout[visibleToUser=true] > ImageView[childCount=0][clickable=true][width<150 && height<100][index=parent.childCount.minus(1)]', snapshotUrls: [ @@ -95,12 +81,17 @@ export default defineGkdApp({ ], }, { - key: 10, - activityIds: '.activity.AppStarterActivity', + key: 21, matches: 'ImageView[width<80 && height<80] <<2 @ViewGroup[clickable=true] - [text^="hi~"]', snapshotUrls: 'https://i.gkd.li/i/23930716', }, + { + key: 22, + matches: + 'RecyclerView > LinearLayout[childCount=3] >5 ViewGroup[childCount=3] > @ViewGroup[clickable=true] >2 ImageView[text=null][desc=null][visibleToUser=true]', + snapshotUrls: 'https://i.gkd.li/i/15756931', + }, ], }, { diff --git a/src/apps/com.twitter.android.ts b/src/apps/com.twitter.android.ts index 0f74da654..bf3b96629 100644 --- a/src/apps/com.twitter.android.ts +++ b/src/apps/com.twitter.android.ts @@ -58,7 +58,7 @@ export default defineGkdApp({ key: 10, name: '点击屏蔽/隐藏,如果机会全用完需要取消遍再屏蔽', matches: - '@ViewGroup > [id="com.twitter.android:id/action_sheet_item_title"][text^="屏蔽"||text^="Block"||text^="隐藏 @"||text^="Mute @"||text^="Unblock @"||text^="Unmute @"]', + '@ViewGroup > [id="com.twitter.android:id/action_sheet_item_title"][text^="屏蔽"||text^="封鎖"||text^="Block"||text^="隐藏 @"||text^="Mute @"||text^="Unblock @"||text^="Unmute @"]', snapshotUrls: [ 'https://i.gkd.li/import/12798810', 'https://i.gkd.li/i/14782902', @@ -73,6 +73,7 @@ export default defineGkdApp({ 'https://i.gkd.li/i/25461007', // 隐藏已用 'https://i.gkd.li/i/25461077', // En-Mute 'https://i.gkd.li/i/25461050', // En-Unmute + 'https://i.gkd.li/i/26865753', ], }, { @@ -116,7 +117,7 @@ export default defineGkdApp({ actionCd: 2000, //防止[译文]节点未加载完导致重复点击 [翻译] activityIds: 'com.twitter.tweetdetail.TweetDetailActivity', matches: - '[vid="translation_link" || vid="grok_translation_link"][clickable=true][index=parent.childCount.minus(1)]', + '[vid="translation_link" || vid="grok_translation_link"][index=parent.childCount.minus(1)][index!=2]', exampleUrls: [ 'https://e.gkd.li/ced46989-9c6a-4626-b027-7953e0fdc2c6', 'https://m.gkd.li/57941037/40ece44f-883f-429a-aa0c-17dac15a50e4', @@ -127,8 +128,12 @@ export default defineGkdApp({ 'https://i.gkd.li/i/25537171', 'https://i.gkd.li/i/25461468', 'https://i.gkd.li/i/25461607', // Grok translate + 'https://i.gkd.li/i/26642877', + ], + excludeSnapshotUrls: [ + 'https://i.gkd.li/i/25537171', // 已翻译, 加 [index=parent.childCount.minus(1)] 排除 + 'https://i.gkd.li/i/26642826', // 已翻译, 加 [index!=2] 排除 ], - excludeSnapshotUrls: 'https://i.gkd.li/i/25537171', // 已翻译, 加 [index=parent.childCount.minus(1)] 排除 }, ], }, diff --git a/src/apps/tv.danmaku.bili.ts b/src/apps/tv.danmaku.bili.ts index 1eb2b64d2..f5e0d2fdc 100644 --- a/src/apps/tv.danmaku.bili.ts +++ b/src/apps/tv.danmaku.bili.ts @@ -15,7 +15,7 @@ export default defineGkdApp({ rules: [ { key: 1, - matches: '[id=`tv.danmaku.bili:id/ad_goods_mark_big`]', + matches: '[vid="ad_goods_mark_big"]', snapshotUrls: 'https://i.gkd.li/import/12700222', }, { @@ -135,6 +135,19 @@ export default defineGkdApp({ }, ], }, + { + key: 5, + name: '局部广告-会员购', + desc: '底部横幅Ad', + rules: [ + { + fastQuery: true, + activityIds: '.MainActivityV2', + matches: '[vid="mall_home_newuser_coupon_close"][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/26240948', + }, + ], + }, { key: 6, name: '局部广告-首页浮标广告', @@ -161,7 +174,7 @@ export default defineGkdApp({ 'com.bilibili.ship.theseus.detail.UnitedBizDetailsActivity', 'com.bilibili.video.videodetail.VideoDetailsActivity', ], - matches: '[id="tv.danmaku.bili:id/toast_x"]', + matches: '[vid="toast_x"]', snapshotUrls: [ 'https://i.gkd.li/i/12892611', 'https://i.gkd.li/i/13308344', @@ -302,12 +315,12 @@ export default defineGkdApp({ fastQuery: true, activityIds: 'com.bilibili.vip.web.VipWebActivity', matches: - 'TextView[childCount=0][text!=null][index=parent.childCount.minus(1)] -2 View >3 [text^="专属等级加速包"] +2 @TextView[childCount=0][text="领取"] <