diff --git a/src/apps/cn.wps.moffice_eng.ts b/src/apps/cn.wps.moffice_eng.ts index ce4e56e0b..717305a3f 100644 --- a/src/apps/cn.wps.moffice_eng.ts +++ b/src/apps/cn.wps.moffice_eng.ts @@ -20,8 +20,8 @@ export default defineGkdApp({ key: 0, matches: '[id="com.mopub.ad.xiaomi:id/nativeclose"]', snapshotUrls: [ - 'https://i.gkd.li/import/12505350', - 'https://i.gkd.li/import/12505286', + 'https://i.gkd.li/i/12505350', + 'https://i.gkd.li/i/12505286', ], }, { @@ -29,8 +29,8 @@ export default defineGkdApp({ key: 99, matches: '[text="不喜欢此广告"]', snapshotUrls: [ - 'https://i.gkd.li/import/12505365', - 'https://i.gkd.li/import/13259090', + 'https://i.gkd.li/i/12505365', + 'https://i.gkd.li/i/13259090', ], }, ], @@ -50,17 +50,17 @@ export default defineGkdApp({ ], matches: '[id="cn.wps.moffice_eng:id/afterlogin_cancel"]', snapshotUrls: [ - 'https://i.gkd.li/import/13259097', - 'https://i.gkd.li/import/12882712', + 'https://i.gkd.li/i/13259097', + 'https://i.gkd.li/i/12882712', ], }, { key: 1, - name: '体验超级会员弹窗', + 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"]', - snapshotUrls: 'https://i.gkd.li/import/13513911', + snapshotUrls: 'https://i.gkd.li/i/13513911', }, { - preKeys: 1, + preKeys: [1], key: 2, matches: '[text="关闭当前广告"]', - snapshotUrls: 'https://i.gkd.li/import/13513914', + snapshotUrls: 'https://i.gkd.li/i/13513914', }, ], }, { key: 6, - name: '局部广告-首页底部广告', - desc: '关闭首页底部横幅广告', - fastQuery: true, - activityIds: 'cn.wps.moffice.main.local.HomeRootActivity', - rules: '[id="cn.wps.moffice_eng:id/home_banner_ad_spread_close"]', - snapshotUrls: 'https://i.gkd.li/import/13804525', + name: '局部广告', + desc: '关闭各类局部广告', + rules: [ + { + key: 1, + 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]', + snapshotUrls: [ + 'https://i.gkd.li/i/13804525', + 'https://i.gkd.li/i/17893252', + 'https://i.gkd.li/i/18047731', + 'https://i.gkd.li/i/23577590', + 'https://i.gkd.li/i/23786789', + ], + }, + { + key: 2, + fastQuery: true, + activityIds: 'cn.wps.moffice.writer.multiactivity.Writer1', + matches: + '[vid="public_login"] <2 LinearLayout[childCount=2] + [vid="public_close"][clickable=true][visibleToUser=true]', + snapshotUrls: 'https://i.gkd.li/i/26026279', + exampleUrls: 'https://e.gkd.li/a17eca15-c7bd-4ea6-ba84-0d3242641697', + }, + ], }, ], }); diff --git a/src/apps/com.alicloud.databox.ts b/src/apps/com.alicloud.databox.ts index d7e494704..f50e77e3c 100644 --- a/src/apps/com.alicloud.databox.ts +++ b/src/apps/com.alicloud.databox.ts @@ -35,6 +35,7 @@ export default defineGkdApp({ name: '在签到后，关闭弹窗', action: 'back', anyMatches: [ + '[text="保存至"]', '[vid="ivCardBackBackground"][visibleToUser=true]', '[vid="cvCardFront"] > [vid="ivClose"][visibleToUser=true]', ], diff --git a/src/apps/com.autonavi.minimap.ts b/src/apps/com.autonavi.minimap.ts index 5aadbb834..1f9cff75b 100644 --- a/src/apps/com.autonavi.minimap.ts +++ b/src/apps/com.autonavi.minimap.ts @@ -81,6 +81,17 @@ export default defineGkdApp({ name: '局部广告-卡片广告', desc: '关闭地图页面的卡片式广告和购票优惠提示', rules: [ + { + key: 0, + activityIds: 'com.autonavi.map.activity.NewMapActivity', + fastQuery: true, + matches: [ + '[vid="btn_qrscan"][desc="扫一扫"]', + 'ViewGroup[desc.length>0] < ViewGroup + @[desc="关闭"][clickable=true][visibleToUser=true] < [text="近期不再提醒我"]', snapshotUrls: 'https://i.gkd.li/i/16427922', }, + { + key: 2, + activityIds: + 'com.alipay.mobile.nebulax.xriver.activity.XRiverActivity', + matches: + '[text="通用半浮层容器页面"] >4 [text*="小组件"] - View[index=0][visibleToUser=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/26164320', + 'https://i.gkd.li/i/26164322', + ], + }, ], }, { @@ -328,12 +339,13 @@ export default defineGkdApp({ 'com.alipay.mobile.nebulax.xriver.activity.XRiverActivity', 'com.alipay.mobile.nebulax.xriver.activity.XRiverTransActivity$Main', 'com.alipay.android.living.activity.LivingNotTransparentDetailActivity', - '.AlipayLogin', 'com.alipay.android.phone.wallet.blessingcard_receive.biz.activity.ReceiveDialogActivity', + 'com.alipay.android.living.activity.LivingDetailActivity', + '.AlipayLogin', ], matches: [ '[text="访问被拒绝" || text="人气太旺啦，请稍后再试" || text="訪問被拒絕" || text="人氣太旺啦，請稍後再試" || text="伺服器繁忙，請稍後再試"][visibleToUser=true]', - '[id="com.alipay.mobile.antui:id/back_button"][visibleToUser=true]', + '[id="com.alipay.mobile.antui:id/back_button"][clickable=true]', ], snapshotUrls: [ 'https://i.gkd.li/i/23046994', @@ -343,6 +355,7 @@ export default defineGkdApp({ 'https://i.gkd.li/i/24353826', 'https://i.gkd.li/i/24183318', 'https://i.gkd.li/i/25199767', + 'https://i.gkd.li/i/25485052', ], }, ], diff --git a/src/apps/com.google.android.gm.ts b/src/apps/com.google.android.gm.ts index 3610219e5..98d6d2d95 100644 --- a/src/apps/com.google.android.gm.ts +++ b/src/apps/com.google.android.gm.ts @@ -12,40 +12,46 @@ export default defineGkdApp({ fastQuery: true, rules: [ { - key: 0, - matches: - '[id="com.google.android.gm:id/basic_ad_teaser_info_icon" || id="com.google.android.gm:id/button_chip_ad_teaser_info_icon"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13255698', - 'https://i.gkd.li/i/13255698', - ], - }, - { - preKeys: [0], key: 1, matches: - 'Button[visibleToUser=true][text="屏蔽此广告" || text^="Block" || desc="屏蔽"] < [text="关闭"]', - snapshotUrls: 'https://i.gkd.li/i/23772979', + matches: + '@[clickable=true] >(1,2) [vid="list_item_text"][text="关闭"]', + snapshotUrls: [ + 'https://i.gkd.li/i/23772979', + 'https://i.gkd.li/i/25461885', + ], }, ], }, diff --git a/src/apps/com.greenpoint.android.mc10086.activity.ts b/src/apps/com.greenpoint.android.mc10086.activity.ts index 147323531..3890dfbe0 100644 --- a/src/apps/com.greenpoint.android.mc10086.activity.ts +++ b/src/apps/com.greenpoint.android.mc10086.activity.ts @@ -27,22 +27,28 @@ export default defineGkdApp({ rules: [ { key: 0, + actionCd: 300, activityIds: 'com.mc10086.cmcc.view.tabs.AppTabFragment', matches: - '[id="com.greenpoint.android.mc10086.activity:id/close_btn"]', - snapshotUrls: 'https://i.gkd.li/i/12662265', + '[vid="close_btn" || vid="close_btn_bottom" || vid="cmcc_digital_delete_float_icon_ll"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12662265', // close_btn + 'https://i.gkd.li/i/14570369', // close_btn_bottom + 'https://i.gkd.li/i/25768816', // close_btn_bottom 和 cmcc_digital_delete_float_icon_ll + ], }, { key: 1, activityIds: 'com.mc10086.cmcc.view.tabs.AppTabFragment', - matches: '[vid="close_btn_bottom"]', - snapshotUrls: 'https://i.gkd.li/i/14570369', + matches: + '[vid="tab_ai_tag"] >2 [vid="ai_floatingBar_close"][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/25768547', }, { key: 2, activityIds: 'com.cmccit.webview.ac.CommonHtml5Activity', matches: - '[text="余量查询"] > View > View > @Image[clickable=true][text!=null] < FrameLayout[index=parent.childCount.minus(1)||index=parent.childCount.minus(2)][childCount=1] > ImageView[desc="关闭"]', + anyMatches: [ + 'ImageView < FrameLayout[index=0] < ViewGroup[childCount>=3] > FrameLayout[index=parent.childCount.minus(1)||index=parent.childCount.minus(2)][childCount=1] > ImageView[desc="关闭"]', + 'View + FrameLayout[index=1] <2 ViewGroup[childCount>=3] > FrameLayout[index=parent.childCount.minus(1)||index=parent.childCount.minus(2)][childCount=1] > ImageView[desc="关闭"]', + ], snapshotUrls: [ 'https://i.gkd.li/import/13258973', 'https://i.gkd.li/import/13258980', 'https://i.gkd.li/import/13258981', 'https://i.gkd.li/i/22319329', + 'https://i.gkd.li/i/26164414', ], }, { @@ -216,9 +219,14 @@ export default defineGkdApp({ }, { key: 3, - matches: + anyMatches: [ '[desc="吸顶楼层"] > [desc="关闭按钮"][clickable=true][visibleToUser=true]', - snapshotUrls: 'https://i.gkd.li/i/15112953', + 'ImageView[clickable=false] < @ViewGroup[clickable=true] <<4 [desc="吸顶楼层"]', + ], + snapshotUrls: [ + 'https://i.gkd.li/i/15112953', + 'https://i.gkd.li/i/26164445', + ], }, { key: 4, diff --git a/src/apps/com.taobao.idlefish.ts b/src/apps/com.taobao.idlefish.ts index eeeb1f99d..67f6a17df 100644 --- a/src/apps/com.taobao.idlefish.ts +++ b/src/apps/com.taobao.idlefish.ts @@ -58,10 +58,12 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', activityIds: '.maincontainer.activity.MainActivity', - matches: 'WebView[text="夜市氛围弹框"] > [id="root"] >3 TextView', + matches: + '@[clickable=true][width<200] <<(4,6) View[id="root"] <<(5,8) [vid="fish_layer_container_id"]', snapshotUrls: [ 'https://i.gkd.li/i/23694103', 'https://i.gkd.li/i/23183586', + 'https://i.gkd.li/i/25796344', ], }, { @@ -70,7 +72,7 @@ export default defineGkdApp({ activityIds: 'com.taobao.idlefish.search_implement.SearchResultActivity', matches: - '@TextView[width<250 && height<250] - [childCount=0][text="收下红包"] < [vid="confirm"][visibleToUser=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/25619592', // 未打勾_纯手拍快照 + 'https://i.gkd.li/i/25620240', // 未打勾 + ], }, { - key: 1, - preKeys: 0, - activityIds: 'com.taobao.login4android.scan.QrScanActivity', - matches: '[text="同意"][visibleToUser=true]', - snapshotUrls: ['https://i.gkd.li/i/20239322'], + key: 1, // 目的跟key0一样，只不过以弹窗的形式出现 + matches: [ + '[text="服务协议及隐私保护"]', + '[text="同意"][clickable=true]', + ], + snapshotUrls: 'https://i.gkd.li/i/25620304', + }, + { + key: 2, + matches: [ + '[text="扫码登录"]', + '[text="确认登录"][clickable=true][visibleToUser=true]', + ], + snapshotUrls: [ + 'https://i.gkd.li/i/25619659', // 旧版,无需打勾 + 'https://i.gkd.li/i/25620267', // 已打勾(节点状态无变化) + ], }, ], }, diff --git a/src/apps/com.taobao.taobao.ts b/src/apps/com.taobao.taobao.ts index 8249f6a63..b1f2311d5 100644 --- a/src/apps/com.taobao.taobao.ts +++ b/src/apps/com.taobao.taobao.ts @@ -140,12 +140,13 @@ export default defineGkdApp({ 'com.taobao.tao.TBMainActivity', ], matches: - '@[clickable=true][childCount=0][width<150 && height<150][index=parent.childCount.minus(1)] -n TextView[text.length>0] (1,3) [childCount!=null][text$="用" || text$="收下" || text*="立减"] < Image[text.length>40] + Button[text="关闭"]', + snapshotUrls: 'https://i.gkd.li/i/26164501', + }, ], }, { key: 3, - name: '局部广告-悬浮/卡片广告', - desc: '关闭各种悬浮或卡片广告', + name: '局部广告-悬浮/卡片/横幅广告', + desc: '关闭各种悬浮/卡片/横幅广告', rules: [ { key: 0, @@ -216,6 +223,31 @@ export default defineGkdApp({ '@FrameLayout[desc="关闭"][clickable=true] < [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 2a0f695ef..7d44d5c4b 100644 --- a/src/apps/com.tencent.mm.ts +++ b/src/apps/com.tencent.mm.ts @@ -136,15 +136,16 @@ export default defineGkdApp({ key: 0, name: 'PC 微信扫码登录', matches: [ - '[text="登录 Windows 微信" || text="登入 微信 for Windows" || text^="Log in to Weixin for"][visibleToUser=true]', + '[text^="登录 Win" || text^="登录桌面" || text^="登入 WeChat" || text^="Log in to Weixin for"][visibleToUser=true]', '[text="登录" || text="登入" || text="Log In"][visibleToUser=true]', ], snapshotUrls: [ 'https://i.gkd.li/import/13522625', // activityIds: 'com.tencent.mm.plugin.webwx.ui.ExtDeviceWXLoginUI' 'https://i.gkd.li/import/13522577', // activityIds: 'com.tencent.mm.ui.LauncherUI' 'https://i.gkd.li/i/19399694', - 'https://i.gkd.li/i/22356438', - 'https://i.gkd.li/i/25315046', //zh_TW + '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 ], }, { @@ -262,10 +263,11 @@ export default defineGkdApp({ '.plugin.luckymoney.ui.LuckyMoneyNewReceiveUI', ], matches: - '@Button[desc="开" || desc="開"] -3 LinearLayout >2 [text$="红包" || text$="紅包"]', + '@Button[desc="开" || desc="開"] -(2,3) LinearLayout >2 [text$="红包" || text$="紅包"]', snapshotUrls: [ 'https://i.gkd.li/i/18134828', 'https://i.gkd.li/i/21177180', + 'https://i.gkd.li/i/25901145', 'https://i.gkd.li/i/25315061', //zh_TW ], excludeSnapshotUrls: 'https://i.gkd.li/i/12567698', // 金币动画的快照 @@ -646,7 +648,7 @@ export default defineGkdApp({ key: 0, name: '点击[X]-1', matches: - 'View[childCount>=2] >n [name$="View"][desc.length>=1] - View[desc$="推​荐​" || desc$="推​薦​"][childCount>=2] > ImageView[clickable=true][visibleToUser=true][index=parent.childCount.minus(1)][width<100&&height<100][clickable=true]', + 'View[childCount>=2][desc!="发现"] >n [name$="View"][desc.length>=1][desc!="发现"] - View[desc$="推​荐​" || desc$="推​薦​"][childCount>=2][desc!="发现"] > ImageView[clickable=true][visibleToUser=true][index=parent.childCount.minus(1)][width<100&&height<100][clickable=true]', snapshotUrls: [ 'https://i.gkd.li/i/14436176', 'https://i.gkd.li/i/14392392', diff --git a/src/apps/com.twitter.android.ts b/src/apps/com.twitter.android.ts index 07fd31b24..0f74da654 100644 --- a/src/apps/com.twitter.android.ts +++ b/src/apps/com.twitter.android.ts @@ -56,9 +56,9 @@ export default defineGkdApp({ { preKeys: [0, 1, 2], key: 10, - name: '点击屏蔽', + name: '点击屏蔽/隐藏,如果机会全用完需要取消遍再屏蔽', matches: - '@ViewGroup > [id="com.twitter.android:id/action_sheet_item_title"][text^="屏蔽"||text^="Block"||text^="封鎖"||text^="隐藏 @"||text^="Hide @"][visibleToUser=true]', + '@ViewGroup > [id="com.twitter.android:id/action_sheet_item_title"][text^="屏蔽"||text^="Block"||text^="隐藏 @"||text^="Mute @"||text^="Unblock @"||text^="Unmute @"]', snapshotUrls: [ 'https://i.gkd.li/import/12798810', 'https://i.gkd.li/i/14782902', @@ -69,7 +69,10 @@ export default defineGkdApp({ 'https://i.gkd.li/i/20034038', // 封鎖 'https://i.gkd.li/i/20239421', 'https://i.gkd.li/i/24359537', - 'https://i.gkd.li/i/25089665', + 'https://i.gkd.li/i/25089665', // 屏蔽已用 + 'https://i.gkd.li/i/25461007', // 隐藏已用 + 'https://i.gkd.li/i/25461077', // En-Mute + 'https://i.gkd.li/i/25461050', // En-Unmute ], }, { @@ -77,12 +80,13 @@ export default defineGkdApp({ key: 11, name: '二次确认-点击屏蔽', matches: - '[text="取消"||text^="Cancel"] + [text="屏蔽"||text^="Block"||text^="封鎖"||text="是的，我确定"||text^="Yes"]', + '[text="取消"||text^="Cancel"] + [text="屏蔽"||text^="Block"||text="是的，我确定"||text^="Yes"||text^="屏蔽"||text^="Mute"||text^="Unmute"]', snapshotUrls: [ 'https://i.gkd.li/import/12828832', // com.twitter.tweetdetail.TweetDetailActivity 'https://i.gkd.li/import/12904601', // com.twitter.app.profiles.ProfileActivity 'https://i.gkd.li/import/13680798', // 兼容英文 'https://i.gkd.li/i/25089666', + 'https://i.gkd.li/i/25461062', // En-Unmute ], }, ], @@ -105,14 +109,27 @@ export default defineGkdApp({ { key: 6, name: '功能类-自动点击翻译', - desc: '点击推文下方的"翻译"按钮', enable: false, - fastQuery: true, - activityIds: 'com.twitter.tweetdetail.TweetDetailActivity', - rules: '[vid="translation_link"][text^="翻译"]', - snapshotUrls: [ - 'https://i.gkd.li/i/14189817', - 'https://i.gkd.li/i/14615911', + rules: [ + { + fastQuery: true, + actionCd: 2000, //防止[译文]节点未加载完导致重复点击 [翻译] + activityIds: 'com.twitter.tweetdetail.TweetDetailActivity', + matches: + '[vid="translation_link" || vid="grok_translation_link"][clickable=true][index=parent.childCount.minus(1)]', + exampleUrls: [ + 'https://e.gkd.li/ced46989-9c6a-4626-b027-7953e0fdc2c6', + 'https://m.gkd.li/57941037/40ece44f-883f-429a-aa0c-17dac15a50e4', + ], + snapshotUrls: [ + 'https://i.gkd.li/i/14189817', + 'https://i.gkd.li/i/14615911', + 'https://i.gkd.li/i/25537171', + 'https://i.gkd.li/i/25461468', + 'https://i.gkd.li/i/25461607', // Grok translate + ], + excludeSnapshotUrls: 'https://i.gkd.li/i/25537171', // 已翻译, 加 [index=parent.childCount.minus(1)] 排除 + }, ], }, { diff --git a/src/apps/com.xunmeng.pinduoduo.ts b/src/apps/com.xunmeng.pinduoduo.ts index 509316877..bc35654fe 100644 --- a/src/apps/com.xunmeng.pinduoduo.ts +++ b/src/apps/com.xunmeng.pinduoduo.ts @@ -15,9 +15,16 @@ export default defineGkdApp({ rules: [ { key: 1, - activityIds: '.ui.activity.HomeActivity', - matches: '@Image[clickable=true][text="webp"] +5 [text="立即升级"]', - snapshotUrls: 'https://i.gkd.li/i/13195645', + activityIds: [ + '.ui.activity.HomeActivity', + '.ui.activity.MainFrameActivity', + ], + matches: '@Image[clickable=true] +5 [text="立即升级"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13195645', + 'https://i.gkd.li/i/23936506', + 'https://i.gkd.li/i/24786015', + ], }, ], }, @@ -35,8 +42,10 @@ export default defineGkdApp({ '.ui.activity.HomeActivity', '.ui.activity.MainFrameActivity', ], + excludeMatches: + '[text="我的订单" || text="聊天"][bottom<500][visibleToUser=true]', matches: - '[text="开心收下" || text="去抢购" || text="立即抽免单" || text="去刮奖" || text="立即领取" || text="去领大额金币" || text="送你大额现金" || text*="红包助手" || text="刮刮卡发来的消息通知"][visibleToUser=true]', + '[text="开心收下" || text="去抢购" || text="立即抽免单" || text="去刮奖" || text="立即领取" || text="去领大额金币" || text="送你大额现金" || text*="红包助手" || text="刮刮卡发来的消息通知" || text="立即充值" || text="打款金额"][top>600][visibleToUser=true]', snapshotUrls: [ 'https://i.gkd.li/i/13625441', 'https://i.gkd.li/i/13761182', @@ -50,12 +59,17 @@ export default defineGkdApp({ 'https://i.gkd.li/i/17564786', 'https://i.gkd.li/i/17585645', 'https://i.gkd.li/i/17625608', + 'https://i.gkd.li/i/18481318', + ], + excludeSnapshotUrls: [ + 'https://i.gkd.li/i/23352586', + 'https://i.gkd.li/i/23607429', ], }, { key: 4, fastQuery: true, - activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity', + activityIds: '.ui.activity.HomeActivity', matches: '@ViewGroup[clickable=true] - ViewGroup[childCount=3] >2 [text="其他"]', snapshotUrls: 'https://i.gkd.li/i/15103543', @@ -63,7 +77,7 @@ export default defineGkdApp({ { key: 5, fastQuery: true, - activityIds: 'com.xunmeng.pinduoduo.activity.NewPageMaskActivity', + activityIds: '.activity.NewPageMaskActivity', matches: [ '[text="继续拼单"]', '@[clickable=true] > [text="先去逛逛"]', @@ -73,23 +87,15 @@ export default defineGkdApp({ 'https://i.gkd.li/i/15211473', ], }, - { - key: 6, - activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity', - matches: '[text="上滑看视频得现金"] - [text="webp"]', - snapshotUrls: 'https://i.gkd.li/i/13809053', - }, { key: 7, - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', activityIds: [ '.ui.activity.HomeActivity', '.ui.activity.MainFrameActivity', ], matches: 'ImageView[childCount=0][width<130&&height<130] < ViewGroup[childCount=1] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] <(1,2) ViewGroup <(1,2) ViewGroup < ViewGroup < FrameLayout < FrameLayout < FrameLayout < FrameLayout < FrameLayout <(1,2,3) [parent=null]', + exampleUrls: 'https://e.gkd.li/f74b5f58-e518-4e33-bbb4-0bf28e2b79d8', snapshotUrls: [ 'https://i.gkd.li/i/17528782', 'https://i.gkd.li/i/17655498', @@ -117,13 +123,27 @@ export default defineGkdApp({ '@ImageView[index=0][vid="pdd"][childCount=0][visibleToUser=true][width<120&&height<120] < RelativeLayout[childCount=2] < FrameLayout[childCount=1] < FrameLayout[childCount=1] < [parent=null]', snapshotUrls: 'https://i.gkd.li/i/18375615', }, + { + key: 10, + activityIds: '.activity.NewPageActivity', + matches: '[desc="关闭按钮"]', + snapshotUrls: 'https://i.gkd.li/i/23383792', + }, + { + key: 11, + fastQuery: true, + activityIds: '.ui.activity.HomeActivity', + matches: + '@ViewGroup[width<86 && height<86][clickable=true][focusable=true][clickable=true] + ViewGroup [text="元"]', + snapshotUrls: 'https://i.gkd.li/i/25572172', + }, ], }, { key: 6, name: '局部广告-悬浮广告', desc: '关闭各种悬浮广告', - activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity', + activityIds: '.ui.activity.HomeActivity', rules: [ { key: 0, @@ -139,11 +159,16 @@ export default defineGkdApp({ }, { key: 2, - activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity', matches: 'RelativeLayout[childCount=2] > RelativeLayout[vid="pdd"] + @FrameLayout[childCount=1][clickable=true][visibleToUser=true][text=null][vid="pdd"] > ImageView[childCount=0][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/15140800', }, + { + key: 3, + name: '多多视频金币提示', + matches: '[text^="看5分钟视频"] -2 Image', + snapshotUrls: 'https://i.gkd.li/i/25088623', + }, ], }, { @@ -153,7 +178,7 @@ export default defineGkdApp({ rules: [ { fastQuery: true, - activityIds: 'com.xunmeng.pinduoduo.activity.NewPageActivity', + activityIds: '.activity.NewPageActivity', matches: '[vid="iv_float_window_close"]', snapshotUrls: 'https://i.gkd.li/i/14549415', }, @@ -167,7 +192,7 @@ export default defineGkdApp({ fastQuery: true, matchTime: 10000, actionMaximum: 1, - activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity', + activityIds: '.ui.activity.HomeActivity', rules: [ { key: 0, @@ -195,7 +220,7 @@ export default defineGkdApp({ desc: '点击返回自动刷新，从而跳过广告', enable: false, fastQuery: true, - activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity', + activityIds: '.ui.activity.HomeActivity', rules: [ { key: 0, @@ -223,8 +248,7 @@ export default defineGkdApp({ fastQuery: true, rules: [ { - activityIds: - 'com.xunmeng.pinduoduo.app_album.album.MultiImageSelectorActivity', + activityIds: '.app_album.album.MultiImageSelectorActivity', matches: '@[text="原图"][checked=false] + [text="发送"]', snapshotUrls: [ 'https://i.gkd.li/i/13925378', // checked=false @@ -241,17 +265,18 @@ export default defineGkdApp({ rules: [ { key: 0, - name: '邀请好友弹窗', activityIds: [ - 'com.xunmeng.pinduoduo.activity.NewPageMaskActivity', - 'com.xunmeng.pinduoduo.ui.activity.HomeActivity', + '.activity.NewPageMaskActivity', + '.ui.activity.HomeActivity', ], - matches: 'Button[text="关闭弹窗"][clickable=true]', + action: 'clickCenter', + matches: 'Button[text="关闭弹窗" || desc="关闭弹窗"][clickable=true]', snapshotUrls: [ 'https://i.gkd.li/i/13927594', 'https://i.gkd.li/i/14434154', 'https://i.gkd.li/i/14456017', 'https://i.gkd.li/i/13308175', + 'https://i.gkd.li/i/23256823', ], }, ], @@ -306,7 +331,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { - activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity', + activityIds: '.ui.activity.HomeActivity', matches: ['[text="个性化推荐未开启"]', '[text="取消"]'], snapshotUrls: 'https://i.gkd.li/i/14964851', }, diff --git a/src/apps/com.zhihu.android.ts b/src/apps/com.zhihu.android.ts index 56a92b34d..b172b2c89 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.ShortContainerHostActivity', + '.feature.short_container_feature.ui', '.ContentActivity', ], matches: @@ -29,6 +29,7 @@ export default defineGkdApp({ 'https://i.gkd.li/i/14206949', 'https://i.gkd.li/i/14206988', 'https://i.gkd.li/i/18008867', + 'https://i.gkd.li/i/25572259', ], excludeSnapshotUrls: [ 'https://i.gkd.li/i/17002118', diff --git a/src/apps/tv.danmaku.bili.ts b/src/apps/tv.danmaku.bili.ts index 0196c1d97..1eb2b64d2 100644 --- a/src/apps/tv.danmaku.bili.ts +++ b/src/apps/tv.danmaku.bili.ts @@ -123,10 +123,14 @@ export default defineGkdApp({ key: 51, name: '点击关闭', fastQuery: true, - matches: '[vid="close_dislike"]', + anyMatches: [ + '[vid="close_dislike"][visibleToUser=true]', + '@[text="关闭"][clickable=true] -n * <<(2,4) [name$="ComposeView" || name$="FrameLayout"]