From ec8cfa20a2e90dcceb6254bd4e5a3a846a5a32d7 Mon Sep 17 00:00:00 2001 From: AIsouler Date: Thu, 5 Dec 2024 23:25:12 +0800 Subject: [PATCH] perf: some rules --- src/appDeprecatedKeys.ts | 45 +++++- src/apps/client.android.yixiaotong.ts | 2 +- src/apps/com.UCMobile.ts | 23 ++- src/apps/com.duoduo.cimoc.su.ts | 2 +- src/apps/com.feiyu.morin.ts | 2 +- src/apps/com.klcxkj.zqxy.ts | 2 +- src/apps/com.p1.mobile.putong.ts | 9 +- src/apps/com.panaceasoft.pswallpaper.ts | 12 +- src/apps/com.pandabus.android.zb.ts | 8 +- src/apps/com.paokeji.yiqu.ts | 2 + src/apps/com.pcs.knowing_weather.ts | 18 --- src/apps/com.picacomic.fregata.ts | 13 +- src/apps/com.ping.cimoc.ts | 15 +- src/apps/com.pleasure.trace_wechat.ts | 18 ++- src/apps/com.pmph.irenwei.ts | 7 +- src/apps/com.pywm.fund.ts | 23 --- src/apps/com.qcymall.earphonesetup.ts | 13 +- src/apps/com.qidian.QDReader.ts | 148 +++++++++++------- src/apps/com.qiekj.user.ts | 1 + src/apps/com.qihoo.camera.ts | 5 +- src/apps/com.qihoo.srouter.n300.ts | 11 +- src/apps/com.qingdaonews.bus.ts | 2 +- src/apps/com.qingwatq.weather.ts | 1 + src/apps/com.qinlin.edoor.ts | 45 +++--- src/apps/com.qiyi.video.lite.ts | 8 +- src/apps/com.qiyi.video.ts | 43 +++-- src/apps/com.qjy.youqulife.io.ts | 8 +- src/apps/com.qq.ac.android.ts | 12 +- src/apps/com.qq.reader.ts | 4 +- src/apps/com.quark.browser.ts | 38 ++--- src/apps/com.quqi.quqioffice.ts | 22 +-- src/apps/com.rarlab.rar.ts | 20 ++- src/apps/com.realmecomm.app.ts | 4 +- src/apps/com.realtech.xiaocan.ts | 19 ++- src/apps/com.reddit.frontpage.ts | 4 +- src/apps/com.redfinger.app.ts | 16 +- src/apps/com.rocoplayer.app.nm.ts | 17 +- src/apps/com.romielf.mrsc.ts | 7 +- src/apps/com.rytong.hnair.ts | 13 +- .../com.samsung.android.packageinstaller.ts | 11 +- ...om.sankuai.meituan.dispatch.crowdsource.ts | 2 +- src/apps/com.sankuai.meituan.takeoutnew.ts | 22 ++- src/apps/com.sankuai.meituan.ts | 47 ++++-- src/apps/com.sankuai.movie.ts | 22 --- src/apps/com.schunshang.bij.niuniu.ts | 3 + src/apps/com.sdhs.easy.high.road.ts | 7 +- src/apps/com.sdu.didi.gsui.ts | 4 +- src/apps/com.sdu.didi.psnger.ts | 2 + src/apps/com.sec.android.app.samsungapps.ts | 2 +- src/apps/com.seebaby.ts | 17 +- src/apps/com.sf.activity.ts | 5 +- src/apps/com.sgcc.evs.echarge.ts | 11 +- src/apps/com.sgcc.wsgw.cn.ts | 15 +- src/apps/com.shangfang.gylm.ts | 11 +- src/apps/com.shanghaionstar.ts | 8 +- src/apps/com.shark.jizhang.ts | 30 +++- src/apps/com.shinyv.cnr.ts | 3 + src/apps/com.shizhuang.duapp.ts | 18 ++- src/apps/com.showstartfans.activity.ts | 5 +- src/apps/com.shuqi.controller.ts | 27 +++- src/apps/com.sina.oasis.ts | 2 +- src/apps/com.sina.weibo.ts | 90 ++++++++--- src/apps/com.sina.weibocare.ts | 12 +- src/apps/com.sina.weibolite.ts | 9 +- src/apps/com.sinovatech.unicom.ui.ts | 37 +++-- src/apps/com.sjm.xiaodesecond.mw.ts | 3 + src/apps/com.sjm.zhuanzhuan.mcy.ts | 5 +- src/apps/com.sjmly.sjmtask.xsh.ts | 3 + src/apps/com.smile.gifmaker.ts | 14 +- src/apps/com.smk.ts | 20 ++- src/apps/com.smzdm.client.android.ts | 56 +++++-- src/apps/com.snda.wifilocating.ts | 4 +- src/apps/com.sobo.app.ts | 3 + src/apps/com.sodalife.sodax.ts | 3 + src/apps/com.soft.blued.ts | 7 +- src/apps/com.sohu.sohuvideo.ts | 11 +- src/apps/com.sqsp.movie.ts | 3 + src/apps/com.ss.android.article.lite.ts | 75 --------- src/apps/com.ss.android.article.news.ts | 24 +-- src/apps/com.ss.android.article.video.ts | 31 +++- src/apps/com.ss.android.auto.ts | 116 ++++++++------ src/apps/com.ss.android.lark.ts | 30 ++-- src/apps/com.ss.android.ugc.aweme.lite.ts | 32 ++-- src/apps/com.ss.android.ugc.aweme.ts | 104 +++++++----- src/apps/com.ss.android.yumme.video.ts | 2 + src/apps/com.steampy.app.ts | 11 +- src/apps/com.sup.android.superb.ts | 49 ++++-- src/apps/com.svm.hbyy.ts | 3 + src/apps/com.taobao.etao.ts | 17 +- src/apps/com.taobao.htao.android.ts | 4 +- src/apps/com.taobao.idlefish.ts | 49 ++++-- src/apps/com.taobao.litetao.ts | 26 ++- src/apps/com.taobao.taobao.ts | 109 +++++++------ src/apps/com.taptap.ts | 14 +- src/apps/com.tencent.androidqqmail.ts | 13 +- src/apps/com.tencent.cmocmna.ts | 33 ++-- src/apps/com.tencent.djcity.ts | 7 +- src/apps/com.tencent.docs.ts | 40 +++-- src/apps/com.tencent.karaoke.ts | 5 +- src/apps/com.tencent.mm.ts | 79 ++++++---- src/apps/com.tencent.mobileqq.ts | 88 ++++++----- src/apps/com.tencent.news.ts | 16 +- src/apps/com.tencent.qqlive.ts | 19 ++- src/apps/com.tencent.qqmusic.ts | 7 +- src/apps/com.tencent.qt.qtl.ts | 13 +- src/apps/com.tencent.qt.sns.ts | 24 +-- src/apps/com.tencent.wemeet.app.ts | 12 +- src/apps/com.tencent.weread.ts | 5 + src/apps/com.thestore.main.ts | 11 +- src/apps/com.tianqi2345.ts | 8 +- src/apps/com.tima.carnet.m.main.ts | 48 ++++-- src/apps/com.tipsoon.android.ts | 5 +- src/apps/com.tmall.wireless.ts | 56 ++++--- src/apps/com.tmri.app.main.ts | 5 + src/apps/com.tongcheng.android.ts | 2 +- src/apps/com.tt.turbo.ts | 9 +- src/apps/com.tuying.kuimg.rjm.ts | 12 +- src/apps/com.twitter.android.ts | 36 +++-- src/apps/com.ukids.client.phone.ts | 7 +- src/apps/com.umetrip.android.msky.app.ts | 44 +++--- src/apps/com.unionpay.ts | 35 +---- src/apps/com.upupoo.apu.mobile.ts | 15 +- src/apps/com.uroad.carclub.ts | 3 +- src/apps/com.vehicles.activities.ts | 2 +- src/apps/com.videogo.ts | 3 +- src/apps/com.viva.note.ts | 18 +-- src/apps/com.viva.time_todo.ts | 6 +- src/apps/com.viva.timeplan.p5.ts | 3 + src/apps/com.vivo.browser.ts | 11 +- src/apps/com.vivo.space.ts | 18 ++- src/apps/com.vivo.wallet.ts | 3 +- src/apps/com.vmos.pro.ts | 13 +- src/apps/com.vo.icea.ts | 13 +- src/apps/com.vphonegaga.titan.ts | 16 +- src/apps/com.wacai365.ts | 30 +++- src/apps/com.wallstreetcn.news.ts | 4 +- src/apps/com.wan.tools.ts | 38 +++-- src/apps/com.weaver.emobile7.ts | 22 --- src/apps/com.wenhua.bamboo.ts | 1 + src/apps/com.wepie.ivy.ts | 6 +- src/apps/com.whpe.qrcode.hunan_xiangtan.ts | 4 +- src/apps/com.wibo.bigbang.ocr.ts | 4 +- src/apps/com.wifitutu.ts | 13 +- src/apps/com.wisedu.cpdaily.ts | 11 +- src/apps/com.wisentsoft.chinapost.android.ts | 12 +- src/apps/com.wm.dmall.ts | 75 +++++---- src/apps/com.wn.app.bl.ts | 3 +- src/apps/com.woapp.hebei.ts | 17 -- src/apps/com.wondertek.paper.ts | 9 +- src/apps/com.wuba.zhuanzhuan.ts | 19 ++- src/apps/com.wujie.connect.ts | 10 +- src/apps/com.wzwh.bzpaipan.ts | 14 +- src/apps/com.x.istar.ts | 14 +- src/apps/com.x2era.xcloud.app.ts | 7 +- src/apps/com.xfani.app.ts | 17 +- src/apps/com.xiachufang.ts | 21 ++- src/apps/com.xiaoe.client.ts | 3 +- src/apps/com.xiaoenai.app.ts | 26 ++- src/apps/com.xiaofeiji.app.disk.ts | 8 +- src/apps/com.xiaohu.olevodmobile.ts | 10 +- src/apps/com.xiaolan.tv.chat.ts | 1 + src/apps/com.xiaolian.prometheus.ts | 26 ++- src/apps/com.xiaomi.account.ts | 17 -- src/apps/com.xiaomi.gamecenter.sdk.service.ts | 9 +- src/apps/com.xiaomi.gamecenter.ts | 12 +- src/apps/com.xiaomi.hm.health.ts | 12 +- src/apps/com.xiaomi.market.ts | 30 ++-- src/apps/com.xiaomi.mico.ts | 19 ++- src/apps/com.xiaomi.scanner.ts | 12 +- src/apps/com.xiaomi.smarthome.ts | 14 +- src/apps/com.xiaomi.vipaccount.ts | 46 ++++-- src/apps/com.xiaomi.youpin.ts | 1 + src/apps/com.xiaoxiongyhh.ts | 4 +- src/apps/com.xifeng.fun.ts | 1 + src/apps/com.ximalaya.ting.android.ts | 122 ++++++++------- src/apps/com.ximalaya.ting.lite.ts | 47 ++++-- src/apps/com.xingin.xhs.ts | 12 +- src/apps/com.xingluo.allcolor.ts | 24 ++- src/apps/com.xingye.app.ts | 11 +- src/apps/com.xinhang.mobileclient.ts | 16 +- src/apps/com.xmcy.hykb.ts | 30 ++-- src/apps/com.xsj.app.ts | 9 +- src/apps/com.xt.retouch.ts | 9 +- src/apps/com.xtc.watch.ts | 2 + src/apps/com.xtuone.android.syllabus.ts | 46 ++++-- src/apps/com.xuexiaoyi.xxy.ts | 24 +-- src/apps/com.xunlei.downloadprovider.ts | 46 +++--- src/apps/com.xunmeng.pinduoduo.ts | 7 + src/apps/com.xyhui.ts | 35 +++-- src/apps/com.yaerxing.fkst.ts | 22 --- src/apps/com.yek.android.uniqlo.ts | 14 +- src/apps/com.ygkj.chelaile.standard.ts | 1 + src/apps/com.yikaobang.yixue.ts | 2 +- src/apps/com.yitong.mbank.psbc.ts | 40 +++-- src/apps/com.yoloho.dayima.ts | 3 + src/apps/com.youdao.dict.ts | 39 +++-- src/apps/com.youdao.note.ts | 2 +- src/apps/com.youdao.translator.ts | 7 +- src/apps/com.youku.phone.ts | 13 +- src/apps/com.youloft.calendar.ts | 2 +- src/apps/com.youloft.icloser.ts | 24 ++- src/apps/com.yujian.ResideMenuDemo.ts | 10 +- src/apps/com.yunxiang.wuyu.ts | 11 +- src/apps/com.yunzhi.tiyu.ts | 32 ++-- src/apps/com.yuque.mobile.android.app.ts | 8 +- src/apps/com.zdbq.ljtq.ljweather.ts | 24 --- src/apps/com.zhaopin.social.ts | 44 ------ src/apps/com.zhengnengliang.precepts.ts | 12 -- src/apps/com.zhihu.android.ts | 7 +- src/apps/com.zhiwei.rjm.ts | 7 +- src/apps/com.zhiyin.qingdan.dashixiong.ts | 10 +- src/apps/com.zivn.cloudbrush3.ts | 6 +- src/apps/com.zmsoft.forwatch.ts | 8 +- src/apps/com.zmzx.college.search.ts | 33 ++-- src/apps/com.zuoyebang.knowledge.ts | 19 ++- src/apps/com.zzw.october.ts | 10 +- 216 files changed, 2473 insertions(+), 1654 deletions(-) delete mode 100644 src/apps/com.pcs.knowing_weather.ts delete mode 100644 src/apps/com.pywm.fund.ts delete mode 100644 src/apps/com.sankuai.movie.ts delete mode 100644 src/apps/com.ss.android.article.lite.ts delete mode 100644 src/apps/com.weaver.emobile7.ts delete mode 100644 src/apps/com.woapp.hebei.ts delete mode 100644 src/apps/com.xiaomi.account.ts delete mode 100644 src/apps/com.yaerxing.fkst.ts delete mode 100644 src/apps/com.zdbq.ljtq.ljweather.ts delete mode 100644 src/apps/com.zhaopin.social.ts diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts index 38310bc2..4e7ff6e3 100644 --- a/src/appDeprecatedKeys.ts +++ b/src/appDeprecatedKeys.ts @@ -460,12 +460,12 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ { id: 'com.ss.android.ugc.aweme', name: '抖音', - deprecatedKeys: [0, 2], + deprecatedKeys: [0, 2, 5], }, { id: 'com.taobao.taobao', name: '淘宝', - deprecatedKeys: [0], + deprecatedKeys: [0, 10, 11], }, { id: 'com.taptap', @@ -535,7 +535,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ { id: 'com.unionpay', name: '云闪付', - deprecatedKeys: [11], + deprecatedKeys: [1, 11, 14], }, { id: 'com.netease.newsreader.activity', @@ -570,7 +570,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ { id: 'com.ximalaya.ting.android', name: '喜马拉雅', - deprecatedKeys: [9], + deprecatedKeys: [6, 9], }, { id: 'com.zjwh.android_wh_physicalfitness', @@ -720,7 +720,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ { id: 'com.umetrip.android.msky.app', name: '航旅纵横', - deprecatedKeys: [8], + deprecatedKeys: [8, 9], }, { id: 'cn.mil.junhao', @@ -792,6 +792,41 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ name: 'youtube', deprecatedKeys: [2], }, + { + id: 'com.qinlin.edoor', + name: '亲邻开门', + deprecatedKeys: [10, 11, 12], + }, + { + id: 'com.quark.browser', + name: '夸克浏览器', + deprecatedKeys: [0], + }, + { + id: 'com.taobao.etao', + name: '一淘', + deprecatedKeys: [1], + }, + { + id: 'com.wm.dmall', + name: '多点', + deprecatedKeys: [4], + }, + { + id: 'com.ximalaya.ting.lite', + name: '喜马拉雅极速版', + deprecatedKeys: [0], + }, + { + id: 'com.yunzhi.tiyu', + name: '云运动', + deprecatedKeys: [1], + }, + { + id: 'com.zhengnengliang.precepts', + name: '正气', + deprecatedKeys: [1], + }, ]; const map: Map = new Map(); diff --git a/src/apps/client.android.yixiaotong.ts b/src/apps/client.android.yixiaotong.ts index 3071db2d..0dfca976 100644 --- a/src/apps/client.android.yixiaotong.ts +++ b/src/apps/client.android.yixiaotong.ts @@ -65,7 +65,7 @@ export default defineGkdApp({ key: 2, fastQuery: true, matches: - '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]', + '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序"]', exampleUrls: 'https://m.gkd.li/57941037/ad8a1bbf-61b5-4a7e-8e16-5e0092f04b8c', snapshotUrls: 'https://i.gkd.li/i/14469848', diff --git a/src/apps/com.UCMobile.ts b/src/apps/com.UCMobile.ts index bd05943e..30c658d6 100644 --- a/src/apps/com.UCMobile.ts +++ b/src/apps/com.UCMobile.ts @@ -69,18 +69,25 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '@ImageView - LinearLayout >n [text="开启消息通知"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12880812', - 'https://i.gkd.li/i/12880802', + rules: [ + { + activityIds: 'com.uc.browser.InnerUCMobile', + matches: '@ImageView - LinearLayout >n [text="开启消息通知"]', + snapshotUrls: 'https://i.gkd.li/i/12880812', + }, ], }, { key: 11, - name: '功能类-请求添加桌面快捷方式权限弹窗', - activityIds: 'com.uc.browser.InnerUCMobile', - rules: '@ImageView + [text^="添加"][text$="到桌面"]', - snapshotUrls: 'https://i.gkd.li/i/12880983', + name: '其他-请求添加桌面快捷方式弹窗', + desc: '点击关闭', + rules: [ + { + activityIds: 'com.uc.browser.InnerUCMobile', + matches: '@ImageView + [text^="添加"][text$="到桌面"]', + snapshotUrls: 'https://i.gkd.li/i/12880983', + }, + ], }, ], }); diff --git a/src/apps/com.duoduo.cimoc.su.ts b/src/apps/com.duoduo.cimoc.su.ts index 8b2e8da9..dd39a8e7 100644 --- a/src/apps/com.duoduo.cimoc.su.ts +++ b/src/apps/com.duoduo.cimoc.su.ts @@ -44,7 +44,7 @@ export default defineGkdApp({ fastQuery: true, activityIds: 'com.duoduo.cimoc.su.MainActivity', matches: - '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]', + '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序"]', snapshotUrls: [ 'https://i.gkd.li/i/13999284', 'https://i.gkd.li/i/13999376', diff --git a/src/apps/com.feiyu.morin.ts b/src/apps/com.feiyu.morin.ts index f50ba069..667bd9d0 100644 --- a/src/apps/com.feiyu.morin.ts +++ b/src/apps/com.feiyu.morin.ts @@ -60,7 +60,7 @@ export default defineGkdApp({ 'com.feiyu.morin.view.main.PlayerBottomControlActivity', ], matches: - '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]', + '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序"]', snapshotUrls: [ 'https://i.gkd.li/i/13521680', 'https://i.gkd.li/i/13625476', diff --git a/src/apps/com.klcxkj.zqxy.ts b/src/apps/com.klcxkj.zqxy.ts index 639d55ba..d28fd921 100644 --- a/src/apps/com.klcxkj.zqxy.ts +++ b/src/apps/com.klcxkj.zqxy.ts @@ -64,7 +64,7 @@ export default defineGkdApp({ activityIds: 'com.klcxkj.zqxy.ui.device.drink.ble.DrinkingBleActivity', matches: - '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠"]', + '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序"]', snapshotUrls: 'https://i.gkd.li/i/13488870', }, ], diff --git a/src/apps/com.p1.mobile.putong.ts b/src/apps/com.p1.mobile.putong.ts index 233e0139..fc896805 100644 --- a/src/apps/com.p1.mobile.putong.ts +++ b/src/apps/com.p1.mobile.putong.ts @@ -8,12 +8,13 @@ export default defineGkdApp({ key: 2, name: '更新提示', desc: '点击[取消]', - matchTime: 10000, fastQuery: true, - resetMatch: 'app', + matchTime: 10000, actionMaximum: 1, + resetMatch: 'app', rules: [ { + activityIds: '.core.newui.main.NewMainAct', matches: '@[vid="buttonDefaultNeutral"][clickable=true] > [text="取消"]', exampleUrls: @@ -27,10 +28,12 @@ export default defineGkdApp({ name: '权限提示-通知权限', desc: '点击[暂不设置]', fastQuery: true, - resetMatch: 'app', + matchTime: 10000, actionMaximum: 1, + resetMatch: 'app', rules: [ { + activityIds: '.core.ui.seepage.likers.FakeLikersAct', matches: '[text="打开通知"] + [text="暂不设置"]', exampleUrls: 'https://m.gkd.li/57941037/137e9907-9767-4acf-b803-034182346ef3', diff --git a/src/apps/com.panaceasoft.pswallpaper.ts b/src/apps/com.panaceasoft.pswallpaper.ts index 3897c936..ea7fdb4b 100644 --- a/src/apps/com.panaceasoft.pswallpaper.ts +++ b/src/apps/com.panaceasoft.pswallpaper.ts @@ -11,9 +11,19 @@ export default defineGkdApp({ matchTime: 10000, resetMatch: 'app', actionMaximum: 1, + activityIds: '.xiao.MainActivity', rules: [ { - matches: ['[text="下一条"]', '[vid="iv_close"]'], + key: 0, + matches: '[vid="cb_ignore"][checked=false]', + exampleUrls: 'https://e.gkd.li/b92e4e94-fafc-47b1-9774-3126cfaed981', + snapshotUrls: 'https://i.gkd.li/i/14141561', + }, + { + preKeys: [0], + key: 1, + matches: '[vid="iv_close"][visibleToUser=true]', + exampleUrls: 'https://e.gkd.li/b92e4e94-fafc-47b1-9774-3126cfaed981', snapshotUrls: 'https://i.gkd.li/i/14141561', }, ], diff --git a/src/apps/com.pandabus.android.zb.ts b/src/apps/com.pandabus.android.zb.ts index cbc4dd96..e48dc576 100644 --- a/src/apps/com.pandabus.android.zb.ts +++ b/src/apps/com.pandabus.android.zb.ts @@ -11,8 +11,12 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.pandabus.android.zb:id/iv_native_dislike"]', - snapshotUrls: 'https://i.gkd.li/i/13400177', + rules: [ + { + matches: '[id="com.pandabus.android.zb:id/iv_native_dislike"]', + snapshotUrls: 'https://i.gkd.li/i/13400177', + }, + ], }, ], }); diff --git a/src/apps/com.paokeji.yiqu.ts b/src/apps/com.paokeji.yiqu.ts index b91e09ef..43571cea 100644 --- a/src/apps/com.paokeji.yiqu.ts +++ b/src/apps/com.paokeji.yiqu.ts @@ -40,6 +40,8 @@ export default defineGkdApp({ actionMaximum: 1, rules: [ { + activityIds: + 'com.aster.comic.app.view.bookdetails.BookdetailsActivity', matches: '[id="com.paokeji.yiqu:id/btnCancel"]', exampleUrls: 'https://m.gkd.li/57941037/2ce54292-bfc6-41c6-b2e5-e7d8302fc522', diff --git a/src/apps/com.pcs.knowing_weather.ts b/src/apps/com.pcs.knowing_weather.ts deleted file mode 100644 index 88911483..00000000 --- a/src/apps/com.pcs.knowing_weather.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { defineGkdApp } from '@gkd-kit/define'; - -export default defineGkdApp({ - id: 'com.pcs.knowing_weather', - name: '知天气-决策', - groups: [ - { - key: 1, - name: '更新提示', - fastQuery: true, - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - rules: '[text="立即升级"] +2 [text="以后再说"]', - snapshotUrls: 'https://i.gkd.li/i/13378992', // activityIds: 'com.huawei.android.launcher.unihome.UniHomeLauncher', - }, - ], -}); diff --git a/src/apps/com.picacomic.fregata.ts b/src/apps/com.picacomic.fregata.ts index 276c671d..1d1e26af 100644 --- a/src/apps/com.picacomic.fregata.ts +++ b/src/apps/com.picacomic.fregata.ts @@ -31,7 +31,7 @@ export default defineGkdApp({ rules: [ { matches: - '[id="com.picacomic.fregata:id/button_dialog_announcement_negative"][text="確定"]', + '[id="com.picacomic.fregata:id/button_dialog_announcement_positive"]', exampleUrls: 'https://m.gkd.li/83610194/a5cbd7ce-79b4-49da-ba01-2b7db907d1f1', snapshotUrls: 'https://i.gkd.li/i/13422767', @@ -45,10 +45,9 @@ export default defineGkdApp({ fastQuery: true, matchTime: 10000, actionMaximum: 1, - resetMatch: 'activity', - activityIds: 'com.picacomic.fregata.activities.MainActivity', rules: [ { + activityIds: 'com.picacomic.fregata.activities.MainActivity', matches: '[id="com.picacomic.fregata:id/imageButton_banner_close"]', exampleUrls: 'https://m.gkd.li/83610194/92feb979-d75a-4ee5-a880-da2e4250d1e3', @@ -63,10 +62,11 @@ export default defineGkdApp({ fastQuery: true, matchTime: 10000, actionMaximum: 1, - resetMatch: 'activity', + resetMatch: 'app', activityIds: 'com.picacomic.fregata.activities.MainActivity', rules: [ { + key: 0, matches: '[id="com.picacomic.fregata:id/textView_profile_punch_in"][text="打嗶卡"]', exampleUrls: @@ -74,6 +74,8 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/13422844', }, { + preKeys: [0], + key: 1, matches: '[id="com.picacomic.fregata:id/button_dialog_custom_positive"][text="確定"]', exampleUrls: @@ -89,10 +91,9 @@ export default defineGkdApp({ fastQuery: true, matchTime: 10000, actionMaximum: 1, - resetMatch: 'activity', - activityIds: 'com.picacomic.fregata.activities.ComicViewerActivity', rules: [ { + activityIds: 'com.picacomic.fregata.activities.ComicViewerActivity', matches: 'RelativeLayout > Button[text="確定"][id="com.picacomic.fregata:id/button_dialog_custom_positive"]', snapshotUrls: 'https://i.gkd.li/i/13466492', diff --git a/src/apps/com.ping.cimoc.ts b/src/apps/com.ping.cimoc.ts index c68b0766..fb1b1c41 100644 --- a/src/apps/com.ping.cimoc.ts +++ b/src/apps/com.ping.cimoc.ts @@ -9,10 +9,17 @@ export default defineGkdApp({ name: '全屏广告-弹窗广告', desc: '点击关闭', fastQuery: true, - activityIds: 'com.ping.cimoc.ui.activity.MainActivity', - rules: - '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', - snapshotUrls: 'https://i.gkd.li/i/13187751', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.ping.cimoc.ui.activity.MainActivity', + matches: + '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', + snapshotUrls: 'https://i.gkd.li/i/13187751', + }, + ], }, ], }); diff --git a/src/apps/com.pleasure.trace_wechat.ts b/src/apps/com.pleasure.trace_wechat.ts index 33aa9dd0..d18079c5 100644 --- a/src/apps/com.pleasure.trace_wechat.ts +++ b/src/apps/com.pleasure.trace_wechat.ts @@ -13,13 +13,13 @@ export default defineGkdApp({ rules: [ { key: 0, - name: '点击"x"', + name: '点击关闭', matches: 'View < @FrameLayout[desc^="dislike"] < [id="com.byted.pangle:id/tt_item_tv"][text="不感兴趣"]', @@ -29,11 +29,15 @@ export default defineGkdApp({ }, { key: 11, - name: '全屏广告-"字节"弹窗广告', - activityIds: - 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', - rules: '[text="反馈"] -2 @View > Image', - snapshotUrls: 'https://i.gkd.li/i/13479468', + name: '全屏广告-弹窗广告', + rules: [ + { + activityIds: + 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', + matches: '[text="反馈"] -2 @View > Image', + snapshotUrls: 'https://i.gkd.li/i/13479468', + }, + ], }, ], }); diff --git a/src/apps/com.pmph.irenwei.ts b/src/apps/com.pmph.irenwei.ts index 059a011d..14eea938 100644 --- a/src/apps/com.pmph.irenwei.ts +++ b/src/apps/com.pmph.irenwei.ts @@ -6,9 +6,12 @@ export default defineGkdApp({ groups: [ { key: 1, - fastQuery: true, name: '全屏广告-抽奖弹窗', - desc: '点击X', + desc: '点击关闭', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { activityIds: 'com.pmph.main.ad.AdActivity', diff --git a/src/apps/com.pywm.fund.ts b/src/apps/com.pywm.fund.ts deleted file mode 100644 index 488d3585..00000000 --- a/src/apps/com.pywm.fund.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { defineGkdApp } from '@gkd-kit/define'; - -export default defineGkdApp({ - id: 'com.pywm.fund', - name: '普益基金', - groups: [ - { - key: 1, - name: '更新提示', - fastQuery: true, - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - rules: [ - { - matches: 'TextView[text="立即更新"]', - action: 'back', - snapshotUrls: 'https://i.gkd.li/i/13327271', - }, - ], - }, - ], -}); diff --git a/src/apps/com.qcymall.earphonesetup.ts b/src/apps/com.qcymall.earphonesetup.ts index bf6402e8..8feb4e1d 100644 --- a/src/apps/com.qcymall.earphonesetup.ts +++ b/src/apps/com.qcymall.earphonesetup.ts @@ -8,12 +8,15 @@ export default defineGkdApp({ key: 1, name: '局部广告-我的-卡片广告', fastQuery: true, - matchTime: 10000, - resetMatch: 'activity', - activityIds: 'com.qcymall.earphonesetup.v2ui.activity.V2MainActivity', actionMaximum: 1, - rules: '[vid="close_img_banner"]', - snapshotUrls: 'https://i.gkd.li/i/13874219', + resetMatch: 'app', + rules: [ + { + activityIds: 'com.qcymall.earphonesetup.v2ui.activity.V2MainActivity', + matches: '[vid="close_img_banner"]', + snapshotUrls: 'https://i.gkd.li/i/13874219', + }, + ], }, ], }); diff --git a/src/apps/com.qidian.QDReader.ts b/src/apps/com.qidian.QDReader.ts index 16eccb62..a3e4048e 100644 --- a/src/apps/com.qidian.QDReader.ts +++ b/src/apps/com.qidian.QDReader.ts @@ -13,13 +13,17 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + key: 1, + activityIds: '.framework.widget.dialog.judian', matches: '[text$="新版本"] +2 * >2 [id="com.qidian.QDReader:id/cancel"]', - snapshotUrls: ['https://i.gkd.li/i/12641026'], + snapshotUrls: 'https://i.gkd.li/i/12641026', }, { + key: 2, + activityIds: 'com.tencent.upgrade.ui.UpgradeDialogActivity', matches: '[id="com.qidian.QDReader:id/upgrade_dialog_close_btn"]', - snapshotUrls: ['https://i.gkd.li/i/13116821'], + snapshotUrls: 'https://i.gkd.li/i/13116821', }, ], }, @@ -29,64 +33,79 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - rules: - '[id="com.qidian.QDReader:id/btnEnterTeen"] + [id="com.qidian.QDReader:id/btnCancel"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12640241', - 'https://i.gkd.li/i/12709168', - 'https://i.gkd.li/i/12905817', - 'https://i.gkd.li/i/17879416', + rules: [ + { + activityIds: [ + '.bll.helper.z0', + '.ui.activity.MainGroupActivity', + '.framework.widget.dialog.judian', + ], + matches: '[vid="btnEnterTeen"] + [vid="btnCancel"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12640241', + 'https://i.gkd.li/i/12709168', + 'https://i.gkd.li/i/12905817', + 'https://i.gkd.li/i/17879416', + ], + }, ], }, { key: 3, name: '全屏广告-活动弹窗', - activityIds: [ - 'com.qidian.QDReader.ui.activity.MainGroupActivity', - 'com.tencent.mm.plugin.webview.ui.tools.SDKOAuthUI', - 'com.qidian.QDReader.framework.widget.dialog.judian', - 'com.qidian.QDReader.ui.activity.BookLastPageNewActivity', - ], - rules: - '[id="com.qidian.QDReader:id/imgBKT"] + [id="com.qidian.QDReader:id/imgClose"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12640195', - 'https://i.gkd.li/i/12640158', - 'https://i.gkd.li/i/12818198', - 'https://i.gkd.li/i/13469004', // .ui.activity.BookLastPageNewActivity + fastQuery: true, + rules: [ + { + activityIds: [ + 'com.qidian.QDReader.ui.activity.MainGroupActivity', + 'com.tencent.mm.plugin.webview.ui.tools.SDKOAuthUI', + 'com.qidian.QDReader.framework.widget.dialog.judian', + 'com.qidian.QDReader.ui.activity.BookLastPageNewActivity', + ], + matches: + '[id="com.qidian.QDReader:id/imgBKT"] + [id="com.qidian.QDReader:id/imgClose"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12640195', + 'https://i.gkd.li/i/12640158', + 'https://i.gkd.li/i/12818198', + 'https://i.gkd.li/i/13469004', + ], + }, ], }, { key: 4, name: '权限提示-通知权限', - desc: '点击顶部提醒左侧x按钮', + desc: '点击顶部提醒左侧关闭按钮', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '@[id="com.qidian.QDReader:id/ivClose"] + [text^="开启推送"]', - snapshotUrls: 'https://i.gkd.li/i/12640242', + rules: [ + { + activityIds: 'com.afollestad.materialdialogs.MaterialDialog', + matches: + '@[id="com.qidian.QDReader:id/ivClose"] + [text^="开启推送"]', + snapshotUrls: 'https://i.gkd.li/i/12640242', + }, + ], }, { key: 5, name: '局部广告-悬浮广告', rules: [ - { - key: 0, - name: '书架页面右侧悬浮广告', - activityIds: 'com.qidian.QDReader.ui.activity.MainGroupActivity', - fastQuery: true, - matches: - '[id="com.qidian.QDReader:id/ivAd"] + [id="com.qidian.QDReader:id/ivAdClose"]', - snapshotUrls: 'https://i.gkd.li/i/12717032', - }, { key: 1, - name: '详情页右侧悬浮广告', - activityIds: 'com.qidian.QDReader.ui.activity.QDBookDetailActivity', - matches: - '[id="com.qidian.QDReader:id/floatingView"] + [id="com.qidian.QDReader:id/ivAdClose"]', - snapshotUrls: 'https://i.gkd.li/i/13459031', + fastQuery: true, + activityIds: [ + 'com.qidian.QDReader.ui.activity.QDBookDetailActivity', + 'com.qidian.QDReader.ui.activity.MainGroupActivity', + ], + matches: '[id="com.qidian.QDReader:id/ivAdClose"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12717032', + 'https://i.gkd.li/i/13459031', + ], }, ], }, @@ -94,36 +113,50 @@ export default defineGkdApp({ key: 10, name: '功能类-起点中文网登录自动确认', desc: '自动点击"登录"', - activityIds: 'com.qidian.QDReader.ui.activity.QDBrowserActivity', - rules: '[id="scanLogin"]', - snapshotUrls: 'https://i.gkd.li/i/12903081', + rules: [ + { + activityIds: 'com.qidian.QDReader.ui.activity.QDBrowserActivity', + matches: '[id="scanLogin"]', + snapshotUrls: 'https://i.gkd.li/i/12903081', + }, + ], }, { key: 11, name: '局部广告-信息流广告', - desc: '自动点击"x"', - activityIds: 'com.qidian.QDReader.flutter.DailyReadingMainPageActivity', - rules: 'View[desc="更多游戏"] - ImageView[clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/13406169', + desc: '点击关闭', + rules: [ + { + activityIds: + 'com.qidian.QDReader.flutter.DailyReadingMainPageActivity', + matches: 'View[desc="更多游戏"] - ImageView[clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/13406169', + }, + ], }, { key: 12, - name: '功能类-福利中心看视频后获得奖励', - desc: '自动点击“我知道了”', - activityIds: 'com.qidian.QDReader.ui.activity.QDBrowserActivity', - actionMaximum: 1, - resetMatch: 'activity', + name: '其他-福利中心看视频后获得奖励', + desc: '点击[我知道了]', + fastQuery: true, matchTime: 10000, - rules: 'View[desc="我知道了"]', - snapshotUrls: 'https://i.gkd.li/i/13606901', + actionMaximum: 1, + rules: [ + { + activityIds: 'com.qidian.QDReader.ui.activity.QDBrowserActivity', + matches: + '@View[desc="我知道了"][clickable=true] <2 [text="播放"]', + ], exampleUrls: 'https://m.gkd.li/57941037/ea612e44-12a9-405f-aa03-60a19cebef57', snapshotUrls: 'https://i.gkd.li/i/15857381', diff --git a/src/apps/com.qiekj.user.ts b/src/apps/com.qiekj.user.ts index fb956e7b..003785d1 100644 --- a/src/apps/com.qiekj.user.ts +++ b/src/apps/com.qiekj.user.ts @@ -44,6 +44,7 @@ export default defineGkdApp({ rules: [ { key: 0, + activityIds: '.MainActivity', matches: '[id="com.qiekj.user:id/btn_cancelUpdate"][text*="暂不更新"]', snapshotUrls: 'https://i.gkd.li/i/13435011', diff --git a/src/apps/com.qihoo.camera.ts b/src/apps/com.qihoo.camera.ts index c24519f6..4bbcc799 100644 --- a/src/apps/com.qihoo.camera.ts +++ b/src/apps/com.qihoo.camera.ts @@ -9,11 +9,10 @@ export default defineGkdApp({ name: '局部广告-卡片广告', rules: [ { + name: '云收藏弹窗广告', actionMaximum: 1, activityIds: 'com.qihoo.jia.playpage.RecordPlayActivity', - name: '云收藏弹窗广告', - matches: - 'ViewGroup > @ImageView[clickable=true] -n TextView[text="云收藏"]', + matches: '@ImageView[clickable=true] +4 TextView[text="去开通"]', snapshotUrls: 'https://i.gkd.li/i/13630755', }, ], diff --git a/src/apps/com.qihoo.srouter.n300.ts b/src/apps/com.qihoo.srouter.n300.ts index 0cff62af..d50b0b93 100644 --- a/src/apps/com.qihoo.srouter.n300.ts +++ b/src/apps/com.qihoo.srouter.n300.ts @@ -7,11 +7,16 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', + fastQuery: true, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '[vid="app_update_later_button"]', - snapshotUrls: 'https://i.gkd.li/i/13800011', + rules: [ + { + activityIds: 'com.ifenglian.superapp.ui.firewall.SAMainActivity', + matches: '[vid="app_update_later_button"]', + snapshotUrls: 'https://i.gkd.li/i/13800011', + }, + ], }, ], }); diff --git a/src/apps/com.qingdaonews.bus.ts b/src/apps/com.qingdaonews.bus.ts index 790e000f..3709b647 100644 --- a/src/apps/com.qingdaonews.bus.ts +++ b/src/apps/com.qingdaonews.bus.ts @@ -7,10 +7,10 @@ export default defineGkdApp({ { key: 0, name: '全屏广告-弹窗广告', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { matches: '[id="com.qingdaonews.bus:id/iv_native_dislike"]', diff --git a/src/apps/com.qingwatq.weather.ts b/src/apps/com.qingwatq.weather.ts index 2daa6ffd..100c57c4 100644 --- a/src/apps/com.qingwatq.weather.ts +++ b/src/apps/com.qingwatq.weather.ts @@ -10,6 +10,7 @@ export default defineGkdApp({ rules: [ { key: 0, + fastQuery: true, activityIds: 'com.qingwatq.weather.home.HomeActivity', matches: '[id="com.qingwatq.weather:id/titleArea"] + [id="com.qingwatq.weather:id/closeImg"]', diff --git a/src/apps/com.qinlin.edoor.ts b/src/apps/com.qinlin.edoor.ts index 5eb84105..32078058 100644 --- a/src/apps/com.qinlin.edoor.ts +++ b/src/apps/com.qinlin.edoor.ts @@ -24,34 +24,31 @@ export default defineGkdApp({ rules: [ { key: 0, - name: '穿山甲SDK', fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + activityIds: '.MainActivity', + matches: [ + '[text="广告" || vid="interact_ad_root"]', + '[vid="iv_close"]', + ], + snapshotUrls: [ + 'https://i.gkd.li/i/13771774', + 'https://i.gkd.li/i/13932707', + ], + }, + { + key: 1, + activityIds: '.MainActivity', matches: - '@[id="com.qinlin.edoor:id/iv_close"] - LinearLayout >n [text*="广告"]', - snapshotUrls: 'https://i.gkd.li/i/13771774', + '@ImageView[clickable=true] - [desc="立即领取" || desc="开心收下"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12707736', + 'https://i.gkd.li/i/12707738', + ], }, ], }, - { - key: 10, - name: '全屏广告-开门有奖弹窗', - activityIds: 'com.qinlin.edoor.MainActivity', - rules: '[desc="开门有奖"] +2 [desc="立即领取"] + ImageView', - snapshotUrls: 'https://i.gkd.li/i/12707736', - }, - { - key: 11, - name: '全屏广告-获得金币弹窗', - activityIds: 'com.qinlin.edoor.MainActivity', - rules: ['[desc="获得金币"] +3 [desc="开心收下"] + ImageView'], - snapshotUrls: ['https://i.gkd.li/i/12707738'], - }, - { - key: 12, - name: '全屏广告-开门成功后弹窗广告', - desc: '来自"腾讯广告sdk"', - rules: '[vid="interact_ad_root"] >2 [vid="iv_close"]', - snapshotUrls: 'https://i.gkd.li/i/13932707', - }, ], }); diff --git a/src/apps/com.qiyi.video.lite.ts b/src/apps/com.qiyi.video.lite.ts index fbe7a6f6..42890bb0 100644 --- a/src/apps/com.qiyi.video.lite.ts +++ b/src/apps/com.qiyi.video.lite.ts @@ -12,8 +12,12 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', priorityTime: 10000, - rules: '@[clickable=true] >2 [text="关闭"]', - snapshotUrls: 'https://i.gkd.li/i/13797162', + rules: [ + { + matches: '@[clickable=true] >2 [text="关闭"]', + snapshotUrls: 'https://i.gkd.li/i/13797162', + }, + ], }, ], }); diff --git a/src/apps/com.qiyi.video.ts b/src/apps/com.qiyi.video.ts index a48ad805..3b4b548b 100644 --- a/src/apps/com.qiyi.video.ts +++ b/src/apps/com.qiyi.video.ts @@ -12,10 +12,14 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', priorityTime: 10000, - rules: '@LinearLayout > [text="关闭"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13160866', - 'https://i.gkd.li/i/13379565', + rules: [ + { + matches: '@LinearLayout > [text="关闭"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13160866', + 'https://i.gkd.li/i/13379565', + ], + }, ], }, { @@ -39,12 +43,17 @@ export default defineGkdApp({ { key: 3, name: '权限提示-通知权限', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - snapshotUrls: 'https://i.gkd.li/i/12838152', - rules: '[id="com.qiyi.video:id/cancel_btn"][text="暂时不要"]', + rules: [ + { + activityIds: 'org.qiyi.android.video.MainActivity', + matches: '[id="com.qiyi.video:id/cancel_btn"][text="暂时不要"]', + snapshotUrls: 'https://i.gkd.li/i/12838152', + }, + ], }, { key: 4, @@ -53,19 +62,27 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.qiyi.video:id/cancel_btn"][text="暂不升级"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12838158', - 'https://i.gkd.li/i/13684912', //activityIds: 'org.qiyi.android.search.view.PhoneSearchActivity', + rules: [ + { + activityIds: [ + 'org.qiyi.android.video.MainActivity', + 'org.qiyi.android.search.view.PhoneSearchActivity', + ], + matches: '[id="com.qiyi.video:id/cancel_btn"][text="暂不升级"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12838158', + 'https://i.gkd.li/i/13684912', + ], + }, ], }, { key: 5, name: '全屏广告-播放页-插入广告', - desc: '视频播放前或播放中途插入的广告。默认关闭。', - activityIds: 'org.iqiyi.video.activity.PlayerActivity', + desc: '视频播放前或播放中途插入的广告', rules: [ { + activityIds: 'org.iqiyi.video.activity.PlayerActivity', matches: '@RelativeLayout[id="com.qiyi.video:id/unused_res_a"] > TextView[text="关闭广告"]', snapshotUrls: [ diff --git a/src/apps/com.qjy.youqulife.io.ts b/src/apps/com.qjy.youqulife.io.ts index f67245ff..ee50bb25 100644 --- a/src/apps/com.qjy.youqulife.io.ts +++ b/src/apps/com.qjy.youqulife.io.ts @@ -7,14 +7,16 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 1, name: '快手广告', - activityIds: 'com.qjy.youqulife.io.MainActivity', fastQuery: true, - matches: - '[text="广告"] <2 ViewGroup -n ViewGroup > ViewGroup > [text="跳过"]', + activityIds: 'com.qjy.youqulife.io.MainActivity', + matches: ['[text="广告"] ', '[text="跳过"]'], snapshotUrls: 'https://i.gkd.li/i/13378653', }, ], diff --git a/src/apps/com.qq.ac.android.ts b/src/apps/com.qq.ac.android.ts index 94204763..d3a75353 100644 --- a/src/apps/com.qq.ac.android.ts +++ b/src/apps/com.qq.ac.android.ts @@ -7,10 +7,14 @@ export default defineGkdApp({ { key: 2, name: '局部广告-漫画阅读页面-左侧悬浮广告', - activityIds: 'com.qq.ac.android.reader.comic.ComicReaderActivity', - rules: - '[id="com.qq.ac.android:id/operation_ad_view"] > [id="com.qq.ac.android:id/btn_close"]', - snapshotUrls: 'https://i.gkd.li/i/12707756', + rules: [ + { + activityIds: 'com.qq.ac.android.reader.comic.ComicReaderActivity', + matches: + '[id="com.qq.ac.android:id/operation_ad_view"] > [id="com.qq.ac.android:id/btn_close"]', + snapshotUrls: 'https://i.gkd.li/i/12707756', + }, + ], }, { key: 3, diff --git a/src/apps/com.qq.reader.ts b/src/apps/com.qq.reader.ts index 8a6df35a..681e2143 100644 --- a/src/apps/com.qq.reader.ts +++ b/src/apps/com.qq.reader.ts @@ -51,11 +51,13 @@ export default defineGkdApp({ { key: 4, name: '更新提示-内测邀请弹窗', + fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { + activityIds: 'com.tencent.upgrade.ui.UpgradeDialogActivity', matches: '[vid="upgrade_dialog_close_btn"][clickable=true]', exampleUrls: 'https://m.gkd.li/57941037/03e35d57-5f40-4ccb-911a-5f9061eab46e', diff --git a/src/apps/com.quark.browser.ts b/src/apps/com.quark.browser.ts index 74b462b4..76607cdd 100644 --- a/src/apps/com.quark.browser.ts +++ b/src/apps/com.quark.browser.ts @@ -4,24 +4,20 @@ export default defineGkdApp({ id: 'com.quark.browser', name: '夸克浏览器', groups: [ - { - key: 0, - name: '局部广告-小说阅读页面底部广告', - activityIds: 'com.ucpro.BrowserActivity', - rules: [ - '[id="com.quark.browser:id/tv_close_ad"][text="关闭广告"]', - '[id="com.quark.browser:id/ad_close_layout_container"]', - ], - }, { key: 2, - name: '功能类-设置默认浏览器提示', + name: '其他-设置默认浏览器提示', desc: '点击取消', fastQuery: true, actionMaximum: 1, - activityIds: 'com.ucpro.BrowserActivity', - rules: '@Button[text="取消"] + Button[text="去设置"]', - snapshotUrls: 'https://i.gkd.li/i/13249469', + resetMatch: 'app', + rules: [ + { + activityIds: 'com.ucpro.BrowserActivity', + matches: '@Button[text="取消"] + Button[text="去设置"]', + snapshotUrls: 'https://i.gkd.li/i/13249469', + }, + ], }, { key: 3, @@ -33,6 +29,7 @@ export default defineGkdApp({ rules: [ { key: 0, + activityIds: 'com.ucpro.BrowserActivity', matches: ['[text*="版本更新" || text^="优化升级"]', '[text="取消"]'], snapshotUrls: [ 'https://i.gkd.li/i/13292512', @@ -45,11 +42,16 @@ export default defineGkdApp({ { key: 4, name: '全屏广告-弹窗广告', - fastQuery: true, - actionMaximum: 1, - activityIds: 'com.ucpro.BrowserActivity', - rules: 'ImageView[id="com.quark.browser:id/close_img"][clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/13292571', + rules: [ + { + fastQuery: true, + actionMaximum: 1, + activityIds: 'com.ucpro.BrowserActivity', + matches: + 'ImageView[id="com.quark.browser:id/close_img"][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/13292571', + }, + ], }, ], }); diff --git a/src/apps/com.quqi.quqioffice.ts b/src/apps/com.quqi.quqioffice.ts index ba8a4ef4..9d89e472 100644 --- a/src/apps/com.quqi.quqioffice.ts +++ b/src/apps/com.quqi.quqioffice.ts @@ -8,29 +8,29 @@ export default defineGkdApp({ key: 1, name: '全屏广告-私人云看图弹窗广告', desc: '在线私人云看图片自动弹出自动播放可跳过广告', - activityIds: [ - 'com.qq.e.ads.PortraitADActivity', - 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', - ], rules: [ { + key: 1, + activityIds: 'com.qq.e.ads.PortraitADActivity', matches: - 'LinearLayout > FrameLayout > FrameLayout > ImageView[id=null]', + 'TextView[text*="应用名称"] < LinearLayout -(2,3) [childCount=1] > FrameLayout[childCount=1] >(1,2) ImageView[childCount=0][id=null]', snapshotUrls: [ 'https://i.gkd.li/i/12854650', 'https://i.gkd.li/i/12854723', + 'https://i.gkd.li/i/12854664', ], }, { + key: 2, + activityIds: + 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', matches: 'TextView[text$="s"] + TextView[text$="跳过"]', - snapshotUrls: ['https://i.gkd.li/i/12877535'], - }, - { - matches: - 'TextView[text*="应用名称"] < LinearLayout -2n FrameLayout > FrameLayout > ImageView[id=null]', - snapshotUrls: 'https://i.gkd.li/i/12854664', + snapshotUrls: 'https://i.gkd.li/i/12877535', }, { + key: 3, + activityIds: + 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', matches: 'ImageView[id="com.byted.pangle:id/tt_reward_full_count_down_after_close"]', snapshotUrls: 'https://i.gkd.li/i/12877540', diff --git a/src/apps/com.rarlab.rar.ts b/src/apps/com.rarlab.rar.ts index 4105ba32..88573d1d 100644 --- a/src/apps/com.rarlab.rar.ts +++ b/src/apps/com.rarlab.rar.ts @@ -7,14 +7,18 @@ export default defineGkdApp({ { key: 10, name: '全屏广告-订购 RAR 弹窗', - desc: '自动点击"放弃"', - fastQuery: true, - activityIds: 'com.rarlab.rar.MainActivity', - rules: - '[text~="(订购|訂閱)"] + [id="android:id/button1"][text~="(放弃|解除)"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12781596', - 'https://i.gkd.li/i/15801328', + desc: '点击[放弃]', + rules: [ + { + fastQuery: true, + activityIds: 'com.rarlab.rar.MainActivity', + matches: + '[text="订购" || text="訂閱"] + [text="放弃" || text="解除"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12781596', + 'https://i.gkd.li/i/15801328', + ], + }, ], }, ], diff --git a/src/apps/com.realmecomm.app.ts b/src/apps/com.realmecomm.app.ts index 1600237b..e197c35d 100644 --- a/src/apps/com.realmecomm.app.ts +++ b/src/apps/com.realmecomm.app.ts @@ -7,9 +7,11 @@ export default defineGkdApp({ { key: 1, name: '功能类-自动签到', + fastQuery: true, + actionMaximum: 1, + resetMatch: 'app', rules: [ { - fastQuery: true, activityIds: 'com.android.realme2.home.view.MainActivity', matches: '[text="签到"][clickable=true][visibleToUser=true]', exampleUrls: diff --git a/src/apps/com.realtech.xiaocan.ts b/src/apps/com.realtech.xiaocan.ts index 3ae04bc4..232f4227 100644 --- a/src/apps/com.realtech.xiaocan.ts +++ b/src/apps/com.realtech.xiaocan.ts @@ -38,6 +38,9 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, @@ -51,11 +54,17 @@ export default defineGkdApp({ { key: 2, name: '功能类-签到成功弹窗', - desc: '自动点击[关闭]按钮', - activityIds: 'com.realtech.xiaocan.MainActivity', - rules: - '[id="android:id/content"] >5 View[childCount=6] > ImageView[index=5][clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/14290847', + desc: '点击[关闭]按钮', + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.realtech.xiaocan.MainActivity', + matches: + '[id="android:id/content"] >5 View[childCount=6] > ImageView[index=5][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/14290847', + }, + ], }, ], }); diff --git a/src/apps/com.reddit.frontpage.ts b/src/apps/com.reddit.frontpage.ts index 44fe73c3..dd89e600 100644 --- a/src/apps/com.reddit.frontpage.ts +++ b/src/apps/com.reddit.frontpage.ts @@ -14,17 +14,17 @@ export default defineGkdApp({ activityIds: 'com.reddit.launch.main.MainActivity', matches: '[vid="sheet_container"] > [vid="cancel_button"][text="Not Now"][clickable=true]', + exampleUrls: 'https://e.gkd.li/b640f2c9-4564-420f-8a2f-20f461032f3d', snapshotUrls: [ 'https://i.gkd.li/i/13649914', 'https://i.gkd.li/i/17269009', ], - exampleUrls: 'https://e.gkd.li/b640f2c9-4564-420f-8a2f-20f461032f3d', }, ], }, { key: 4, - name: '功能类-NSFW 内容提示', + name: '其他-NSFW 内容提示', desc: '自动点击 continue', fastQuery: true, rules: [ diff --git a/src/apps/com.redfinger.app.ts b/src/apps/com.redfinger.app.ts index 1759176a..41c8723f 100644 --- a/src/apps/com.redfinger.app.ts +++ b/src/apps/com.redfinger.app.ts @@ -11,18 +11,26 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', fastQuery: true, - rules: - '[id="com.redfinger.app:id/btn_update"] + [id="com.redfinger.app:id/iv_close"]', - snapshotUrls: 'https://i.gkd.li/i/13761821', + rules: [ + { + activityIds: '.activity.MainActivity', + matches: + '[id="com.redfinger.app:id/btn_update"] + [id="com.redfinger.app:id/iv_close"]', + snapshotUrls: 'https://i.gkd.li/i/13761821', + }, + ], }, { key: 2, name: '全屏广告-弹窗广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, - activityIds: 'com.redfinger.app.activity.MainActivity', fastQuery: true, + activityIds: 'com.redfinger.app.activity.MainActivity', matches: '[id="com.redfinger.app:id/rl_screen_ad_close"]', snapshotUrls: 'https://i.gkd.li/i/13761825', }, diff --git a/src/apps/com.rocoplayer.app.nm.ts b/src/apps/com.rocoplayer.app.nm.ts index 1341b02d..eed7b791 100644 --- a/src/apps/com.rocoplayer.app.nm.ts +++ b/src/apps/com.rocoplayer.app.nm.ts @@ -7,21 +7,32 @@ export default defineGkdApp({ { key: 1, name: '通知提示-温馨提示弹窗', + fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[text="温馨提示"] +2 [text="确定"]', - snapshotUrls: 'https://i.gkd.li/i/14304132', + rules: [ + { + activityIds: 'com.e4a.runtime.android.mainActivity', + matches: '[text="温馨提示"] +2 [text="确定"]', + snapshotUrls: 'https://i.gkd.li/i/14304132', + }, + ], }, { key: 2, name: '全屏广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, name: '腾讯广告', + fastQuery: true, activityIds: 'com.e4a.runtime.android.mainActivity', matches: - 'ImageView - LinearLayout - FrameLayout > FrameLayout[index=2][childCount=1] > ImageView[childCount=0]', + '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', snapshotUrls: 'https://i.gkd.li/i/14304134', }, ], diff --git a/src/apps/com.romielf.mrsc.ts b/src/apps/com.romielf.mrsc.ts index c6af9764..340037b7 100644 --- a/src/apps/com.romielf.mrsc.ts +++ b/src/apps/com.romielf.mrsc.ts @@ -6,16 +6,19 @@ export default defineGkdApp({ groups: [ { key: 1, - name: '局部广告-新闻页面摇一摇广告', + name: '分段广告-新闻页面摇一摇广告', desc: '点击准确率灵敏度不太高', activityIds: 'com.romielf.mrsc.MainActivity', rules: [ { + key: 1, matches: '@Image < View -n View >2 View[text="广告"]', snapshotUrls: 'https://i.gkd.li/i/12667539', }, { - matches: '[id="com.byted.pangle:id/tt_item_tv"][text="不感兴趣"]', // 字节SDK广告 + preKeys: [1], + key: 2, + matches: '[id="com.byted.pangle:id/tt_item_tv"][text="不感兴趣"]', snapshotUrls: 'https://i.gkd.li/i/12667549', }, ], diff --git a/src/apps/com.rytong.hnair.ts b/src/apps/com.rytong.hnair.ts index ec3588c6..a8331927 100644 --- a/src/apps/com.rytong.hnair.ts +++ b/src/apps/com.rytong.hnair.ts @@ -7,9 +7,16 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-首页弹窗广告', - activityIds: 'com.hnair.airlines.ui.main.MainActivity', - rules: 'ImageView[id*="com.rytong.hnair:id/iv_cloes"]', - snapshotUrls: 'https://i.gkd.li/i/12846381', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.hnair.airlines.ui.main.MainActivity', + matches: 'ImageView[id*="com.rytong.hnair:id/iv_cloes"]', + snapshotUrls: 'https://i.gkd.li/i/12846381', + }, + ], }, ], }); diff --git a/src/apps/com.samsung.android.packageinstaller.ts b/src/apps/com.samsung.android.packageinstaller.ts index 91ef9884..e29eedd0 100644 --- a/src/apps/com.samsung.android.packageinstaller.ts +++ b/src/apps/com.samsung.android.packageinstaller.ts @@ -8,17 +8,18 @@ export default defineGkdApp({ key: 2, name: '功能类-跳过安全使用协议', desc: '自动点击略过并关闭反恶意软件协议', + fastQuery: true, rules: [ - { - key: 1, - matches: '[text *="略过"]', - snapshotUrls: 'https://i.gkd.li/i/13255641', - }, { key: 0, matches: ['[text^="是否打开反恶意软件"]', '[text="取消"]'], snapshotUrls: 'https://i.gkd.li/i/13233686', }, + { + key: 1, + matches: '[text="略过"]', + snapshotUrls: 'https://i.gkd.li/i/13255641', + }, { key: 2, matches: ['[text^="打开应用程序保护?"]', '[text="取消"]'], diff --git a/src/apps/com.sankuai.meituan.dispatch.crowdsource.ts b/src/apps/com.sankuai.meituan.dispatch.crowdsource.ts index 3865cbbe..0a179145 100644 --- a/src/apps/com.sankuai.meituan.dispatch.crowdsource.ts +++ b/src/apps/com.sankuai.meituan.dispatch.crowdsource.ts @@ -25,7 +25,7 @@ export default defineGkdApp({ }, { key: 2, - name: '功能类-[保级成功]弹窗', + name: '其他-[保级成功]弹窗', desc: '点击关闭', rules: [ { diff --git a/src/apps/com.sankuai.meituan.takeoutnew.ts b/src/apps/com.sankuai.meituan.takeoutnew.ts index 47d9e3c0..ca2e3160 100644 --- a/src/apps/com.sankuai.meituan.takeoutnew.ts +++ b/src/apps/com.sankuai.meituan.takeoutnew.ts @@ -11,27 +11,23 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.sankuai.meituan.takeoutnew:id/wm_upgrade_force_cancel"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13415044', - 'https://i.gkd.li/i/13276882', + rules: [ + { + activityIds: 'com.sankuai.waimai.business.page.homepage.MainActivity', + matches: + '[id="com.sankuai.meituan.takeoutnew:id/wm_upgrade_force_cancel"]', + snapshotUrls: 'https://i.gkd.li/i/13415044', + }, ], }, { key: 3, name: '全屏广告-弹窗广告', - activityIds: - 'com.sankuai.waimai.bussiness.order.detail.WMOrderDetailActivity', rules: [ - { - key: 0, - name: '美团买药弹窗-点击[暂时放弃]', - matches: - '[text="送亲友"] <2 FrameLayout[childCount=2] > [text="暂时放弃"][clickable=true]', - }, { key: 1, - name: '领取外卖神卷-点击底部"x"', + activityIds: + 'com.sankuai.waimai.bussiness.order.detail.WMOrderDetailActivity', matches: '@ImageView[clickable=true] - FrameLayout > FrameLayout > FrameLayout TextView[text="点我领取"]', snapshotUrls: 'https://i.gkd.li/i/13175526', diff --git a/src/apps/com.sankuai.meituan.ts b/src/apps/com.sankuai.meituan.ts index 60d626f7..56d3bdf2 100644 --- a/src/apps/com.sankuai.meituan.ts +++ b/src/apps/com.sankuai.meituan.ts @@ -7,16 +7,25 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: - 'TextView[text^="新版本"] - Button[id="com.sankuai.meituan:id/btn_close"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12614559', - 'https://i.gkd.li/i/12673132', - 'https://i.gkd.li/i/13292635', + rules: [ + { + activityIds: [ + 'com.meituan.android.upgrade.ui.f', + 'com.meituan.android.upgrade.UpgradeDialogActivity', + 'com.meituan.android.pt.homepage.activity.MainActivity', + ], + matches: + 'TextView[text^="新版本"] - Button[id="com.sankuai.meituan:id/btn_close"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12614559', + 'https://i.gkd.li/i/12673132', + 'https://i.gkd.li/i/13292635', + ], + }, ], }, { @@ -90,19 +99,24 @@ export default defineGkdApp({ { key: 3, name: '评价提示-订单调查弹窗', - matchTime: 10000, - actionMaximum: 1, fastQuery: true, + actionMaximum: 1, + resetMatch: 'app', rules: [ { + key: 1, name: '我的页面-小调查', action: 'back', + activityIds: 'com.meituan.retail.c.android.mrn.mrn.MallMrnModal', matches: 'TextView[text="小调查"]', snapshotUrls: 'https://i.gkd.li/i/12639723', }, { + key: 2, name: '订单详情页匿名调查', action: 'back', + activityIds: + 'com.sankuai.waimai.bussiness.order.detail.WMOrderDetailActivity', matches: '[id="com.sankuai.meituan:id/questionnaireTitle"]', snapshotUrls: 'https://i.gkd.li/i/13682336', }, @@ -189,6 +203,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: 'com.meituan.android.pt.homepage.activity.MainActivity', matches: '@[vid="iv_close" || text="跳过"] -(1,2) [text^="开启通知"]', snapshotUrls: [ 'https://i.gkd.li/i/13439134', @@ -200,11 +215,15 @@ export default defineGkdApp({ { key: 10, name: '全屏广告-新人返场特惠', - desc: '点击右上角返回', - activityIds: 'com.meituan.android.base.knb.KNBWebViewActivity', - matchTime: 10000, - rules: '[id="shareNav"] > [text=""]', - snapshotUrls: 'https://i.gkd.li/i/13800691', + desc: '点击左上角返回', + rules: [ + { + matchTime: 10000, + activityIds: 'com.meituan.android.base.knb.KNBWebViewActivity', + matches: '[id="shareNav"] > [text=""]', + snapshotUrls: 'https://i.gkd.li/i/13800691', + }, + ], }, { key: 11, diff --git a/src/apps/com.sankuai.movie.ts b/src/apps/com.sankuai.movie.ts deleted file mode 100644 index 5510b66e..00000000 --- a/src/apps/com.sankuai.movie.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { defineGkdApp } from '@gkd-kit/define'; - -export default defineGkdApp({ - id: 'com.sankuai.movie', - name: '猫眼', - groups: [ - { - key: 1, - name: '更新提示', - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - fastQuery: true, - rules: '[text^="更新"] +(3) LinearLayout > [text="取消"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12649942', - 'https://i.gkd.li/i/12649938', - 'https://i.gkd.li/i/13799885', - ], - }, - ], -}); diff --git a/src/apps/com.schunshang.bij.niuniu.ts b/src/apps/com.schunshang.bij.niuniu.ts index fb219838..c80f9948 100644 --- a/src/apps/com.schunshang.bij.niuniu.ts +++ b/src/apps/com.schunshang.bij.niuniu.ts @@ -9,6 +9,9 @@ export default defineGkdApp({ name: '全屏广告-弹窗广告', desc: '点击关闭', fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, diff --git a/src/apps/com.sdhs.easy.high.road.ts b/src/apps/com.sdhs.easy.high.road.ts index c2b82a73..def40c79 100644 --- a/src/apps/com.sdhs.easy.high.road.ts +++ b/src/apps/com.sdhs.easy.high.road.ts @@ -11,11 +11,10 @@ export default defineGkdApp({ { key: 0, name: '腾讯广告', + fastQuery: true, activityIds: 'com.sdhs.easy.main.activity.MainActivity', - matches: [ - '[desc^="logoad"]', - '[desc^="dislike"] > View[clickable=true]', - ], + matches: + '[desc^="dislike"] > @View[clickable=true][visibleToUser=true] <3 [text="立即升级"] <2 Button <2 ViewGroup < ViewGroup <3 ViewGroup <2 ViewGroup < ViewGroup <2 ViewGroup < ViewGroup < FrameLayout < [id="com.sf.activity:id/rnRootLayout"]', + '@Button[desc="取消"] - ViewGroup >3 [visibleToUser=true][text="立即升级"] <n [id="com.sgcc.wsgw.cn:id/btn_remind_close"]', - snapshotUrls: ['https://i.gkd.li/i/12745042'], + snapshotUrls: 'https://i.gkd.li/i/12745042', }, ], }, @@ -51,8 +51,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '@ImageView < ViewGroup -3 [text="有新版本啦!"]', - snapshotUrls: 'https://i.gkd.li/i/13501638', + rules: [ + { + activityIds: 'com.sgcc.wsgw.rnbundle.activity.HomeReactActivity', + matches: '@ImageView < ViewGroup -3 [text="有新版本啦!"]', + snapshotUrls: 'https://i.gkd.li/i/13501638', + }, + ], }, ], }); diff --git a/src/apps/com.shangfang.gylm.ts b/src/apps/com.shangfang.gylm.ts index 8bf6cbc3..5d2a6395 100644 --- a/src/apps/com.shangfang.gylm.ts +++ b/src/apps/com.shangfang.gylm.ts @@ -7,12 +7,17 @@ export default defineGkdApp({ { key: 2, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '[id="com.shangfang.gylm:id/iv_upgrade_close"]', - snapshotUrls: 'https://i.gkd.li/i/13643599', + rules: [ + { + activityIds: '.mvp.ui.home.activity.UpdateActivityV2', + matches: '[id="com.shangfang.gylm:id/iv_upgrade_close"]', + snapshotUrls: 'https://i.gkd.li/i/13643599', + }, + ], }, ], }); diff --git a/src/apps/com.shanghaionstar.ts b/src/apps/com.shanghaionstar.ts index 1a384c87..b853988a 100644 --- a/src/apps/com.shanghaionstar.ts +++ b/src/apps/com.shanghaionstar.ts @@ -11,8 +11,12 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', priorityTime: 10000, - rules: '[id="com.shanghaionstar:id/jump_view"]', - snapshotUrls: 'https://i.gkd.li/i/13071523', + rules: [ + { + matches: '[id="com.shanghaionstar:id/jump_view"]', + snapshotUrls: 'https://i.gkd.li/i/13071523', + }, + ], }, ], }); diff --git a/src/apps/com.shark.jizhang.ts b/src/apps/com.shark.jizhang.ts index bef48b05..51a8e944 100644 --- a/src/apps/com.shark.jizhang.ts +++ b/src/apps/com.shark.jizhang.ts @@ -6,17 +6,31 @@ export default defineGkdApp({ groups: [ { key: 0, - name: '局部广告-新用户特惠广告', - desc: '弹窗广告,右下角浮动广告', - activityIds: 'com.shark.jizhang.module.main.MainActivity', + name: '局部广告-悬浮广告', rules: [ { + activityIds: '.module.main.MainActivity', matches: - '[id="com.shark.jizhang:id/buy_later_view"||id="com.shark.jizhang:id/tv_count_down"] - [id="com.shark.jizhang:id/close_view"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12518500', - 'https://i.gkd.li/i/12518517', - ], + '[id="com.shark.jizhang:id/float_btn"] >2 [id="com.shark.jizhang:id/close_view"]', + exampleUrls: 'https://e.gkd.li/b64da622-2632-4140-930b-89d0f8cbdee1', + snapshotUrls: 'https://i.gkd.li/i/12518517', + }, + ], + }, + { + key: 1, + name: '全屏广告-弹窗广告', + desc: '点击关闭', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: '.module.main.MainActivity', + matches: + '[id="com.shark.jizhang:id/sdv_image"] + [id="com.shark.jizhang:id/close_view"]', + exampleUrls: 'https://e.gkd.li/1cad4c8f-fdb0-4608-8398-2c22d81d435d', + snapshotUrls: 'https://i.gkd.li/i/12518500', }, ], }, diff --git a/src/apps/com.shinyv.cnr.ts b/src/apps/com.shinyv.cnr.ts index c1dce46c..6f9bcf17 100644 --- a/src/apps/com.shinyv.cnr.ts +++ b/src/apps/com.shinyv.cnr.ts @@ -7,6 +7,9 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-首页弹窗广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { fastQuery: true, diff --git a/src/apps/com.shizhuang.duapp.ts b/src/apps/com.shizhuang.duapp.ts index b672b70d..befd972c 100644 --- a/src/apps/com.shizhuang.duapp.ts +++ b/src/apps/com.shizhuang.duapp.ts @@ -6,14 +6,18 @@ export default defineGkdApp({ groups: [ { key: 4, - name: '功能类-截屏分享', + name: '其他-截屏分享', desc: '关闭截屏时app弹出的分享弹窗', - fastQuery: true, - activityIds: - 'com.shizhuang.duapp.modules.product_detail.detailv4.ui.ProductDetailActivityV4', - rules: - '[id="com.shizhuang.duapp:id/ivClose"] +2 [id="com.shizhuang.duapp:id/ivSave"]', - snapshotUrls: 'https://i.gkd.li/i/13473449', + rules: [ + { + fastQuery: true, + activityIds: + 'com.shizhuang.duapp.modules.product_detail.detailv4.ui.ProductDetailActivityV4', + matches: + '[id="com.shizhuang.duapp:id/ivClose"] +2 [id="com.shizhuang.duapp:id/ivSave"]', + snapshotUrls: 'https://i.gkd.li/i/13473449', + }, + ], }, ], }); diff --git a/src/apps/com.showstartfans.activity.ts b/src/apps/com.showstartfans.activity.ts index 9f367f91..6810e69c 100644 --- a/src/apps/com.showstartfans.activity.ts +++ b/src/apps/com.showstartfans.activity.ts @@ -7,12 +7,15 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, + fastQuery: true, activityIds: 'com.showstartfans.activity.activitys.maintab.newmain.MainNewActivity', - fastQuery: true, matches: '[id="com.showstartfans.activity:id/img_close_coupon"]', snapshotUrls: 'https://i.gkd.li/i/13670432', }, diff --git a/src/apps/com.shuqi.controller.ts b/src/apps/com.shuqi.controller.ts index 883b42f7..08cf4df2 100644 --- a/src/apps/com.shuqi.controller.ts +++ b/src/apps/com.shuqi.controller.ts @@ -7,16 +7,29 @@ export default defineGkdApp({ { key: 0, name: '局部广告-内部右侧浮动广告', - activityIds: 'com.shuqi.home.MainActivity', - rules: '[id="com.shuqi.controller:id/promotion_close"]', - snapshotUrls: 'https://i.gkd.li/i/12513811', + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.shuqi.home.MainActivity', + matches: '[id="com.shuqi.controller:id/promotion_close"]', + snapshotUrls: 'https://i.gkd.li/i/12513811', + }, + ], }, { key: 1, name: '全屏广告-关闭打卡红包弹窗', - activityIds: 'com.shuqi.common', - rules: '[id="com.shuqi.controller:id/bottomCloseImg"]', - snapshotUrls: 'https://i.gkd.li/i/12513822', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.shuqi.common', + matches: '[id="com.shuqi.controller:id/bottomCloseImg"]', + snapshotUrls: 'https://i.gkd.li/i/12513822', + }, + ], }, { key: 2, @@ -61,10 +74,12 @@ export default defineGkdApp({ activityIds: 'com.shuqi.audio.online.view.AudioBookActivity', rules: [ { + key: 1, matches: '[id="com.shuqi.controller:id/remove_current_ad"]', snapshotUrls: 'https://i.gkd.li/i/12513959', }, { + key: 2, matches: '[id="com.shuqi.controller:id/ad_close_but"]', snapshotUrls: 'https://i.gkd.li/i/12513944', }, diff --git a/src/apps/com.sina.oasis.ts b/src/apps/com.sina.oasis.ts index 5c78a9a0..d3399fc9 100644 --- a/src/apps/com.sina.oasis.ts +++ b/src/apps/com.sina.oasis.ts @@ -19,7 +19,7 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/13434468', }, { - preKeys: 0, + preKeys: [0], matches: '@LinearLayout > [text*="关闭此广告"][text.length<=10]', snapshotUrls: 'https://i.gkd.li/i/13498631', }, diff --git a/src/apps/com.sina.weibo.ts b/src/apps/com.sina.weibo.ts index c5d53257..bbbfcf66 100644 --- a/src/apps/com.sina.weibo.ts +++ b/src/apps/com.sina.weibo.ts @@ -9,30 +9,49 @@ export default defineGkdApp({ name: '全屏广告-兴趣领域推荐', desc: '出现在长久未登录的账户再次登录时', fastQuery: true, - activityIds: 'com.sina.weibo.account.interest.InterestActivity', - rules: - '[id="com.sina.weibo:id/rl_account_title_bar"] > [id="com.sina.weibo:id/tv_title_bar_skip"][text="跳过"]', - snapshotUrls: 'https://i.gkd.li/i/12531405', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.sina.weibo.account.interest.InterestActivity', + matches: + '[id="com.sina.weibo:id/rl_account_title_bar"] > [id="com.sina.weibo:id/tv_title_bar_skip"][text="跳过"]', + snapshotUrls: 'https://i.gkd.li/i/12531405', + }, + ], }, { key: 4, name: '全屏广告-精选博主推荐', desc: '出现在长久未登录的账户再次登录时', fastQuery: true, - activityIds: 'com.sina.weibo.account.recommend.RecommendActivity', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ - '[id="com.sina.weibo:id/tv_option"&&text="取消勾选"]', - '[id="com.sina.weibo:id/new_next_btn"&&text="进入微博（已选0个）"]', - ], - snapshotUrls: [ - 'https://i.gkd.li/i/12531433', - 'https://i.gkd.li/i/12531434', + { + key: 1, + activityIds: '.account.recommend.RecommendActivity', + matches: '[text="取消勾选"]', + exampleUrls: 'https://e.gkd.li/a0602466-0f1e-4ab9-8a0d-27a4364d1ff8', + snapshotUrls: 'https://i.gkd.li/i/12531433', + }, + { + preKeys: [1], + key: 2, + activityIds: + 'com.oplusos.systemui.volume.VolumeDialogImplEx$CustomDialog', + matches: '[text="跳过"]', + exampleUrls: 'https://e.gkd.li/c20bec5d-f4e1-4765-9ba0-ca645b27e434', + snapshotUrls: 'https://i.gkd.li/i/12531434', + }, ], }, { key: 5, name: '局部广告-博文内容区与评论区中间卡片广告', - desc: '点击右上角x', + desc: '点击右上角关闭', fastQuery: true, rules: [ { @@ -66,7 +85,7 @@ export default defineGkdApp({ rules: [ { key: 0, - activityIds: ['com.sina.weibo.feed.DetailWeiboActivity'], + activityIds: 'com.sina.weibo.feed.DetailWeiboActivity', matches: 'RelativeLayout[visibleToUser=true] - RelativeLayout >n @[id="com.sina.weibo:id/ll_close"] > [id="com.sina.weibo:id/tv_tips"] + [id="com.sina.weibo:id/iv_close_icon"]', snapshotUrls: [ @@ -91,11 +110,15 @@ export default defineGkdApp({ { key: 7, name: '局部广告-首页顶部话题分享窗口', - fastQuery: true, - activityIds: 'com.sina.weibo.MainTabActivity', - rules: - '[id="com.sina.weibo:id/tvGuide"] + [id="com.sina.weibo:id/v_close"] + [id="com.sina.weibo:id/iv_close"]', - snapshotUrls: 'https://i.gkd.li/i/12705972', + rules: [ + { + fastQuery: true, + activityIds: 'com.sina.weibo.MainTabActivity', + matches: + '[id="com.sina.weibo:id/tvGuide"] + [id="com.sina.weibo:id/v_close"] + [id="com.sina.weibo:id/iv_close"]', + snapshotUrls: 'https://i.gkd.li/i/12705972', + }, + ], }, { key: 8, @@ -147,18 +170,19 @@ export default defineGkdApp({ name: '权限提示-通知权限', desc: '自动点击暂不开启', fastQuery: true, - matchTime: 10000, actionMaximum: 1, resetMatch: 'app', rules: [ { key: 0, + activityIds: '.notifyguidev2.NotifyGuideV2Activity', matches: '@[id="com.sina.weibo:id/bt_cancel"][text="暂不开启"] + [id="com.sina.weibo:id/bt_confirm"]', snapshotUrls: 'https://i.gkd.li/i/12705979', }, { key: 1, + activityIds: '.MainTabActivity', matches: '[text^="打开通知"] < LinearLayout + ImageView[id="com.sina.weibo:id/right_icon"]', snapshotUrls: 'https://i.gkd.li/i/12705986', @@ -170,10 +194,17 @@ export default defineGkdApp({ name: '局部广告-首页顶部签到卡片', desc: '自动点击x按钮', fastQuery: true, - activityIds: 'com.sina.weibo.MainTabActivity', - rules: - '[id="com.sina.weibo:id/ll_check_in_container"] < FrameLayout - FrameLayout > TextView + [id="com.sina.weibo:id/v_close"]', - snapshotUrls: 'https://i.gkd.li/i/12749876', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.sina.weibo.MainTabActivity', + matches: + '[id="com.sina.weibo:id/ll_check_in_container"] < FrameLayout - FrameLayout > TextView + [id="com.sina.weibo:id/v_close"]', + snapshotUrls: 'https://i.gkd.li/i/12749876', + }, + ], }, { key: 13, @@ -228,6 +259,7 @@ export default defineGkdApp({ rules: [ { key: 0, + activityIds: ['.MainTabActivity', '.utils.WeiboDialog$CustomDialog'], matches: '@[text="以后再说"] +2 [text="去开启"]', snapshotUrls: [ 'https://i.gkd.li/i/13218093', @@ -236,6 +268,7 @@ export default defineGkdApp({ }, { key: 1, + activityIds: '.MainTabActivity', matches: '@[id="com.sina.weibo:id/btn_close"] +2 [text="使用您的位置信息"]', snapshotUrls: 'https://i.gkd.li/i/13255595', @@ -324,15 +357,20 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '@[text="不了，谢谢"] +4 [text="喜欢，给好评"]', - snapshotUrls: 'https://i.gkd.li/i/13620220', + rules: [ + { + activityIds: '.MainTabActivity', + matches: '@[text="不了，谢谢"] +4 [text="喜欢，给好评"]', + snapshotUrls: 'https://i.gkd.li/i/13620220', + }, + ], }, { key: 19, - fastQuery: true, name: '功能类-自动点击查看原图', rules: [ { + fastQuery: true, activityIds: 'com.sina.weibo.photoalbum.imageviewer.ImageViewer', matches: '@LinearLayout >3 [vid="tv_dialog_item"][text^="原图"]', snapshotUrls: 'https://i.gkd.li/i/13929119', diff --git a/src/apps/com.sina.weibocare.ts b/src/apps/com.sina.weibocare.ts index b65bf5f4..02a5da1e 100644 --- a/src/apps/com.sina.weibocare.ts +++ b/src/apps/com.sina.weibocare.ts @@ -8,10 +8,14 @@ export default defineGkdApp({ key: 1, name: '功能类-流量继续播放视频', desc: '点击[播放]', - fastQuery: true, - activityIds: 'com.weico.international.activity.MainFragmentActivity', - rules: '[id="com.sina.weibocare:id/ed_btn_positive"][text="播放"]', - snapshotUrls: 'https://i.gkd.li/i/13253223', + rules: [ + { + fastQuery: true, + activityIds: 'com.weico.international.activity.MainFragmentActivity', + matches: '[id="com.sina.weibocare:id/ed_btn_positive"][text="播放"]', + snapshotUrls: 'https://i.gkd.li/i/13253223', + }, + ], }, ], }); diff --git a/src/apps/com.sina.weibolite.ts b/src/apps/com.sina.weibolite.ts index fd2dbe62..4e139b46 100644 --- a/src/apps/com.sina.weibolite.ts +++ b/src/apps/com.sina.weibolite.ts @@ -43,8 +43,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.sina.weibolite:id/ed_btn_negative"]', - snapshotUrls: 'https://i.gkd.li/i/13727728', + rules: [ + { + activityIds: 'com.weico.international.activity.MainFragmentActivity', + matches: '[id="com.sina.weibolite:id/ed_btn_negative"]', + snapshotUrls: 'https://i.gkd.li/i/13727728', + }, + ], }, ], }); diff --git a/src/apps/com.sinovatech.unicom.ui.ts b/src/apps/com.sinovatech.unicom.ui.ts index bfee33c3..b63b51a2 100644 --- a/src/apps/com.sinovatech.unicom.ui.ts +++ b/src/apps/com.sinovatech.unicom.ui.ts @@ -10,14 +10,18 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - activityIds: [ - 'com.sinovatech.unicom.basic.ui.activity.MainActivity', - 'com.sinovatech.unicom.basic.ui.activity.WelcomeClient', - ], - rules: '[text="去开启"] - [vid="custom_dialog_cancel_button"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13331268', - 'https://i.gkd.li/i/14751210', + rules: [ + { + activityIds: [ + 'com.sinovatech.unicom.basic.ui.activity.MainActivity', + 'com.sinovatech.unicom.basic.ui.activity.WelcomeClient', + ], + matches: '[text="去开启"] - [vid="custom_dialog_cancel_button"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13331268', + 'https://i.gkd.li/i/14751210', + ], + }, ], }, { @@ -27,13 +31,22 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.sinovatech.unicom.ui:id/custom_dialog_cancel_button"]', - snapshotUrls: 'https://i.gkd.li/i/13511386', + rules: [ + { + activityIds: 'com.sinovatech.unicom.basic.ui.activity.MainActivity', + matches: + '[id="com.sinovatech.unicom.ui:id/custom_dialog_cancel_button"]', + snapshotUrls: 'https://i.gkd.li/i/13511386', + }, + ], }, { key: 3, name: '全屏广告-弹窗广告', fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, @@ -54,11 +67,11 @@ export default defineGkdApp({ }, { key: 4, - fastQuery: true, name: '局部广告-首页右下角卡片悬浮窗', - desc: '点击X', + desc: '点击关闭', rules: [ { + fastQuery: true, activityIds: 'com.sinovatech.unicom.basic.ui.activity.MainActivity', matches: '[id="com.sinovatech.unicom.ui:id/home_xuanfu_close"]', snapshotUrls: 'https://i.gkd.li/i/13930543', diff --git a/src/apps/com.sjm.xiaodesecond.mw.ts b/src/apps/com.sjm.xiaodesecond.mw.ts index aa300a58..473f9fd4 100644 --- a/src/apps/com.sjm.xiaodesecond.mw.ts +++ b/src/apps/com.sjm.xiaodesecond.mw.ts @@ -8,6 +8,9 @@ export default defineGkdApp({ key: 1, name: '全屏广告-弹窗广告', desc: '点击关闭/跳过', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, diff --git a/src/apps/com.sjm.zhuanzhuan.mcy.ts b/src/apps/com.sjm.zhuanzhuan.mcy.ts index 782e7174..1fc4ac04 100644 --- a/src/apps/com.sjm.zhuanzhuan.mcy.ts +++ b/src/apps/com.sjm.zhuanzhuan.mcy.ts @@ -7,16 +7,15 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', rules: [ { key: 1, - name: '更新弹窗', - matches: - '[id="com.sjm.zhuanzhuan.mcy:id/tv_new_version"] < LinearLayoutCompat +n [text="立即升级"]', action: 'back', + matches: '[text="立即升级"][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/13392514', }, ], diff --git a/src/apps/com.sjmly.sjmtask.xsh.ts b/src/apps/com.sjmly.sjmtask.xsh.ts index 218b8283..6af42097 100644 --- a/src/apps/com.sjmly.sjmtask.xsh.ts +++ b/src/apps/com.sjmly.sjmtask.xsh.ts @@ -7,6 +7,9 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, diff --git a/src/apps/com.smile.gifmaker.ts b/src/apps/com.smile.gifmaker.ts index 22131423..6aa38329 100644 --- a/src/apps/com.smile.gifmaker.ts +++ b/src/apps/com.smile.gifmaker.ts @@ -7,10 +7,14 @@ export default defineGkdApp({ { key: 10, name: '全屏广告-首页红包弹窗', - desc: '自动点击x按钮', + desc: '点击关闭', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', activityIds: 'com.yxcorp.gifshow.HomeActivity', rules: [ { + key: 1, name: '老友回归红包弹窗', matches: '@ImageView[id=null][clickable=true] + ViewGroup > [text!=null] + [text!=null]', @@ -20,17 +24,18 @@ export default defineGkdApp({ ], }, { + key: 2, name: '限时高额奖励弹窗', matches: '@ImageView[id=null][clickable=true] < ViewGroup + ViewGroup >2 [text="立即领取"]', - snapshotUrls: ['https://i.gkd.li/i/12708681'], + snapshotUrls: 'https://i.gkd.li/i/12708681', }, ], }, { key: 11, name: '局部广告-首页左侧红包悬浮控件', - desc: '自动点击x按钮', + desc: '点击关闭', activityIds: 'com.yxcorp.gifshow.HomeActivity', rules: [ { @@ -75,11 +80,12 @@ export default defineGkdApp({ { key: 13, name: '评价提示', + fastQuery: true, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { + activityIds: 'com.yxcorp.gifshow.HomeActivity', matches: '@[vid="close"] +2 * > [text="喜欢就给个好评吧"]', exampleUrls: 'https://m.gkd.li/57941037/da412e0f-47db-4cc0-8821-184c6ba42882', diff --git a/src/apps/com.smk.ts b/src/apps/com.smk.ts index 9b668edd..8f3bcb82 100644 --- a/src/apps/com.smk.ts +++ b/src/apps/com.smk.ts @@ -11,14 +11,18 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - activityIds: [ - 'com.smk.activity.MainActivity', - 'com.smk.activity.LaunchActivity', - ], - rules: '[id="com.smk:id/iv_close_ad"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13402584', - 'https://i.gkd.li/i/13425013', // activityIds: 'com.smk.activity.LaunchActivity', + rules: [ + { + activityIds: [ + 'com.smk.activity.MainActivity', + 'com.smk.activity.LaunchActivity', + ], + matches: '[id="com.smk:id/iv_close_ad"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13402584', + 'https://i.gkd.li/i/13425013', + ], + }, ], }, ], diff --git a/src/apps/com.smzdm.client.android.ts b/src/apps/com.smzdm.client.android.ts index 03f713bb..38a7ea32 100644 --- a/src/apps/com.smzdm.client.android.ts +++ b/src/apps/com.smzdm.client.android.ts @@ -6,32 +6,50 @@ export default defineGkdApp({ groups: [ { key: 1, - fastQuery: true, name: '全屏广告-弹窗广告', - activityIds: 'com.smzdm.client.android.app.HomeActivity', - rules: '[id="com.smzdm.client.android:id/dialog_home_close"]', - snapshotUrls: 'https://i.gkd.li/i/12695751', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.smzdm.client.android.app.HomeActivity', + matches: '[id="com.smzdm.client.android:id/dialog_home_close"]', + snapshotUrls: 'https://i.gkd.li/i/12695751', + }, + ], }, { key: 2, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: - '[id="com.smzdm.client.android:id/tv_version"] +2 [id="com.smzdm.client.android:id/iv_close"]', - snapshotUrls: 'https://i.gkd.li/i/13198016', + rules: [ + { + activityIds: '.app.HomeActivity', + matches: + '[id="com.smzdm.client.android:id/tv_version"] +2 [id="com.smzdm.client.android:id/iv_close"]', + snapshotUrls: 'https://i.gkd.li/i/13198016', + }, + ], }, { key: 10, name: '权限提示-请求读取剪贴板权限弹窗', + desc: '点击暂不允许', fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - activityIds: 'com.smzdm.client.android.app.HomeActivity', - rules: '@[text="暂不允许"] + [text="允许"]', - snapshotUrls: 'https://i.gkd.li/i/13198020', + rules: [ + { + activityIds: 'com.smzdm.client.android.app.HomeActivity', + matches: '@[text="暂不允许"] + [text="允许"]', + snapshotUrls: 'https://i.gkd.li/i/13198020', + }, + ], }, { key: 3, @@ -40,10 +58,18 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: 'ImageView[id="com.smzdm.client.android:id/ib_close"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13438810', //com.smzdm.client.android.module.community.module.bask.BaskDetailActivity - 'https://i.gkd.li/i/13626746', //com.smzdm.client.android.module.haojia.detail.HaojiaDetailActivity + rules: [ + { + activityIds: [ + '.module.haojia.detail.HaojiaDetailActivity', + '.module.community.module.bask.BaskDetailActivity', + ], + matches: 'ImageView[id="com.smzdm.client.android:id/ib_close"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13438810', + 'https://i.gkd.li/i/13626746', + ], + }, ], }, ], diff --git a/src/apps/com.snda.wifilocating.ts b/src/apps/com.snda.wifilocating.ts index 620cd236..2aa86ea5 100644 --- a/src/apps/com.snda.wifilocating.ts +++ b/src/apps/com.snda.wifilocating.ts @@ -51,8 +51,8 @@ export default defineGkdApp({ rules: [ { key: 0, - activityIds: 'com.wifitutu.ui.tools.SpeedUpBActivity', fastQuery: true, + activityIds: 'com.wifitutu.ui.tools.SpeedUpBActivity', matches: '[vid="native_express_close_proxy"]', snapshotUrls: 'https://i.gkd.li/i/14622506', }, @@ -93,7 +93,7 @@ export default defineGkdApp({ key: 0, fastQuery: true, activityIds: 'com.wifitutu.ui.main.MainActivity', - matches: '@* - [vid="native_express_ad_logo_tv"]', + matches: '[vid="native_express_ad_close"]', snapshotUrls: 'https://i.gkd.li/i/15284730', }, ], diff --git a/src/apps/com.sobo.app.ts b/src/apps/com.sobo.app.ts index 6f62e182..0e93eb70 100644 --- a/src/apps/com.sobo.app.ts +++ b/src/apps/com.sobo.app.ts @@ -24,6 +24,9 @@ export default defineGkdApp({ key: 2, name: '全屏广告-弹窗广告', desc: '点击关闭', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { fastQuery: true, diff --git a/src/apps/com.sodalife.sodax.ts b/src/apps/com.sodalife.sodax.ts index 5831e1ed..f69dad68 100644 --- a/src/apps/com.sodalife.sodax.ts +++ b/src/apps/com.sodalife.sodax.ts @@ -19,6 +19,9 @@ export default defineGkdApp({ { key: 10, name: '双十一广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', activityIds: 'com.sodalife.sodax.libraries.ads.gromore.GroMoreSplashActivity', matches: diff --git a/src/apps/com.soft.blued.ts b/src/apps/com.soft.blued.ts index 7b9f1b9c..b7023518 100644 --- a/src/apps/com.soft.blued.ts +++ b/src/apps/com.soft.blued.ts @@ -20,7 +20,7 @@ export default defineGkdApp({ snapshotUrls: [ 'https://i.gkd.li/i/12777097', 'https://i.gkd.li/i/13694950', - 'https://i.gkd.li/i/13699455', // activityIds: 'com.soft.blued.ui.home.HomeActivity', + 'https://i.gkd.li/i/13699455', ], }, { @@ -60,11 +60,14 @@ export default defineGkdApp({ { key: 3, name: '全屏广告-会员活动弹窗', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, activityIds: 'com.blued.android.core.ui.TransparentActivity', - fastQuery: true, matches: '[vid="blued_ad_layout"] + [vid="img_close"]', snapshotUrls: 'https://i.gkd.li/i/14310618', }, diff --git a/src/apps/com.sohu.sohuvideo.ts b/src/apps/com.sohu.sohuvideo.ts index b4bf17ad..cb8bf143 100644 --- a/src/apps/com.sohu.sohuvideo.ts +++ b/src/apps/com.sohu.sohuvideo.ts @@ -11,9 +11,14 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: - '@[id="com.sohu.sohuvideo:id/ivClose"] + LinearLayout [text="新版本上线啦"]', - snapshotUrls: 'https://i.gkd.li/i/13435504', + rules: [ + { + activityIds: '.ui.homepage.MainActivity', + matches: + '@[id="com.sohu.sohuvideo:id/ivClose"] + LinearLayout [text="新版本上线啦"]', + snapshotUrls: 'https://i.gkd.li/i/13435504', + }, + ], }, ], }); diff --git a/src/apps/com.sqsp.movie.ts b/src/apps/com.sqsp.movie.ts index c084dcc5..64c9cc70 100644 --- a/src/apps/com.sqsp.movie.ts +++ b/src/apps/com.sqsp.movie.ts @@ -8,6 +8,9 @@ export default defineGkdApp({ key: 1, name: '全屏广告-弹窗广告', desc: '点击关闭', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { activityIds: diff --git a/src/apps/com.ss.android.article.lite.ts b/src/apps/com.ss.android.article.lite.ts deleted file mode 100644 index 2606f2f8..00000000 --- a/src/apps/com.ss.android.article.lite.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { defineGkdApp } from '@gkd-kit/define'; - -export default defineGkdApp({ - id: 'com.ss.android.article.lite', - name: '头条搜索极速版', - groups: [ - { - key: 10, - name: '全屏广告-首页-红包弹窗', - activityIds: 'com.ss.android.article.lite.activity.SplashActivity', - rules: '@[desc="关闭"] + [text$="现金红包"]', - snapshotUrls: 'https://i.gkd.li/i/12705414', - }, - { - key: 11, - name: '局部广告-首页-右侧悬浮广告', - activityIds: 'com.ss.android.article.lite.activity.SplashActivity', - rules: - 'FrameLayout[id!=null] > @ImageView[id!=null][clickable=true] + ImageView[id!=null]', - snapshotUrls: 'https://i.gkd.li/i/12705452', - }, - { - key: 12, - name: '功能类-首页-你可能感兴趣的人', - activityIds: 'com.ss.android.article.lite.activity.SplashActivity', - rules: '[text="你可能感兴趣的人"] + [desc="关闭"]', - snapshotUrls: 'https://i.gkd.li/i/12705427', - }, - { - key: 20, - name: '功能类-任务页面-签到弹窗', - activityIds: 'com.ss.android.article.lite.activity.SplashActivity', - rules: [ - { - matches: - 'UIView[clickable=false] + LynxFlattenUI[clickable=true][visibleToUser=true]', - action: 'clickCenter', - snapshotUrls: 'https://i.gkd.li/i/12705439', - }, - ], - }, - { - key: 21, - name: '局部广告-任务页面-右侧悬浮红包', - activityIds: 'com.ss.android.article.lite.activity.SplashActivity', - rules: 'UIScrollView + UIView + UISvg', - snapshotUrls: 'https://i.gkd.li/i/12705447', - }, - { - key: 22, - name: '全屏广告-任务页面-答题弹窗', - activityIds: 'com.ss.android.article.lite.activity.SplashActivity', - rules: [ - { - matches: - '[text^="答对"][text$="金币"] + FlattenUIImage[clickable=true]', - action: 'clickCenter', - snapshotUrls: 'https://i.gkd.li/i/12705456', - }, - ], - }, - { - key: 30, - name: '全屏广告-搜索页面-搜索得金币弹窗', - activityIds: 'com.android.bytedance.search.SearchActivity', - rules: [ - { - matches: '[text^="搜索"][text$="金币"] + LynxFlattenUI + UISvg', - action: 'clickCenter', - snapshotUrls: 'https://i.gkd.li/i/12705468', - }, - ], - }, - ], -}); diff --git a/src/apps/com.ss.android.article.news.ts b/src/apps/com.ss.android.article.news.ts index aa6e3b51..5193578f 100644 --- a/src/apps/com.ss.android.article.news.ts +++ b/src/apps/com.ss.android.article.news.ts @@ -23,6 +23,7 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', @@ -69,6 +70,7 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', + activityIds: '.activity.MainActivity', rules: [ { key: 0, @@ -89,15 +91,6 @@ export default defineGkdApp({ desc: '点击右上角[更多]图标按钮,点击不感兴趣', activityIds: 'com.ss.android.ugc.detail.activity.TikTokActivity', rules: [ - { - key: -1, - preKeys: 0, - actionCd: 35000, //APP更新后点击不感兴趣不会跳过当前视频了，所以需要冷却一下等下一次重新跳过广告视频 - name: '点击不感兴趣', - matches: - '@LinearLayout[clickable=true] > RelativeLayout + TextView[text="不感兴趣"]', - snapshotUrls: 'https://i.gkd.li/i/12679277', - }, { key: 0, name: '点击右上角[更多]图标按钮', @@ -113,6 +106,15 @@ export default defineGkdApp({ 'https://i.gkd.li/i/13930050', ], }, + { + key: -1, + preKeys: [0], + actionCd: 35000, //APP更新后点击不感兴趣不会跳过当前视频了，所以需要冷却一下等下一次重新跳过广告视频 + name: '点击不感兴趣', + matches: + '@LinearLayout[clickable=true] > RelativeLayout + TextView[text="不感兴趣"]', + snapshotUrls: 'https://i.gkd.li/i/12679277', + }, ], }, { @@ -153,9 +155,9 @@ export default defineGkdApp({ { key: 13, name: '局部广告-底部话题推荐弹窗', - activityIds: 'com.ss.android.article.news.activity.MainActivity', rules: [ { + activityIds: 'com.ss.android.article.news.activity.MainActivity', name: '话题谈论', matches: 'FlattenUIText[text="参与讨论"] + FlattenUIImage[clickable=true]', @@ -178,6 +180,7 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/13402468', }, { + preKeys: [0], name: '等待30s点击"关闭"', actionDelay: 30000, activityIds: 'com.ss.android.excitingvideo.ExcitingVideoActivity', @@ -192,7 +195,6 @@ export default defineGkdApp({ desc: '点击X', rules: [ { - fastQuery: true, activityIds: 'com.ss.android.article.news.activity.MainActivity', matches: 'FrameLayout[childCount=8] > FlattenUIImage[index=7]', snapshotUrls: 'https://i.gkd.li/i/13828331', diff --git a/src/apps/com.ss.android.article.video.ts b/src/apps/com.ss.android.article.video.ts index c01d6878..e7648482 100644 --- a/src/apps/com.ss.android.article.video.ts +++ b/src/apps/com.ss.android.article.video.ts @@ -27,17 +27,28 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '@[desc="关闭"] - LinearLayout > [text="立即升级"]', - snapshotUrls: 'https://i.gkd.li/i/13328430', + rules: [ + { + activityIds: '.activity.SplashActivity', + matches: '@[desc="关闭"] - LinearLayout > [text="立即升级"]', + snapshotUrls: 'https://i.gkd.li/i/13328430', + }, + ], }, { key: 2, name: '权限提示-通知权限', fastQuery: true, + matchTime: 10000, actionMaximum: 1, - rules: - '@TextView[id="com.ss.android.article.video:id/sj"][text="暂不开启"]', - snapshotUrls: 'https://i.gkd.li/i/13456568', + resetMatch: 'app', + rules: [ + { + activityIds: '.activity.SplashActivity', + matches: ['[text="开启推送通知"]', '[text="暂不开启"]'], + snapshotUrls: 'https://i.gkd.li/i/13456568', + }, + ], }, { key: 6, @@ -46,9 +57,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - activityIds: 'com.ss.android.article.video.activity.SplashActivity', - rules: '@FlattenUIImage[clickable=true] -2 [text="开心收下"]', - snapshotUrls: 'https://i.gkd.li/i/13620299', + rules: [ + { + activityIds: 'com.ss.android.article.video.activity.SplashActivity', + matches: '@FlattenUIImage[clickable=true] -2 [text="开心收下"]', + snapshotUrls: 'https://i.gkd.li/i/13620299', + }, + ], }, ], }); diff --git a/src/apps/com.ss.android.auto.ts b/src/apps/com.ss.android.auto.ts index 8107c8b7..0167a836 100644 --- a/src/apps/com.ss.android.auto.ts +++ b/src/apps/com.ss.android.auto.ts @@ -16,7 +16,7 @@ export default defineGkdApp({ rules: [ { key: 0, - name: '点击"x"', + name: '点击关闭', matches: 'TextView[text.length=1][id=null][clickable=false] < @FrameLayout[clickable=true][id!=null] - LinearLayout > [text="广告"]', // 貌似快照存在延迟导致屏幕与节点不对应 @@ -27,18 +27,18 @@ export default defineGkdApp({ }, { // 不与旧版本合并，尽量使用[clickable=true]，保证速度避免误触 - preKeys: 0, - name: '点击"不感兴趣"1', // 懂车帝v7.8.4样式 + preKeys: [0], + name: '点击"不感兴趣"1', matches: '@ViewGroup[clickable=true] TextView[text="不感兴趣"]', snapshotUrls: 'https://i.gkd.li/i/13538627', }, { - preKeys: 0, - name: '点击"不感兴趣"2', // 懂车帝v7.7.4样式、v7.8.0样式 + preKeys: [0], + name: '点击"不感兴趣"2', matches: '[text="不感兴趣"][clickable=true]', snapshotUrls: [ 'https://i.gkd.li/i/12711589', - 'https://i.gkd.li/i/13959613', //v7.8.0样式 + 'https://i.gkd.li/i/13959613', ], }, ], @@ -49,56 +49,71 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - rules: - '@TextView[text="以后再说"] - FrameLayout >2 TextView[text$="升级"]', - snapshotUrls: 'https://i.gkd.li/i/13534445', + rules: [ + { + activityIds: '.activity.SplashActivity', + matches: + '@TextView[text="以后再说"] - FrameLayout >2 TextView[text$="升级"]', + snapshotUrls: 'https://i.gkd.li/i/13534445', + }, + ], }, { key: 3, name: '局部广告-右下角悬浮窗', - fastQuery: true, matchTime: 10000, actionMaximum: 1, - resetMatch: 'activity', - activityIds: [ - 'com.ss.android.auto.activity.SplashActivity', - 'com.ss.android.auto.activity.ConcernDetailActivity', - ], - rules: - 'FrameLayout > RelativeLayout[childCount=2] > RelativeLayout + ImageView[clickable=true]', - snapshotUrls: [ - 'https://i.gkd.li/i/12798338', - 'https://i.gkd.li/i/13535531', - 'https://i.gkd.li/i/13535933', - 'https://i.gkd.li/i/13535932', + rules: [ + { + activityIds: [ + 'com.ss.android.auto.activity.SplashActivity', + 'com.ss.android.auto.activity.ConcernDetailActivity', + ], + matches: + 'FrameLayout > RelativeLayout[childCount=2] > RelativeLayout + ImageView[clickable=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/12798338', + 'https://i.gkd.li/i/13535531', + 'https://i.gkd.li/i/13535933', + 'https://i.gkd.li/i/13535932', + ], + }, ], }, { key: 4, name: '局部广告-文章底部卡片广告', - fastQuery: true, - activityIds: - 'com.ss.android.article.base.feature.detail2.view.NewDetailActivity', - rules: - 'FrameLayout > RelativeLayout > @ImageView[clickable=true] + [text="广告"]', - snapshotUrls: 'https://i.gkd.li/i/12811597', + rules: [ + { + fastQuery: true, + activityIds: + 'com.ss.android.article.base.feature.detail2.view.NewDetailActivity', + matches: + 'FrameLayout > RelativeLayout > @ImageView[clickable=true] + [text="广告"]', + snapshotUrls: 'https://i.gkd.li/i/12811597', + }, + ], }, { key: 5, name: '局部广告-评论区信息流广告', desc: '点击关闭', fastQuery: true, - activityIds: [ - 'com.ss.android.article.base.feature.detail2.view.NewDetailActivity', - 'com.ss.android.auto.ugc.video.activity.UgcLongPostActivity', - 'com.ss.android.auto.ugc.video.activity.UgcNewDetailActivity', - ], - rules: '@ImageView[clickable=true] - LinearLayout > [text="广告"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12811459', - 'https://i.gkd.li/i/12825865', - 'https://i.gkd.li/i/12900666', - 'https://i.gkd.li/i/14321293', + rules: [ + { + activityIds: [ + 'com.ss.android.article.base.feature.detail2.view.NewDetailActivity', + 'com.ss.android.auto.ugc.video.activity.UgcLongPostActivity', + 'com.ss.android.auto.ugc.video.activity.UgcNewDetailActivity', + ], + matches: '@ImageView[clickable=true] - LinearLayout > [text="广告"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12811459', + 'https://i.gkd.li/i/12825865', + 'https://i.gkd.li/i/12900666', + 'https://i.gkd.li/i/14321293', + ], + }, ], }, { @@ -109,8 +124,11 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { - name: '调用返回', action: 'back', + activityIds: [ + '.activity.SplashActivity', + 'com.bytedance.im.auto.conversation.activity.ConversationListActivity', + ], matches: 'TextView[text*="推送通知"]', snapshotUrls: [ 'https://i.gkd.li/i/12840664', @@ -123,19 +141,22 @@ export default defineGkdApp({ { key: 7, name: '局部广告-选车页卡片广告', - fastQuery: true, - activityIds: 'com.ss.android.auto.activity.ConcernDetailActivity', - rules: - 'TextView[text.length=1][id=null][clickable=false] < @FrameLayout[clickable=true][id!=null] -2 [text="广告"]', - snapshotUrls: 'https://i.gkd.li/i/13686928', + rules: [ + { + fastQuery: true, + activityIds: 'com.ss.android.auto.activity.ConcernDetailActivity', + matches: '@FrameLayout[clickable=true][id!=null] -2 [text="广告"]', + snapshotUrls: 'https://i.gkd.li/i/13686928', + }, + ], }, { key: 8, name: '局部广告-车型页面右下角直播悬浮窗', - desc: '点击X', - fastQuery: true, + desc: '点击关闭', rules: [ { + fastQuery: true, activityIds: 'com.ss.android.auto.activity.ConcernDetailActivity', matches: 'FrameLayout[childCount=8] > TextView[text=""]', snapshotUrls: 'https://i.gkd.li/i/14034740', @@ -151,6 +172,7 @@ export default defineGkdApp({ rules: [ { action: 'back', + activityIds: '.activity.SplashActivity', matches: '[text="去评价"]', snapshotUrls: 'https://i.gkd.li/i/14810042', }, diff --git a/src/apps/com.ss.android.lark.ts b/src/apps/com.ss.android.lark.ts index ba396222..c638dcb0 100644 --- a/src/apps/com.ss.android.lark.ts +++ b/src/apps/com.ss.android.lark.ts @@ -7,22 +7,30 @@ export default defineGkdApp({ { key: 1, name: '功能类-桌面端登录确认', - fastQuery: true, - activityIds: - 'com.ss.lark.android.passport.biz.feature.sso.suite.SuiteConfirmActivity', - rules: - '[text="飞书 桌面端登录确认"] +2 [id="com.ss.android.lark:id/login_button"]', - snapshotUrls: 'https://i.gkd.li/i/13494960', + rules: [ + { + fastQuery: true, + activityIds: + 'com.ss.lark.android.passport.biz.feature.sso.suite.SuiteConfirmActivity', + matches: + '[text="飞书 桌面端登录确认"] +2 [id="com.ss.android.lark:id/login_button"]', + snapshotUrls: 'https://i.gkd.li/i/13494960', + }, + ], }, { key: 10, name: '功能类-自动查看原图', desc: '查看图片时自动点击"查看原图"', - activityIds: - 'com.ss.android.lark.widget.photo.preview.PhotoPagerActivity', - fastQuery: true, - rules: '[id="com.ss.android.lark:id/look_origin_icon"]', - snapshotUrls: 'https://i.gkd.li/i/12840528', + rules: [ + { + activityIds: + 'com.ss.android.lark.widget.photo.preview.PhotoPagerActivity', + fastQuery: true, + matches: '[id="com.ss.android.lark:id/look_origin_icon"]', + snapshotUrls: 'https://i.gkd.li/i/12840528', + }, + ], }, { key: 11, diff --git a/src/apps/com.ss.android.ugc.aweme.lite.ts b/src/apps/com.ss.android.ugc.aweme.lite.ts index 76315dcf..e5fac487 100644 --- a/src/apps/com.ss.android.ugc.aweme.lite.ts +++ b/src/apps/com.ss.android.ugc.aweme.lite.ts @@ -10,11 +10,14 @@ export default defineGkdApp({ rules: [ { key: 0, - name: '"首页商城"体验邀请弹窗', + name: '[首页商城]体验邀请弹窗', + fastQuery: true, activityIds: 'com.ss.android.ugc.aweme.commerce.sdk.MallContainerActivity', - matches: - '[text="不再提示"] + @ECCustomUiImage[clickable=true] +n LynxFlattenUI[text^="立即体验"]', + matches: [ + 'UIText[text^="立即体验"]', + 'FlattenUIText[text="不再提示"][visibleToUser=true]', + ], snapshotUrls: 'https://i.gkd.li/i/13684791', }, ], @@ -25,37 +28,40 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - activityIds: ['com.ss.android.ugc.aweme.main.MainActivity'], - rules: - '[text="朋友推荐"] +2 [id="com.ss.android.ugc.aweme.lite:id/close"][clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/13650523', + rules: [ + { + activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', + matches: + '[text="朋友推荐"] +2 [id="com.ss.android.ugc.aweme.lite:id/close"][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/13650523', + }, + ], }, { key: 9, - fastQuery: true, name: '权限提示-通知权限', desc: '点击暂不开启', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', rules: [ { - matches: - '[id="com.ss.android.ugc.aweme.lite:id/gl7"] > [id="com.ss.android.ugc.aweme.lite:id/h5q"]', + activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', + matches: '[text="及时获得消息提醒"] +2 [text="暂不开启"]', snapshotUrls: 'https://i.gkd.li/i/13888485', }, ], }, { key: 10, - fastQuery: true, name: '功能类-选择图片时自动勾选原图', rules: [ { + fastQuery: true, activityIds: 'com.ss.android.ugc.aweme.im.sdk.media.choose.MediaChooseActivity', - matches: - '[id="com.ss.android.ugc.aweme.lite:id/amh"][desc^="未选中"]', + matches: '[text="原图"][desc^="未选中"]', snapshotUrls: [ 'https://i.gkd.li/i/13946092', //未勾选原图 'https://i.gkd.li/i/13946033', //已勾选原图 diff --git a/src/apps/com.ss.android.ugc.aweme.ts b/src/apps/com.ss.android.ugc.aweme.ts index 90310c19..4baecee7 100644 --- a/src/apps/com.ss.android.ugc.aweme.ts +++ b/src/apps/com.ss.android.ugc.aweme.ts @@ -92,6 +92,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.main.MainActivity', matches: ['[text="立即升级"]', '[text="以后再说"]'], snapshotUrls: [ 'https://i.gkd.li/i/12534016', @@ -104,19 +105,14 @@ export default defineGkdApp({ { key: 4, name: '局部广告-首页左上角广告', - activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', - rules: - 'ViewGroup + FrameLayout[id=null] > FrameLayout[childCount=2][id!=null] > ImageView[desc="关闭"][clickable=true][id!=null]', - snapshotUrls: 'https://i.gkd.li/i/12749276', - }, - { - key: 5, - name: '全屏广告-弹窗广告', - activityIds: 'com.android.launcher.Launcher', - fastQuery: true, - rules: - '[id="android:id/content"] >2 RelativeLayout[childCount<=5] > @ImageView[clickable=true][id!=null] - TextView[text="广告"][id!=null]', - snapshotUrls: 'https://i.gkd.li/i/12769137', + rules: [ + { + activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', + matches: + 'ViewGroup + FrameLayout[id=null] > FrameLayout[childCount=2][id!=null] > ImageView[desc="关闭"][clickable=true][id!=null]', + snapshotUrls: 'https://i.gkd.li/i/12749276', + }, + ], }, { key: 6, @@ -125,32 +121,40 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - rules: '@[text="取消"] +2 [text="五星好评"]', - snapshotUrls: 'https://i.gkd.li/i/13053628', - exampleUrls: - 'https://github.com/gkd-kit/inspect/assets/38517192/4554c785-39e0-4eac-9cfb-f1b1c2976008', + rules: [ + { + activityIds: '.main.MainActivity', + matches: '@[text="取消"] +2 [text="五星好评"]', + snapshotUrls: 'https://i.gkd.li/i/13053628', + }, + ], }, { key: 7, - fastQuery: true, name: '功能类-设置无声进入抖音弹窗', desc: '点击[拒绝]', - activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', - rules: '@[text="拒绝"] + [text="去设置"]', - snapshotUrls: 'https://i.gkd.li/i/13256087', + rules: [ + { + fastQuery: true, + activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', + matches: '@[text="拒绝"] + [text="去设置"]', + snapshotUrls: 'https://i.gkd.li/i/13256087', + }, + ], }, { key: 10, name: '权限提示-通知权限', - desc: '自动点击“暂不”', + desc: '点击[暂不]', + fastQuery: true, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, + activityIds: '.main.MainActivity', rules: [ { key: 0, matches: - '@[text="暂不"][focusable=true] < LinearLayout - LinearLayout >(2) [text="开启朋友通知"]', + '@[text="暂不"][focusable=true] < LinearLayout - LinearLayout >2 [text="开启朋友通知"]', snapshotUrls: 'https://i.gkd.li/i/12675129', }, { @@ -164,13 +168,17 @@ export default defineGkdApp({ key: 11, name: '功能类-自动勾选原图', desc: '聊天发送图片时自动勾选原图', - fastQuery: true, - activityIds: - 'com.ss.android.ugc.aweme.im.sdk.media.choose.MediaChooseActivity', - rules: '[text="原图"][desc="未选中/复选框 原图"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12846036', // 未选中 - 'https://i.gkd.li/i/12846040', // 已选中 + rules: [ + { + fastQuery: true, + activityIds: + 'com.ss.android.ugc.aweme.im.sdk.media.choose.MediaChooseActivity', + matches: '[text="原图"][desc="未选中/复选框 原图"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12846036', // 未选中 + 'https://i.gkd.li/i/12846040', // 已选中 + ], + }, ], }, { @@ -179,6 +187,7 @@ export default defineGkdApp({ fastQuery: true, rules: [ { + key: 1, matches: '@[text="取消"] + [text*="提醒我"]', snapshotUrls: [ 'https://i.gkd.li/i/13241564', @@ -187,6 +196,8 @@ export default defineGkdApp({ ], }, { + key: 2, + activityIds: '.main.MainActivity', matches: '[text="管理使用时间"] + Button[text="忽略提醒"]', snapshotUrls: 'https://i.gkd.li/i/13372725', }, @@ -247,25 +258,37 @@ export default defineGkdApp({ { key: 14, name: '全屏广告-视频播放中途插入的打招呼界面', - activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', - rules: 'FrameLayout > @[desc="关闭"] + ViewGroup > [text$="打个招呼"]', - snapshotUrls: 'https://i.gkd.li/i/13379307', + rules: [ + { + fastQuery: true, + activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', + matches: + 'FrameLayout > @[desc="关闭"] + ViewGroup > [text$="打个招呼"]', + snapshotUrls: 'https://i.gkd.li/i/13379307', + }, + ], }, { key: 15, name: '全屏广告-关闭商城推荐', desc: '点击"不感兴趣"', - activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', - rules: '@[text="不感兴趣"][clickable=true] + [text="去商城搜索更多"]', - snapshotUrls: 'https://i.gkd.li/i/13800207', + rules: [ + { + fastQuery: true, + activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', + matches: + '@[text="不感兴趣"][clickable=true] + [text="去商城搜索更多"]', + snapshotUrls: 'https://i.gkd.li/i/13800207', + }, + ], }, { key: 16, - fastQuery: true, name: '局部广告-拍同款弹窗', desc: '点击不感兴趣', rules: [ { + fastQuery: true, activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', matches: '@LynxFlattenUI[text="不感兴趣"] +4 [text="拍同款"]', snapshotUrls: 'https://i.gkd.li/i/13996724', @@ -325,6 +348,7 @@ export default defineGkdApp({ rules: [ { fastQuery: true, + activityIds: '.main.MainActivity', matches: ['[text*="通讯录"]', '[text="拒绝"]'], exampleUrls: 'https://m.gkd.li/57941037/8f70418d-92f0-4264-83fd-a680350c478e', @@ -347,12 +371,11 @@ export default defineGkdApp({ excludeActivityIds: '.setting.ui.SettingCommonProtocolActivity', matches: [ '[text*="青少年" || text*="未成年"][text*="模式"]', - '[text="关闭" || desc="关闭"]', + '[text="关闭"]', ], snapshotUrls: [ 'https://i.gkd.li/i/14321107', 'https://i.gkd.li/i/14473006', - 'https://i.gkd.li/i/14567078', 'https://i.gkd.li/i/17726070', ], excludeSnapshotUrls: [ @@ -370,6 +393,7 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', + activityIds: '.search.activity.SearchResultActivity', rules: [ { key: 0, diff --git a/src/apps/com.ss.android.yumme.video.ts b/src/apps/com.ss.android.yumme.video.ts index 16663c7c..be1133dd 100644 --- a/src/apps/com.ss.android.yumme.video.ts +++ b/src/apps/com.ss.android.yumme.video.ts @@ -13,6 +13,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.main.MainActivity', matches: ['[text="立即升级"]', '[text="以后再说"]'], snapshotUrls: [ 'https://i.gkd.li/i/12534016', @@ -30,6 +31,7 @@ export default defineGkdApp({ rules: [ { action: 'back', + activityIds: 'com.ss.android.ugc.aweme.main.MainActivity', matches: 'TextView[text="去商店评分"]', snapshotUrls: 'https://i.gkd.li/i/15858132', }, diff --git a/src/apps/com.steampy.app.ts b/src/apps/com.steampy.app.ts index 786f47e3..b712510a 100644 --- a/src/apps/com.steampy.app.ts +++ b/src/apps/com.steampy.app.ts @@ -11,9 +11,14 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: - '@[id="com.steampy.app:id/imgClose"] - RelativeLayout [id="com.steampy.app:id/tv_update"]', - snapshotUrls: 'https://i.gkd.li/i/13695519', + rules: [ + { + activityIds: '.activity.common.MainActivity', + matches: + '@[id="com.steampy.app:id/imgClose"] - RelativeLayout [id="com.steampy.app:id/tv_update"]', + snapshotUrls: 'https://i.gkd.li/i/13695519', + }, + ], }, { key: 2, diff --git a/src/apps/com.sup.android.superb.ts b/src/apps/com.sup.android.superb.ts index e7aea6da..ed8ec745 100644 --- a/src/apps/com.sup.android.superb.ts +++ b/src/apps/com.sup.android.superb.ts @@ -25,8 +25,14 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', fastQuery: true, - rules: '[text$="青少年模式"] + [text="我知道了"]', - snapshotUrls: 'https://i.gkd.li/i/13796869', + rules: [ + { + activityIds: + 'com.sup.superb.m_teenager.view.EnterTeenagerModeDialogActivity', + matches: '[text$="青少年模式"] + [text="我知道了"]', + snapshotUrls: 'https://i.gkd.li/i/13796869', + }, + ], }, { key: 5, @@ -34,8 +40,12 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - rules: '[text="开启推送通知"] +2 * > [text="以后再说"]', - snapshotUrls: 'https://i.gkd.li/i/13691081', + rules: [ + { + matches: '[text="开启推送通知"] +2 * > [text="以后再说"]', + snapshotUrls: 'https://i.gkd.li/i/13691081', + }, + ], }, { key: 6, @@ -43,16 +53,21 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - activityIds: 'com.sup.android.base.MainActivity', - rules: - 'FrameLayout > RelativeLayout > @ImageView[clickable=true] + ImageView', - snapshotUrls: 'https://i.gkd.li/i/13624220', + rules: [ + { + fastQuery: true, + activityIds: 'com.sup.android.base.MainActivity', + matches: + '@ImageView[clickable=true][visibleToUser=true][childCount=0] < RelativeLayout[childCount=2] < FrameLayout - [id="com.sup.android.superb:id/tab_container"]', + snapshotUrls: 'https://i.gkd.li/i/13624220', + }, + ], }, { key: 7, - fastQuery: true, name: '更新提示', - desc: '点击我再想想', + desc: '点击[我再想想]', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', @@ -73,6 +88,10 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: [ + 'com.sup.android.base.MainActivity', + 'com.sup.android.base.praise.PraiseDialogActivity', + ], matches: ['[text^="喜欢皮皮虾吗"]', '[text="取消"]'], snapshotUrls: [ 'https://i.gkd.li/i/14005608', @@ -85,11 +104,15 @@ export default defineGkdApp({ key: 9, name: '全屏广告-集五福弹窗', desc: '点击关闭', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { fastQuery: true, activityIds: 'com.sup.android.base.MainActivity', - matches: '[id="com.sup.android.superb:id/afa"]', + matches: + '@ImageView[clickable=true][visibleToUser=true][childCount=0] <2 RelativeLayout[childCount=2] < [id="android:id/content"]', exampleUrls: 'https://m.gkd.li/57941037/246d1d0b-d493-4d40-bbb7-9c04ae6b457d', snapshotUrls: 'https://i.gkd.li/i/14151026', @@ -115,18 +138,18 @@ export default defineGkdApp({ key: 11, name: '分段广告-信息流广告', desc: '点击展开-点击[不感兴趣]', + fastQuery: true, activityIds: 'com.sup.android.base.MainActivity', rules: [ { key: 0, matches: - 'RecyclerView > FrameLayout[id!=null] >6 ImageView[clickable=true]', + 'RecyclerView > FrameLayout[id!=null] >4 FrameLayout[childCount=5] > ViewGroup[childCount=1] > @ImageView[clickable=true][childCount=0] < [text="不感兴趣"]', snapshotUrls: 'https://i.gkd.li/i/14886477', }, diff --git a/src/apps/com.svm.hbyy.ts b/src/apps/com.svm.hbyy.ts index ce591cee..5e3ac3e6 100644 --- a/src/apps/com.svm.hbyy.ts +++ b/src/apps/com.svm.hbyy.ts @@ -9,6 +9,9 @@ export default defineGkdApp({ name: '全屏广告-弹窗广告', desc: '点击关闭', fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { activityIds: 'com.svm.core.pro.view.activity.MainActivityEx', diff --git a/src/apps/com.taobao.etao.ts b/src/apps/com.taobao.etao.ts index 4a7a24d8..2af699bd 100644 --- a/src/apps/com.taobao.etao.ts +++ b/src/apps/com.taobao.etao.ts @@ -5,21 +5,11 @@ export default defineGkdApp({ name: '一淘', groups: [ { - key: 1, - name: '更新提示', + key: 2, + name: '全屏广告-弹窗广告', matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '@[text="取消"] < * > [text="好,升级"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12684250', - 'https://i.gkd.li/i/12727457', - 'https://i.gkd.li/i/12684244', - ], - }, - { - key: 2, - name: '全屏广告-弹窗广告', rules: [ { key: 0, @@ -49,18 +39,19 @@ export default defineGkdApp({ key: 10, name: '权限提示-通知权限', desc: '点击关闭', - matchTime: 10000, actionMaximum: 1, resetMatch: 'app', rules: [ { key: 0, + activityIds: 'com.taobao.sns.app.message.MessageActivity', matches: '[text^="打开消息通知"] + [text="去开启"] + ImageView[clickable=true]', snapshotUrls: 'https://i.gkd.li/i/12684278', }, { key: 1, + activityIds: '.mine.MetaXMineActivity', matches: '[text^="打开消息通知"] + FrameLayout > [text="去开启"] < FrameLayout + ImageView[clickable=true]', snapshotUrls: 'https://i.gkd.li/i/12684351', diff --git a/src/apps/com.taobao.htao.android.ts b/src/apps/com.taobao.htao.android.ts index 2ab3e4bb..bbe56d20 100644 --- a/src/apps/com.taobao.htao.android.ts +++ b/src/apps/com.taobao.htao.android.ts @@ -7,10 +7,10 @@ export default defineGkdApp({ { key: 1, name: '局部广告-关闭顶部[打开淘宝]横幅', - fastQuery: true, - activityIds: 'com.taobao.htao.android.detail.DetailActivity', rules: [ { + fastQuery: true, + activityIds: 'com.taobao.htao.android.detail.DetailActivity', matches: 'WebView[text$="天猫Tmall.com"] >2 View[id=null][childCount=1] > @TextView[visibleToUser=true][text=""] < ImageView[clickable=true][desc=null]', - snapshotUrls: 'https://i.gkd.li/i/13538351', + rules: [ + { + activityIds: + 'com.idlefish.flutterbridge.flutterboost.boost.FishFlutterBoostTransparencyActivity', + matches: + '@ImageView[clickable=true][desc=null] < [desc^="开启系统通知"]', + snapshotUrls: 'https://i.gkd.li/i/13538351', + }, + ], }, { key: 2, - name: '权限提示', + name: '权限提示-手机信息权限', + fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - activityIds: 'com.taobao.idlefish.maincontainer.activity.MainActivity', - rules: - '@Button[visibleToUser=true][text="取消"] <n TextView[text*="手机信息"]', - snapshotUrls: 'https://i.gkd.li/i/13620277', + rules: [ + { + activityIds: '.maincontainer.activity.MainActivity', + matches: ['[text*="手机信息权限"]', '[text="取消"]'], + exampleUrls: 'https://e.gkd.li/81e3e4d8-f297-4476-b22c-73f0b97879ee', + snapshotUrls: 'https://i.gkd.li/i/13620277', + }, + ], }, { key: 3, @@ -30,13 +43,19 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[text="立即升级"] -2 [text="暂不升级"]', - snapshotUrls: 'https://i.gkd.li/i/13832272', + rules: [ + { + activityIds: '.maincontainer.activity.MainActivity', + matches: '[text="立即升级"] -2 [text="暂不升级"]', + snapshotUrls: 'https://i.gkd.li/i/13832272', + }, + ], }, { key: 4, name: '全屏广告-红包弹窗', desc: '点击关闭', + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', rules: [ @@ -56,19 +75,17 @@ export default defineGkdApp({ rules: [ { key: 0, + action: 'longClick', activityIds: 'com.idlefish.flutterbridge.flutterboost.boost.FishFlutterBoostActivity', - matches: '@[clickable=true] > [desc$="广告"]', excludeMatches: '@[clickable=true] > [desc^="反馈成功"]', - action: 'longClick', - snapshotUrls: [ - 'https://i.gkd.li/i/14723597', - 'https://i.gkd.li/i/14723718', // excludeMatches - ], + matches: '@[clickable=true] > [desc$="广告"]', + snapshotUrls: 'https://i.gkd.li/i/14723597', + excludeSnapshotUrls: 'https://i.gkd.li/i/14723718', }, { + preKeys: [0], key: 1, - preKeys: 0, activityIds: 'com.idlefish.flutterbridge.flutterboost.boost.FishFlutterBoostActivity', matches: diff --git a/src/apps/com.taobao.litetao.ts b/src/apps/com.taobao.litetao.ts index e5e8a654..66934541 100644 --- a/src/apps/com.taobao.litetao.ts +++ b/src/apps/com.taobao.litetao.ts @@ -11,9 +11,13 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', priorityTime: 10000, - rules: - '[id="com.taobao.litetao:id/root_layout"] > TextView[text^="还剩"&&text$="秒"]', - snapshotUrls: 'https://i.gkd.li/i/12774851', + rules: [ + { + matches: + '[id="com.taobao.litetao:id/root_layout"] > TextView[text^="还剩"&&text$="秒"]', + snapshotUrls: 'https://i.gkd.li/i/12774851', + }, + ], }, { key: 1, @@ -21,10 +25,18 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id = "com.taobao.litetao:id/update_imageview_cancel_v2"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12843615', - 'https://i.gkd.li/i/12843614', + rules: [ + { + activityIds: [ + 'com.taobao.ltao.maintab.MainFrameActivity', + '.launcher.ALiFlutterActivityCompat', + ], + matches: '[id = "com.taobao.litetao:id/update_imageview_cancel_v2"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12843615', + 'https://i.gkd.li/i/12843614', + ], + }, ], }, ], diff --git a/src/apps/com.taobao.taobao.ts b/src/apps/com.taobao.taobao.ts index dc80e3c8..f18e94fc 100644 --- a/src/apps/com.taobao.taobao.ts +++ b/src/apps/com.taobao.taobao.ts @@ -54,12 +54,16 @@ export default defineGkdApp({ { key: 2, name: '局部广告-消息页面热门活动卡片', - fastQuery: true, - activityIds: 'com.taobao.tao.welcome.Welcome', - rules: 'View[desc.length>0] +2n FrameLayout > TextView[text="퀺"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12642795', - 'https://i.gkd.li/i/13197877', + rules: [ + { + fastQuery: true, + activityIds: 'com.taobao.tao.welcome.Welcome', + matches: 'View[desc.length>0] +2n FrameLayout > TextView[text="퀺"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12642795', + 'https://i.gkd.li/i/13197877', + ], + }, ], }, { @@ -83,43 +87,41 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - rules: - '[text^="开启系统通知"] + @Image[visibleToUser=true] < [text="立即参加"] + TextView[id=null][clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/12642813', - }, - { - key: 11, - name: '全屏广告-视频页面签到弹窗', - activityIds: 'com.taobao.tao.welcome.Welcome', - rules: '@View[clickable=true] - View > View > TextView[text="立即签到"]', - snapshotUrls: 'https://i.gkd.li/i/12642798', }, { key: 12, @@ -127,11 +129,19 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - rules: '[vid="update_imageview_cancel_v2"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13336760', - 'https://i.gkd.li/i/13695520', - 'https://i.gkd.li/i/14899863', + rules: [ + { + activityIds: [ + 'com.taobao.android.detail.wrapper.activity.DetailActivity', + 'com.taobao.android.order.bundle.TBOrderListActivity', + ], + matches: '[vid="update_imageview_cancel_v2"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13336760', + 'https://i.gkd.li/i/13695520', + 'https://i.gkd.li/i/14899863', + ], + }, ], }, { @@ -178,19 +188,16 @@ export default defineGkdApp({ }, { key: 15, - name: '权限提示-开启悬浮窗权限', - desc: '点击“否”', + name: '权限提示-悬浮窗权限', + desc: '点击[否]', fastQuery: true, actionMaximum: 1, resetMatch: 'app', - activityIds: - 'com.taobao.android.detail2.core.framework.floatwindow.permission.PermissionActivity', rules: [ { - matches: [ - '[id="android:id/message"][text*="悬浮窗权限"]', - '[id="android:id/button2"][text="否"]', - ], + activityIds: + 'com.taobao.android.detail2.core.framework.floatwindow.permission.PermissionActivity', + matches: ['[text*="悬浮窗权限"]', '[text="否"]'], snapshotUrls: 'https://i.gkd.li/i/13588165', }, ], @@ -232,7 +239,7 @@ export default defineGkdApp({ }, { key: 18, - name: '功能类-"「0元下单」权益"弹窗', + name: '其他-[「0元下单」权益]弹窗', desc: '点击关闭', rules: [ { diff --git a/src/apps/com.taptap.ts b/src/apps/com.taptap.ts index 33f6a1ee..a08095f3 100644 --- a/src/apps/com.taptap.ts +++ b/src/apps/com.taptap.ts @@ -7,7 +7,8 @@ export default defineGkdApp({ { key: 2, name: '分段广告-游戏浏览页面推荐广告', - desc: '自动点击"对此内容不感兴趣"', + desc: '点击[]对此内容不感兴趣]', + fastQuery: true, rules: [ { key: 0, @@ -29,7 +30,7 @@ export default defineGkdApp({ matches: '@LinearLayout > [text="对此内容不感兴趣"]', snapshotUrls: [ 'https://i.gkd.li/i/12840904', - 'https://i.gkd.li/i/13258679', //other.basic.impl.TapMainActivity + 'https://i.gkd.li/i/13258679', ], }, ], @@ -42,6 +43,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.upgrade.library.dialog.UpgradeDialogAct', matches: '@[vid="btn_dismiss"] -2 * >2 [text="发现新版本"]', snapshotUrls: [ 'https://i.gkd.li/i/13387479', @@ -57,8 +59,12 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - rules: '[text*="青少年模式"] + [vid="iv_close"]', - snapshotUrls: 'https://i.gkd.li/i/14209309', + rules: [ + { + matches: '[text*="青少年模式"] + [vid="iv_close"]', + snapshotUrls: 'https://i.gkd.li/i/14209309', + }, + ], }, ], }); diff --git a/src/apps/com.tencent.androidqqmail.ts b/src/apps/com.tencent.androidqqmail.ts index e79e280e..a66b1eb8 100644 --- a/src/apps/com.tencent.androidqqmail.ts +++ b/src/apps/com.tencent.androidqqmail.ts @@ -11,9 +11,13 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', priorityTime: 10000, - rules: - 'RelativeLayout[childCount=3] > ImageView + @ImageView[clickable=true][visibleToUser=true] + FrameLayout[childCount>0]', - snapshotUrls: 'https://i.gkd.li/i/12775855', + rules: [ + { + matches: + 'RelativeLayout[childCount=3] > ImageView + @ImageView[clickable=true][visibleToUser=true] + FrameLayout[childCount>0]', + snapshotUrls: 'https://i.gkd.li/i/12775855', + }, + ], }, { key: 0, @@ -63,12 +67,13 @@ export default defineGkdApp({ { key: 1, name: '权限提示-通知权限', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { + activityIds: 'com.tencent.qqmail.fragment.base.MailFragmentActivity', matches: '[text="立刻开启"] - [text="以后再说"]', snapshotUrls: 'https://i.gkd.li/i/13043069', }, diff --git a/src/apps/com.tencent.cmocmna.ts b/src/apps/com.tencent.cmocmna.ts index 26a91568..54e99e32 100644 --- a/src/apps/com.tencent.cmocmna.ts +++ b/src/apps/com.tencent.cmocmna.ts @@ -7,23 +7,32 @@ export default defineGkdApp({ { key: 1, name: '局部广告-悬浮广告', - activityIds: 'com.tencent.mocmna.activity.MainActivity', - rules: - 'ViewGroup[childCount=2] > @ImageView[id!=null][clickable=true] + ImageView', - snapshotUrls: [ - 'https://i.gkd.li/i/12847323', - 'https://i.gkd.li/i/12847336', - 'https://i.gkd.li/i/13063271', // 限定 [clickable=true] 防止在此快照中点击左上角头像 + rules: [ + { + activityIds: 'com.tencent.mocmna.activity.MainActivity', + matches: + 'ViewGroup[childCount=2] > @ImageView[id!=null][clickable=true][childCount=0] + ImageView[childCount=0]', + snapshotUrls: [ + 'https://i.gkd.li/i/12847323', + 'https://i.gkd.li/i/12847336', + 'https://i.gkd.li/i/13063271', // 限定 [clickable=true] 防止在此快照中点击左上角头像 + ], + }, ], }, { key: 2, name: '局部广告-信息流内嵌广告', - activityIds: 'com.tencent.mocmna.activity.MainActivity', - rules: 'ImageView - ViewGroup > ImageView + ImageView + ImageView', - snapshotUrls: [ - 'https://i.gkd.li/i/12847340', - 'https://i.gkd.li/i/12847364', + rules: [ + { + activityIds: 'com.tencent.mocmna.activity.MainActivity', + matches: + '@ImageView[clickable=true][childCount=0][index=parent.childCount.minus(1)] -5 [text="下载"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12847340', + 'https://i.gkd.li/i/12847364', + ], + }, ], }, ], diff --git a/src/apps/com.tencent.djcity.ts b/src/apps/com.tencent.djcity.ts index d61053d1..e9eecef9 100644 --- a/src/apps/com.tencent.djcity.ts +++ b/src/apps/com.tencent.djcity.ts @@ -25,11 +25,15 @@ export default defineGkdApp({ key: 1, name: '全屏广告-弹窗广告', desc: '点击关闭', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { activityIds: 'com.tencent.djcity.activities.homepage.MainActivity', matches: - '[vid="main_container"] >7 View[childCount=7] > View[childCount=2] > View[index=1] > ImageView', + '[vid="main_container"] >7 View[childCount=7] > View[childCount=2] > @View[index=1][childCount=1][clickable=true] > ImageView[childCount=0] < [id="com.tencent.docs:id/tv_gdt_ad_text"]', - snapshotUrls: 'https://i.gkd.li/i/13198082', + rules: [ + { + matches: '@LinearLayout > [id="com.tencent.docs:id/tv_gdt_ad_text"]', + snapshotUrls: 'https://i.gkd.li/i/13198082', + }, + ], }, { key: 1, @@ -21,23 +25,37 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '@[desc="暂不更新"] + [desc="现在更新"]', - snapshotUrls: 'https://i.gkd.li/i/13198091', + rules: [ + { + activityIds: '.DocsFlutterActivity', + matches: '@[desc="暂不更新"] + [desc="现在更新"]', + snapshotUrls: 'https://i.gkd.li/i/13198091', + }, + ], }, { key: 2, name: '局部广告-卡片广告', - activityIds: 'com.tencent.docs.DocsFlutterActivity', - rules: '[desc="限时购买"] + ImageView[clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/13198097', + rules: [ + { + activityIds: 'com.tencent.docs.DocsFlutterActivity', + matches: '@ImageView[clickable=true] - [desc="限时购买"]', + snapshotUrls: 'https://i.gkd.li/i/13198097', + }, + ], }, { key: 3, name: '全屏广告-弹窗广告', - actionDelay: 200, - activityIds: 'com.tencent.docs.DocsFlutterActivity', - rules: 'View[childCount=2] > @TextView[id=null][clickable=true] + View', - snapshotUrls: 'https://i.gkd.li/i/13242404', + rules: [ + { + actionDelay: 200, + activityIds: 'com.tencent.docs.DocsFlutterActivity', + matches: + 'View[childCount=2] > @TextView[id=null][clickable=true] + View', + snapshotUrls: 'https://i.gkd.li/i/13242404', + }, + ], }, ], }); diff --git a/src/apps/com.tencent.karaoke.ts b/src/apps/com.tencent.karaoke.ts index a477ff50..52a8b2ac 100644 --- a/src/apps/com.tencent.karaoke.ts +++ b/src/apps/com.tencent.karaoke.ts @@ -11,8 +11,9 @@ export default defineGkdApp({ { key: 0, name: '动态页面-卡片广告', + fastQuery: true, activityIds: 'com.tencent.karaoke.module.main.ui.MainTabActivity', - matches: 'RelativeLayout > [text="广告"] + ImageView', + matches: '@ImageView[clickable=true] - [text="广告"]', snapshotUrls: 'https://i.gkd.li/i/13334798', }, ], @@ -27,7 +28,7 @@ export default defineGkdApp({ activityIds: 'com.tencent.karaoke.module.splash.ui.SplashBaseActivity', matches: - '[desc$="霸屏的按钮"] < ViewGroup + ViewGroup[childCount=1] > ViewGroup[childCount=0]', + 'ViewGroup[childCount=0] < @ViewGroup[clickable=true][childCount=1] - ViewGroup > [desc*="双十一"]', snapshotUrls: 'https://i.gkd.li/i/13363281', }, ], diff --git a/src/apps/com.tencent.mm.ts b/src/apps/com.tencent.mm.ts index 926d9b32..35933c63 100644 --- a/src/apps/com.tencent.mm.ts +++ b/src/apps/com.tencent.mm.ts @@ -143,14 +143,18 @@ export default defineGkdApp({ fastQuery: true, matchTime: 10000, actionMaximum: 1, - activityIds: [ - 'com.tencent.mm.plugin.webwx.ui.ExtDeviceWXLoginUI', - 'com.tencent.mm.ui.LauncherUI', - ], - rules: 'TextView[text="取消登录"] - Button[text="登录"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13522625', // activityIds: 'com.tencent.mm.plugin.webwx.ui.ExtDeviceWXLoginUI' - 'https://i.gkd.li/i/13522577', // activityIds: 'com.tencent.mm.ui.LauncherUI' + rules: [ + { + activityIds: [ + 'com.tencent.mm.plugin.webwx.ui.ExtDeviceWXLoginUI', + 'com.tencent.mm.ui.LauncherUI', + ], + matches: 'TextView[text="取消登录"] - Button[text="登录"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13522625', + 'https://i.gkd.li/i/13522577', + ], + }, ], }, { @@ -160,13 +164,13 @@ export default defineGkdApp({ fastQuery: true, matchTime: 10000, actionMaximum: 1, - activityIds: [ - 'com.tencent.mm.plugin.base.stub.UIEntryStub', - 'com.tencent.mm.ui.LauncherUI', - 'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI', - ], rules: [ { + activityIds: [ + 'com.tencent.mm.plugin.base.stub.UIEntryStub', + 'com.tencent.mm.ui.LauncherUI', + 'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI', + ], matches: ['[text^="获取你的"]', '[text="允许"]'], snapshotUrls: [ 'https://i.gkd.li/i/12663602', @@ -179,20 +183,20 @@ export default defineGkdApp({ { key: 4, name: '功能类-微信读书网页版扫码登录自动授权', - fastQuery: true, matchTime: 10000, actionMaximum: 1, activityIds: 'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI', rules: [ { + key: 1, matches: '[text="微信读书网页版"] +3 Button[text="登 录"]', snapshotUrls: 'https://i.gkd.li/i/12506197', }, { - matches: [ - '[text="登录成功"]', - '[id="com.tencent.mm:id/g1"][desc="返回"]', - ], + preKeys: [1], + key: 2, + action: 'back', + matches: '[text="登录成功"]', snapshotUrls: 'https://i.gkd.li/i/12506201', }, ], @@ -201,8 +205,6 @@ export default defineGkdApp({ key: 5, name: '功能类-微信红包自动领取', desc: '自动领取私聊红包,群聊红包', - exampleUrls: - 'https://github.com/gkd-kit/subscription/assets/38517192/32cfda78-b2e1-456c-8d85-bfb2bc4683aa', rules: [ { name: '从红包结算界面返回', @@ -333,9 +335,13 @@ export default defineGkdApp({ fastQuery: true, matchTime: 10000, actionMaximum: 1, - activityIds: 'com.tencent.mm.ui.LauncherUI', - rules: '[text="打开网页版文件传输助手"] + * > Button[text="打开"]', - snapshotUrls: 'https://i.gkd.li/i/12793745', + rules: [ + { + activityIds: 'com.tencent.mm.ui.LauncherUI', + matches: '[text="打开网页版文件传输助手"] + * > Button[text="打开"]', + snapshotUrls: 'https://i.gkd.li/i/12793745', + }, + ], }, { key: 17, @@ -368,15 +374,16 @@ export default defineGkdApp({ rules: [ { key: 0, + fastQuery: true, activityIds: 'com.tencent.mm.plugin.teenmode.ui.AuthorizationRequestUI', - matches: '@LinearLayout[childCount=2] > [text="验证密码"]', + matches: '@LinearLayout[childCount=2] > TextView[text="验证密码"]', snapshotUrls: 'https://i.gkd.li/i/13588338', }, { key: 1, activityIds: 'com.tencent.mm.plugin.webview.ui.tools.MMWebViewUI', - matches: ['View[text="申请今天临时访问"]', 'View[desc="验证密码"]'], + matches: 'View[desc="验证密码"][clickable=true]', snapshotUrls: 'https://i.gkd.li/i/13631987', }, ], @@ -416,12 +423,16 @@ export default defineGkdApp({ { key: 25, name: '局部广告-订阅号消息-推荐文章', - desc: '自动点击“x”', - activityIds: - 'com.tencent.mm.plugin.brandservice.ui.flutter.BizFlutterTLFlutterViewActivity', - rules: - 'View[childCount=2] > View[desc$="推​荐​"][childCount=3] > ImageView[index=2][clickable=true][visibleToUser=true]', - snapshotUrls: 'https://i.gkd.li/i/14392392', + desc: '点击关闭', + rules: [ + { + activityIds: + 'com.tencent.mm.plugin.brandservice.ui.flutter.BizFlutterTLFlutterViewActivity', + matches: + 'View[childCount=2] > View[desc$="推​荐​"][childCount=3] > ImageView[index=2][clickable=true][visibleToUser=true]', + snapshotUrls: 'https://i.gkd.li/i/14392392', + }, + ], }, { key: 26, @@ -437,8 +448,8 @@ export default defineGkdApp({ snapshotUrls: [ 'https://i.gkd.li/i/14399355', 'https://i.gkd.li/i/14662147', - 'https://i.gkd.li/i/14532946', // 避免在此页面误触 ], + excludeSnapshotUrls: 'https://i.gkd.li/i/14532946', }, ], }, @@ -525,14 +536,14 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/14548701', }, { + preKeys: [0], key: 1, - preKeys: 0, matches: '[desc="不看此类内容"]', snapshotUrls: 'https://i.gkd.li/i/14549566', }, { + preKeys: [1], key: 2, - preKeys: 1, matches: '[desc="确定"]', snapshotUrls: 'https://i.gkd.li/i/14549567', }, diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts index d52cadb5..df593613 100644 --- a/src/apps/com.tencent.mobileqq.ts +++ b/src/apps/com.tencent.mobileqq.ts @@ -99,13 +99,13 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/14138572', }, { - preKeys: 0, + preKeys: [0], key: 2, + fastQuery: true, activityIds: [ 'com.tencent.mobileqq.activity.SplashActivity', 'com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity', ], - fastQuery: true, matches: '@[clickable=true] > * > ImageView + [text="隐藏此条动态"]', snapshotUrls: [ 'https://i.gkd.li/i/13761147', @@ -115,11 +115,11 @@ export default defineGkdApp({ { preKeys: [0, 1], key: 4, + fastQuery: true, activityIds: [ 'com.qzone.reborn.feedx.activity.QZoneFriendFeedXActivity', 'com.tencent.mobileqq.activity.SplashActivity', ], - fastQuery: true, matches: '@[clickable=true] >(1,2) ImageView + [text="关闭此条广告"]', snapshotUrls: [ 'https://i.gkd.li/i/12840889', @@ -192,16 +192,21 @@ export default defineGkdApp({ { key: 4, name: '局部广告-顶部SVIP广告', - desc: '消息界面-搜索框和消息记录之间的卡片广告,点击关闭右侧x', - activityIds: 'com.tencent.mobileqq.activity.SplashActivity', - rules: - 'LinearLayout > TextView[text*="SVIP"||text*="超级会员"] + FrameLayout[childCount<=2] + [name$="ImageView"||name$="Button"][id!=null][clickable=true]', - snapshotUrls: [ - 'https://i.gkd.li/i/12706907', - 'https://i.gkd.li/i/13107298', - 'https://i.gkd.li/i/12793359', - 'https://i.gkd.li/i/12855048', - 'https://i.gkd.li/i/13228108', + desc: '消息界面-搜索框和消息记录之间的卡片广告,点击右侧关闭', + fastQuery: true, + rules: [ + { + activityIds: 'com.tencent.mobileqq.activity.SplashActivity', + matches: + '@[index=parent.childCount.minus(1)][name$="ImageView"||name$="Button"][id!=null][clickable=true] - FrameLayout[childCount<=2] - TextView[text*="SVIP"||text*="超级会员"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12706907', + 'https://i.gkd.li/i/13107298', + 'https://i.gkd.li/i/12793359', + 'https://i.gkd.li/i/12855048', + 'https://i.gkd.li/i/13228108', + ], + }, ], }, { @@ -312,18 +317,22 @@ export default defineGkdApp({ name: '功能类-自动勾选原图', desc: '发送图片时自动勾选原图，可手动取消勾选', actionMaximum: 1, - fastQuery: true, - activityIds: [ - 'com.tencent.mobileqq.activity.SplashActivity', - 'com.tencent.qqnt.qbasealbum.WinkHomeActivity', - 'com.tencent.mobileqq.activity.photo.album.NewPhotoListActivity', - ], - rules: '@CheckBox[checked=false] + [text="原图"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12705556', // 未勾选原图 - 'https://i.gkd.li/i/12705559', // 已勾选原图 - 'https://i.gkd.li/i/13295142', - 'https://i.gkd.li/i/13476247', + rules: [ + { + fastQuery: true, + activityIds: [ + 'com.tencent.mobileqq.activity.SplashActivity', + 'com.tencent.qqnt.qbasealbum.WinkHomeActivity', + 'com.tencent.mobileqq.activity.photo.album.NewPhotoListActivity', + ], + matches: '@CheckBox[checked=false] + [text="原图"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12705556', // 未勾选原图 + 'https://i.gkd.li/i/12705559', // 已勾选原图 + 'https://i.gkd.li/i/13295142', + 'https://i.gkd.li/i/13476247', + ], + }, ], }, { @@ -355,7 +364,7 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/12847819', }, { - preKeys: 0, + preKeys: [0], matches: '@LinearLayout[clickable=true] > TextView[text="关闭此条广告"]', snapshotUrls: 'https://i.gkd.li/i/12847821', @@ -405,7 +414,7 @@ export default defineGkdApp({ ], }, { - preKeys: 0, + preKeys: [0], key: 1, matches: '@LinearLayout[id!=null][clickable=true] > LinearLayout > [text="减少此类推荐"]', @@ -427,6 +436,7 @@ export default defineGkdApp({ rules: [ { key: 0, + activityIds: '.activity.SplashActivity', matches: '@[desc="关闭"] <2 * >2 Button[text^="立即"][text.length=4]', snapshotUrls: [ 'https://i.gkd.li/i/13386719', @@ -435,6 +445,7 @@ export default defineGkdApp({ }, { key: 1, + activityIds: '.upgrade.activity.UpgradeActivity', matches: ['[text="立即升级"]', '[text="稍后处理"]'], snapshotUrls: 'https://i.gkd.li/i/14724108', }, @@ -534,7 +545,7 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/14019384', }, { - preKeys: 0, + preKeys: [0], key: 1, fastQuery: true, activityIds: 'com.tencent.mobileqq.activity.QPublicFragmentActivity', @@ -546,15 +557,13 @@ export default defineGkdApp({ activityIds: 'com.tencent.mobileqq.activity.QQBrowserActivity', matches: [ // 限定 - 'ViewGroup[desc="返回"]', - 'ViewGroup[desc="首页"]', - 'ViewGroup[desc="分享"]', + 'ViewGroup[desc="返回"] +2 ViewGroup[desc="首页"] + ViewGroup[desc="分享"]', 'ViewGroup[childCount=6] > ViewGroup[childCount=2][clickable=true][visibleToUser=true]', ], snapshotUrls: 'https://i.gkd.li/i/14549503', }, { - preKeys: 2, + preKeys: [2], key: 3, activityIds: 'com.tencent.mobileqq.activity.QPublicFragmentActivity', matches: @@ -704,11 +713,16 @@ export default defineGkdApp({ { key: 28, name: '全屏广告-账号信息页面-新人SVIP领取弹窗', - activityIds: 'com.tencent.mobileqq.activity.QPublicFragmentActivity', - rules: '[childCount=3] > [desc*="活动"] + [desc^="关闭"][clickable=true]', - snapshotUrls: [ - 'https://i.gkd.li/i/14217758', - 'https://i.gkd.li/i/14217783', + rules: [ + { + activityIds: 'com.tencent.mobileqq.activity.QPublicFragmentActivity', + matches: + '[childCount=3] > [desc*="活动"] + [desc^="关闭"][clickable=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/14217758', + 'https://i.gkd.li/i/14217783', + ], + }, ], }, { diff --git a/src/apps/com.tencent.news.ts b/src/apps/com.tencent.news.ts index 21d5583c..4658297d 100644 --- a/src/apps/com.tencent.news.ts +++ b/src/apps/com.tencent.news.ts @@ -8,10 +8,7 @@ export default defineGkdApp({ key: 1, name: '分段广告-信息流广告', desc: '自动点击"更多"->"不感兴趣"', - activityIds: [ - 'com.tencent.news.activity.SplashActivity', - 'com.miui.home.launcher.Launcher', - ], + activityIds: 'com.tencent.news.activity.SplashActivity', rules: [ { key: 0, @@ -21,7 +18,6 @@ export default defineGkdApp({ snapshotUrls: [ 'https://i.gkd.li/i/12755834', 'https://i.gkd.li/i/12755852', // 使用 FrameLayout[id="android:id/content"][childCount=1] 进行限定，防止点击"更多"按钮后继续触发规则 - 'https://i.gkd.li/i/12755914', // activityId: 'com.miui.home.launcher.Launcher' ], }, { @@ -44,7 +40,6 @@ export default defineGkdApp({ matches: '@[text="关闭"] + [text="查看活动详情"]', snapshotUrls: 'https://i.gkd.li/i/12755872', }, - // 在这个规则组中继续添加广告、活动弹窗 ], }, { @@ -53,8 +48,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[text="开启通知"] + [text="先不了"]', - snapshotUrls: 'https://i.gkd.li/i/12755824', + rules: [ + { + activityIds: '.activity.SplashActivity', + matches: '[text="开启通知"] + [text="先不了"]', + snapshotUrls: 'https://i.gkd.li/i/12755824', + }, + ], }, ], }); diff --git a/src/apps/com.tencent.qqlive.ts b/src/apps/com.tencent.qqlive.ts index 63b9fcf9..9a2dc9a2 100644 --- a/src/apps/com.tencent.qqlive.ts +++ b/src/apps/com.tencent.qqlive.ts @@ -27,11 +27,16 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: - '[text^="有新版本"] + FrameLayout + LinearLayout + [text="暂不升级"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12700486', - 'https://i.gkd.li/i/13799951', + rules: [ + { + activityIds: '.ona.update.trunk.client.TrunkUpdateActivity', + matches: + '[text^="有新版本"] + FrameLayout + LinearLayout + [text="暂不升级"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12700486', + 'https://i.gkd.li/i/13799951', + ], + }, ], }, { @@ -110,7 +115,7 @@ export default defineGkdApp({ }, // 以下是配合本规则组内其他key使用的规则，反馈界面的规则都是一样的 { - preKeys: 6, + preKeys: [6], key: 96, fastQuery: true, matches: @@ -269,10 +274,10 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', actionMaximumKey: 0, + activityIds: '.ona.activity.SplashHomeActivity', rules: [ { key: 0, - fastQuery: true, matches: 'LinearLayout > @[text="以后再说"] + [text="好的"]', snapshotUrls: 'https://i.gkd.li/i/12700139', }, diff --git a/src/apps/com.tencent.qqmusic.ts b/src/apps/com.tencent.qqmusic.ts index eec59dda..9644788c 100644 --- a/src/apps/com.tencent.qqmusic.ts +++ b/src/apps/com.tencent.qqmusic.ts @@ -127,9 +127,9 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { + activityIds: '.activity.AppStarterActivity', matches: '[text="抢先体验"] -2 [text="不再提醒"]', snapshotUrls: 'https://i.gkd.li/i/13178485', }, @@ -174,9 +174,11 @@ export default defineGkdApp({ desc: '点击关闭', rules: [ { + fastQuery: true, key: 0, activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity', - matches: '[id="android:id/content"] >4 ViewGroup[childCount=0]', + matches: + '@ViewGroup[childCount=0][clickable=true] <2 ViewGroup[childCount=2] < FrameLayout < FrameLayout < [id="android:id/content"]', snapshotUrls: 'https://i.gkd.li/i/13806782', }, ], @@ -206,6 +208,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.activity.AppStarterActivity', matches: '@[vid="close_btn"] - * > [text*="好评"]', snapshotUrls: 'https://i.gkd.li/i/14881903', }, diff --git a/src/apps/com.tencent.qt.qtl.ts b/src/apps/com.tencent.qt.qtl.ts index 05f516f1..335047bf 100644 --- a/src/apps/com.tencent.qt.qtl.ts +++ b/src/apps/com.tencent.qt.qtl.ts @@ -28,13 +28,22 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.tencent.qt.qtl:id/btn_update_cancel"]', - snapshotUrls: 'https://i.gkd.li/i/13611286', + rules: [ + { + activityIds: + 'com.tencent.qt.module_appupdate.soft_update.impl.SoftUpdateConfirmActivity', + matches: '[id="com.tencent.qt.qtl:id/btn_update_cancel"]', + snapshotUrls: 'https://i.gkd.li/i/13611286', + }, + ], }, { key: 2, name: '全屏广告-弹窗广告', desc: '点击关闭', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { fastQuery: true, diff --git a/src/apps/com.tencent.qt.sns.ts b/src/apps/com.tencent.qt.sns.ts index d6755bb8..1f3f9023 100644 --- a/src/apps/com.tencent.qt.sns.ts +++ b/src/apps/com.tencent.qt.sns.ts @@ -7,24 +7,30 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-首页活动弹窗', - actionMaximum: 1, - resetMatch: 'app', fastQuery: true, matchTime: 10000, - rules: '[id="com.tencent.qt.sns:id/closebtn"]', - snapshotUrls: 'https://i.gkd.li/i/13497978', + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + matches: '[id="com.tencent.qt.sns:id/closebtn"]', + snapshotUrls: 'https://i.gkd.li/i/13497978', + }, + ], }, { key: 2, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '[text="版本更新"] +4 LinearLayout > [text="取消"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13497984', - 'https://i.gkd.li/i/13713478', + rules: [ + { + activityIds: 'com.tencent.gamehelper.ui.main.MainActivity', + matches: '[text="版本更新"] +4 LinearLayout > [text="取消"]', + snapshotUrls: 'https://i.gkd.li/i/13713478', + }, ], }, ], diff --git a/src/apps/com.tencent.wemeet.app.ts b/src/apps/com.tencent.wemeet.app.ts index 9bb86093..0d28dc0d 100644 --- a/src/apps/com.tencent.wemeet.app.ts +++ b/src/apps/com.tencent.wemeet.app.ts @@ -7,11 +7,17 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '[text^="腾讯会议新版本"] +3 * > [text="下次安装"]', - snapshotUrls: 'https://i.gkd.li/i/14332625', + rules: [ + { + activityIds: '.StartupActivity', + matches: '[text^="腾讯会议新版本"] +3 * > [text="下次安装"]', + snapshotUrls: 'https://i.gkd.li/i/14332625', + }, + ], }, ], }); diff --git a/src/apps/com.tencent.weread.ts b/src/apps/com.tencent.weread.ts index e6deb1e1..9316354d 100644 --- a/src/apps/com.tencent.weread.ts +++ b/src/apps/com.tencent.weread.ts @@ -14,6 +14,10 @@ export default defineGkdApp({ { key: 0, matchTime: 30000, + activityIds: [ + '.module.bottomSheet.BottomSheetForFragment', + '.WeReadFragmentActivity', + ], matches: '[id="com.tencent.weread:id/open_notification_close"]', snapshotUrls: [ 'https://i.gkd.li/i/12642247', @@ -22,6 +26,7 @@ export default defineGkdApp({ }, { key: 1, + activityIds: '.WeReadFragmentActivity', matches: '[text="开启推送通知"] +3 [clickable=true][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/14190089', diff --git a/src/apps/com.thestore.main.ts b/src/apps/com.thestore.main.ts index 738a3281..536592bc 100644 --- a/src/apps/com.thestore.main.ts +++ b/src/apps/com.thestore.main.ts @@ -7,12 +7,15 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', - desc: '关闭促销弹窗，也许有用呢', - activityIds: 'com.thestore.main.app.home.HomeActivity', + desc: '关闭弹窗', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { - matches: '[id="com.thestore.main.home.feature:id/ad"] > TextView', - //TextView有id类似".../j"担心这个id是随机的，所以用了TextView而不是id + activityIds: 'com.thestore.main.app.home.HomeActivity', + matches: + '@TextView[clickable=true][childCount=0] <2 RelativeLayout[childCount=2] < FrameLayout < [parent=null]', snapshotUrls: 'https://i.gkd.li/i/13163686', }, ], diff --git a/src/apps/com.tianqi2345.ts b/src/apps/com.tianqi2345.ts index ac02c47e..b9f6f039 100644 --- a/src/apps/com.tianqi2345.ts +++ b/src/apps/com.tianqi2345.ts @@ -8,12 +8,15 @@ export default defineGkdApp({ key: 1, name: '全屏广告-弹窗广告', desc: '点击关闭', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { activityIds: 'com.biz2345.shell.activity.holder.CloudInterstitialActivity', matches: - '[id="com.biz2345.adware:id/cloud_interstitial_close_tv"][clickable=true]', + '@TextView[id="com.biz2345.adware:id/cloud_interstitial_close_tv"][clickable=true][childCount=0] < RelativeLayout[childCount=2] < RelativeLayout < FrameLayout < [id="android:id/content"]', exampleUrls: 'https://m.gkd.li/57941037/1535a559-f2cd-49c5-8c19-b2bc16709f55', snapshotUrls: 'https://i.gkd.li/i/14391796', @@ -26,9 +29,10 @@ export default defineGkdApp({ desc: '点击关闭', rules: [ { + fastQuery: true, activityIds: 'com.tianqi2345.activity.NewMainActivity', matches: - '[id="com.biz2345.adware:id/native_express_close_iv"][clickable=true]', + '@[id="com.biz2345.adware:id/native_express_close_iv"] + LinearLayout > [text="广告"]', exampleUrls: 'https://m.gkd.li/57941037/a2ce856a-78e8-4b81-bc1f-64a5db81913f', snapshotUrls: 'https://i.gkd.li/i/14391799', diff --git a/src/apps/com.tima.carnet.m.main.ts b/src/apps/com.tima.carnet.m.main.ts index adcd2331..b106e21e 100644 --- a/src/apps/com.tima.carnet.m.main.ts +++ b/src/apps/com.tima.carnet.m.main.ts @@ -7,6 +7,10 @@ export default defineGkdApp({ { key: 2, name: '全屏广告-每日弹窗广告', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', activityIds: [ 'com.tima.carnet.m.main.lib.common.dialog.TimaLoadingDialog', 'com.tima.carnet.m.main.app.main.NoticeActivity', @@ -15,9 +19,21 @@ export default defineGkdApp({ ], rules: [ { - matches: [ - 'CheckBox[id$="today_will_not_shown"] + ImageButton[clickable=true]', + key: 1, + matches: '[text="今天内不显示"][checked=false]', + exampleUrls: 'https://e.gkd.li/66af6710-ec2e-472b-a589-cac40ac6ea6d', + snapshotUrls: [ + 'https://i.gkd.li/i/12654432', + 'https://i.gkd.li/i/13507746', + 'https://i.gkd.li/i/13508074', + 'https://i.gkd.li/i/13508041', ], + }, + { + preKeys: [1], + key: 2, + matches: '@ImageButton[clickable=true] - [text="今天内不显示"]', + exampleUrls: 'https://e.gkd.li/66af6710-ec2e-472b-a589-cac40ac6ea6d', snapshotUrls: [ 'https://i.gkd.li/i/12654432', 'https://i.gkd.li/i/13507746', @@ -30,32 +46,30 @@ export default defineGkdApp({ { key: 3, name: '分段广告-设备界面顶部广告', - activityIds: ['com.tima.carnet.m.main.app.main.MainActivity'], + activityIds: 'com.tima.carnet.m.main.app.main.MainActivity', rules: [ { key: 1, matches: - '[id="com.tima.carnet.m.main:id/fl_ad_banner"] >n Image[text!=null&&text!=""] < View +n View > Image', - snapshotUrls: ['https://i.gkd.li/i/13508030'], - }, - { - key: 2, - matches: - '[id="com.tima.carnet.m.main:id/fl_ad_banner"] >n Image[text!=null&&text!=""] + View > Image', - snapshotUrls: ['https://i.gkd.li/i/13508115'], + '@Image[childCount=0][visibleToUser=true] < View[childCount=1] + View >2 [visibleToUser=true][text="广告"] < [text="不感兴趣"]', + snapshotUrls: 'https://i.gkd.li/i/13508102', }, { key: 4, //有时存在加载不出来的情况 - preKeys: [1, 2], + preKeys: [1], action: 'back', - matches: 'ListView[childCount=0]', - snapshotUrls: ['https://i.gkd.li/i/13508072'], + matches: + 'ListView[id="com.byted.pangle:id/tt_filer_words_lv"][childCount=0]', + snapshotUrls: 'https://i.gkd.li/i/13508072', }, ], }, diff --git a/src/apps/com.tipsoon.android.ts b/src/apps/com.tipsoon.android.ts index 57487d82..9ced2a68 100644 --- a/src/apps/com.tipsoon.android.ts +++ b/src/apps/com.tipsoon.android.ts @@ -25,10 +25,13 @@ export default defineGkdApp({ { key: 0, name: '全屏广告-弹窗广告', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, - name: '弹窗广告-1', activityIds: 'com.tipsoon.android.activity.MainActivity', matches: '[id="com.tipsoon.android:id/cardview"] + [id="com.tipsoon.android:id/img_close"]', diff --git a/src/apps/com.tmall.wireless.ts b/src/apps/com.tmall.wireless.ts index adc873e2..b83eff09 100644 --- a/src/apps/com.tmall.wireless.ts +++ b/src/apps/com.tmall.wireless.ts @@ -7,31 +7,44 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '[id="com.tmall.wireless:id/update_button_cancel"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13162603', //com.tmall.wireless.splash.TMSplashActivity - 'https://i.gkd.li/i/13258201', //com.tmall.wireless.maintab.module.TMMainTabActivity - 'https://i.gkd.li/i/13399536', //com.tmall.wireless.webview.TMCommonWebViewActivity + rules: [ + { + activityIds: [ + '.splash.TMSplashActivity', + '.maintab.module.TMMainTabActivity', + '.webview.TMCommonWebViewActivity', + ], + matches: '[id="com.tmall.wireless:id/update_button_cancel"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13162603', + 'https://i.gkd.li/i/13258201', + 'https://i.gkd.li/i/13399536', + ], + }, ], }, { key: 2, name: '全屏广告-弹窗广告', - activityIds: [ - 'com.tmall.wireless.maintab.module.TMMainTabActivity', - 'com.tmall.wireless.turboweb.container.TurboWebViewActivity', - 'com.tmall.wireless.webview.TMCommonWebViewActivity', - ], - rules: - 'Image[id=null][clickable=false] < View + Image[id=null][clickable=true]', - snapshotUrls: [ - 'https://i.gkd.li/i/13222394', //com.tmall.wireless.maintab.module.TMMainTabActivity - 'https://i.gkd.li/i/13222500', //com.tmall.wireless.turboweb.container.TurboWebViewActivity - 'https://i.gkd.li/i/13222510', //com.tmall.wireless.webview.TMCommonWebViewActivity + rules: [ + { + activityIds: [ + 'com.tmall.wireless.maintab.module.TMMainTabActivity', + 'com.tmall.wireless.turboweb.container.TurboWebViewActivity', + 'com.tmall.wireless.webview.TMCommonWebViewActivity', + ], + matches: + 'Image[id=null][clickable=false] < View + Image[id=null][clickable=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/13222394', + 'https://i.gkd.li/i/13222500', + 'https://i.gkd.li/i/13222510', + ], + }, ], }, { @@ -40,8 +53,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: 'View[text="开启系统通知"] - View[clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/13258215', + rules: [ + { + activityIds: '.messagebox.activity.TMMsgboxMainActivity', + matches: 'View[text="开启系统通知"] - View[clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/13258215', + }, + ], }, ], }); diff --git a/src/apps/com.tmri.app.main.ts b/src/apps/com.tmri.app.main.ts index a182ecef..ab6956e7 100644 --- a/src/apps/com.tmri.app.main.ts +++ b/src/apps/com.tmri.app.main.ts @@ -13,6 +13,10 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: [ + 'com.tmri.app.ui.activity.main.MainTabHostNewActivity', + 'com.tmri.app.ui.activity.main.TmriNewActivity', + ], matches: 'ImageButton[id="com.tmri.app.main:id/btn_cancel"]', snapshotUrls: [ 'https://i.gkd.li/i/13315944', @@ -43,6 +47,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: 'com.tmri.app.ui.activity.main.MainTabHostNewActivity', matches: ['[text="立即更新"]', '[text="以后再说"]'], snapshotUrls: 'https://i.gkd.li/i/15751656', }, diff --git a/src/apps/com.tongcheng.android.ts b/src/apps/com.tongcheng.android.ts index cd2f1efc..4b30391d 100644 --- a/src/apps/com.tongcheng.android.ts +++ b/src/apps/com.tongcheng.android.ts @@ -16,7 +16,7 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/13167070', }, { - preKeys: 0, + preKeys: [0], key: 1, matches: '@* > * > [id="com.tongcheng.android:id/tv_home_banner_pop_up"][text="关闭"]', diff --git a/src/apps/com.tt.turbo.ts b/src/apps/com.tt.turbo.ts index dd93eada..53c278e4 100644 --- a/src/apps/com.tt.turbo.ts +++ b/src/apps/com.tt.turbo.ts @@ -7,10 +7,15 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '@[desc="取消"] + [desc="更新"]', - snapshotUrls: 'https://i.gkd.li/i/14292907', + rules: [ + { + matches: '@[desc="取消"] + [desc="更新"]', + snapshotUrls: 'https://i.gkd.li/i/14292907', + }, + ], }, ], }); diff --git a/src/apps/com.tuying.kuimg.rjm.ts b/src/apps/com.tuying.kuimg.rjm.ts index b807bbaa..eaeeda2e 100644 --- a/src/apps/com.tuying.kuimg.rjm.ts +++ b/src/apps/com.tuying.kuimg.rjm.ts @@ -7,18 +7,22 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', - activityIds: 'com.tuying.kuimg.rjm.MainActivity', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, + activityIds: 'com.tuying.kuimg.rjm.MainActivity', matches: - '[id="com.tuying.kuimg.rjm:id/ksad_tk_view"] >n @ViewGroup[childCount=1][clickable=true] > ImageView', + 'ImageView[childCount=0][text=null] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] < ViewGroup +n ViewGroup[childCount=2] > [text="广告"]', snapshotUrls: 'https://i.gkd.li/i/13166088', }, { key: 1, - matches: - '[id="com.tuying.kuimg.rjm:id/ksad_tk_view"] >n @ViewGroup > [text="跳过"]', + activityIds: 'com.tuying.kuimg.rjm.MainActivity', + matches: ['[text="广告"]', '@ViewGroup > [text="跳过"]'], snapshotUrls: 'https://i.gkd.li/i/13166086', }, ], diff --git a/src/apps/com.twitter.android.ts b/src/apps/com.twitter.android.ts index f6f3ee54..8ff8da82 100644 --- a/src/apps/com.twitter.android.ts +++ b/src/apps/com.twitter.android.ts @@ -8,12 +8,12 @@ export default defineGkdApp({ key: 1, name: '分段广告-主页信息流广告', desc: '点击右上角关闭,点击我不喜欢', + actionCd: 3000, // https://github.com/gkd-kit/subscription/issues/832 + fastQuery: true, activityIds: [ 'com.twitter.app.main.MainActivity', 'com.twitter.app.profiles.ProfileActivity', ], - actionCd: 3000, // https://github.com/gkd-kit/subscription/issues/832 - fastQuery: true, rules: [ { key: 0, @@ -64,8 +64,8 @@ export default defineGkdApp({ matches: '@[id="com.twitter.android:id/tweet_curation_action"] +n [id="com.twitter.android:id/tweet_promoted_badge_bottom"][text="推荐"]', snapshotUrls: [ - 'https://i.gkd.li/i/12825969', // com.twitter.tweetdetail.TweetDetailActivity - 'https://i.gkd.li/i/12847584', // com.twitter.android.search.implementation.results.SearchActivity + 'https://i.gkd.li/i/12825969', + 'https://i.gkd.li/i/12847584', ], }, { @@ -74,8 +74,8 @@ export default defineGkdApp({ matches: '@[id="com.twitter.android:id/tweet_curation_action"] <2 * + [id="com.twitter.android:id/tweet_auto_playable_content_parent"] > [id="com.twitter.android:id/tweet_promoted_badge_bottom"][text$="推荐"]', snapshotUrls: [ - 'https://i.gkd.li/i/12882676', // com.twitter.tweetdetail.TweetDetailActivity - 'https://i.gkd.li/i/12904603', // com.twitter.app.profiles.ProfileActivity + 'https://i.gkd.li/i/12882676', + 'https://i.gkd.li/i/12904603', ], }, { @@ -92,21 +92,21 @@ export default defineGkdApp({ matches: '@ViewGroup > [id="com.twitter.android:id/action_sheet_item_title"][text^="屏蔽"||text^="屏蔽"||text^="Block"]', snapshotUrls: [ - 'https://i.gkd.li/i/12828815', // com.twitter.tweetdetail.TweetDetailActivity - 'https://i.gkd.li/i/12847600', // com.twitter.android.search.implementation.results.SearchActivity - 'https://i.gkd.li/i/12904602', // com.twitter.app.profiles.ProfileActivity + 'https://i.gkd.li/i/12828815', + 'https://i.gkd.li/i/12847600', + 'https://i.gkd.li/i/12904602', 'https://i.gkd.li/i/13680783', // 兼容英文 ], }, { - preKeys: 10, + preKeys: [10], key: 11, name: '二次确认-点击屏蔽', matches: '[text="取消"||text^="Cancel"] + [text="屏蔽"||text^="Block"]', snapshotUrls: [ - 'https://i.gkd.li/i/12828832', // com.twitter.tweetdetail.TweetDetailActivity - 'https://i.gkd.li/i/12904601', // com.twitter.app.profiles.ProfileActivity + 'https://i.gkd.li/i/12828832', + 'https://i.gkd.li/i/12904601', 'https://i.gkd.li/i/13680798', // 兼容英文 ], }, @@ -117,7 +117,7 @@ export default defineGkdApp({ name: '分段广告-用户资料页信息流广告', desc: '点击右上角关闭,点击我不喜欢', fastQuery: true, - activityIds: ['com.twitter.app.profiles.ProfileActivity'], + activityIds: 'com.twitter.app.profiles.ProfileActivity', actionCd: 3000, rules: [ { @@ -126,8 +126,8 @@ export default defineGkdApp({ matches: '@[id="com.twitter.android:id/tweet_curation_action"] +n [id="com.twitter.android:id/tweet_promoted_badge_bottom"][text="推荐"]', snapshotUrls: [ - 'https://i.gkd.li/i/12825969', // com.twitter.tweetdetail.TweetDetailActivity - 'https://i.gkd.li/i/12847584', // com.twitter.android.search.implementation.results.SearchActivity + 'https://i.gkd.li/i/12825969', + 'https://i.gkd.li/i/12847584', ], }, { @@ -136,8 +136,8 @@ export default defineGkdApp({ matches: '@[id="com.twitter.android:id/tweet_curation_action"] <2 * + [id="com.twitter.android:id/tweet_auto_playable_content_parent"] > [id="com.twitter.android:id/tweet_promoted_badge_bottom"][text$="推荐"]', snapshotUrls: [ - 'https://i.gkd.li/i/12882676', // com.twitter.tweetdetail.TweetDetailActivity - 'https://i.gkd.li/i/12904603', // com.twitter.app.profiles.ProfileActivity + 'https://i.gkd.li/i/12882676', + 'https://i.gkd.li/i/12904603', ], }, { @@ -159,6 +159,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: 'com.twitter.app.main.MainActivity', matches: '[id="com.twitter.android:id/app_rating_button_never"]', snapshotUrls: 'https://i.gkd.li/i/13774150', }, @@ -174,6 +175,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: 'com.twitter.app.main.MainActivity', matches: '@[clickable=true] > [visibleToUser=true][text="Not now"] < [id="com.umetrip.android.msky.app:id/btn_upgrade"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12838294', - 'https://i.gkd.li/i/12838293', - ], - }, { key: 10, name: '其他-进入飞行模式-提示弹窗', - fastQuery: true, - activityIds: 'com.umetrip.android.msky.homepage.activity.UmeHomeActivity', - rules: - '[id="com.umetrip.android.msky.app:id/imageView"] + [id="com.umetrip.android.msky.app:id/iv_cancel"]', - snapshotUrls: 'https://i.gkd.li/i/12750185', + rules: [ + { + fastQuery: true, + activityIds: + 'com.umetrip.android.msky.homepage.activity.UmeHomeActivity', + matches: + '[id="com.umetrip.android.msky.app:id/imageView"] + [id="com.umetrip.android.msky.app:id/iv_cancel"]', + snapshotUrls: 'https://i.gkd.li/i/12750185', + }, + ], }, { key: 11, name: '局部广告-首页右侧悬浮广告', - fastQuery: true, - activityIds: 'com.umetrip.android.msky.homepage.activity.UmeHomeActivity', - rules: - '@[id="com.umetrip.android.msky.app:id/iv_close_envelope"] + [id="com.umetrip.android.msky.app:id/media_view_envelope"]', - snapshotUrls: 'https://i.gkd.li/i/12783264', + rules: [ + { + fastQuery: true, + activityIds: + 'com.umetrip.android.msky.homepage.activity.UmeHomeActivity', + matches: + '@[id="com.umetrip.android.msky.app:id/iv_close_envelope"] + [id="com.umetrip.android.msky.app:id/media_view_envelope"]', + snapshotUrls: 'https://i.gkd.li/i/12783264', + }, + ], }, ], }); diff --git a/src/apps/com.unionpay.ts b/src/apps/com.unionpay.ts index f9bfe22f..160f6464 100644 --- a/src/apps/com.unionpay.ts +++ b/src/apps/com.unionpay.ts @@ -4,20 +4,6 @@ export default defineGkdApp({ id: 'com.unionpay', name: '云闪付', groups: [ - { - key: 1, - name: '更新提示', - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - fastQuery: true, - rules: [ - { - matches: '@[text="稍候再说"] + [text="立即更新"]', - snapshotUrls: 'https://i.gkd.li/i/12727278', - }, - ], - }, { key: 2, name: '分段广告-支付完成界面卡片广告', @@ -30,7 +16,7 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/13070564', }, { - preKeys: 0, + preKeys: [0], key: 1, matches: '[text="关闭广告"]', snapshotUrls: 'https://i.gkd.li/i/13070974', @@ -68,11 +54,13 @@ export default defineGkdApp({ rules: [ { key: 0, + activityIds: '.activity.UPActivityMain', matches: '[id="com.unionpay:id/view_locate_close"]', snapshotUrls: 'https://i.gkd.li/i/13634882', }, { key: 1, + activityIds: ['.activity.UPActivityMain', '.base.UPDialog'], matches: ['[text*="访问您的位置信息"]', '[text="不允许"]'], snapshotUrls: [ 'https://i.gkd.li/i/12695773', @@ -91,6 +79,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.base.UPDialog', matches: '[text="开启消息通知"] < * + [id="com.unionpay:id/view_alert_cancel"][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/12695736', @@ -112,26 +101,16 @@ export default defineGkdApp({ }, ], }, - { - key: 14, - name: '全屏广告-我的页面-弹窗广告', - matchTime: 10000, - actionMaximum: 1, - activityIds: 'com.unionpay.activity.UPActivityMain', - rules: - '[id="com.unionpay:id/container"] + [id="com.unionpay:id/image"][clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/13440341', - }, { key: 15, - fastQuery: true, name: '全屏广告-领取优惠弹窗', - desc: '点击X', + desc: '点击关闭', rules: [ { + fastQuery: true, activityIds: 'com.unionpay.cordova.UPActivityCordovaWeb', matches: - '[id="com.unionpay:id/view_content_container"] View[text="关闭按钮"][clickable=true]', + '@View[clickable=true][text="关闭按钮"] < FrameLayout[childCount>2] > @View[clickable=true][text=null][visibleToUser=true] + TextView[visibleToUser=true][text=null][index=parent.childCount.minus(1)]', - snapshotUrls: [ - 'https://i.gkd.li/i/13830230', - 'https://i.gkd.li/i/14052232', + rules: [ + { + matches: + 'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][text=null][visibleToUser=true] + TextView[visibleToUser=true][text=null][index=parent.childCount.minus(1)]', + snapshotUrls: [ + 'https://i.gkd.li/i/13830230', + 'https://i.gkd.li/i/14052232', + ], + }, ], }, { @@ -27,6 +31,7 @@ export default defineGkdApp({ actionMaximum: 1, rules: [ { + activityIds: '.MainActivity', matches: '[desc="青少年模式"] +3 [desc="我知道了"]', snapshotUrls: 'https://i.gkd.li/i/14052188', }, diff --git a/src/apps/com.uroad.carclub.ts b/src/apps/com.uroad.carclub.ts index 21169ceb..674d3a77 100644 --- a/src/apps/com.uroad.carclub.ts +++ b/src/apps/com.uroad.carclub.ts @@ -10,9 +10,10 @@ export default defineGkdApp({ rules: [ { key: 0, + fastQuery: true, activityIds: 'com.uroad.carclub.main.activity.MainActivity', matches: - '[id="com.uroad.carclub:id/ad_container_fl"] >n View[childCount=4] > TextView[index=2][clickable=true]', + 'View[childCount=4] > @TextView[index=2][clickable=true] < Button[desc="关闭"][clickable=true]', - snapshotUrls: [ - 'https://i.gkd.li/i/12888361', - 'https://i.gkd.li/i/12888389', - ], + activityIds: 'com.baidu.mobads.sdk.api.MobRewardVideoActivity', + matches: '[desc="不再显示"]', + snapshotUrls: 'https://i.gkd.li/i/12888361', }, ], }, { key: 2, name: '全屏广告-弹窗广告', - activityIds: [ - 'com.sigmob.sdk.base.common.TransparentAdActivity', - 'com.baidu.mobads.sdk.api.MobRewardVideoActivity', - ], + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, + activityIds: 'com.sigmob.sdk.base.common.TransparentAdActivity', matches: '[id="ad_area"] [id="close_btn"]', snapshotUrls: [ 'https://i.gkd.li/i/12888388', @@ -41,6 +38,7 @@ export default defineGkdApp({ }, { key: 1, + activityIds: 'com.baidu.mobads.sdk.api.MobRewardVideoActivity', matches: 'TextView[text="反馈"] + @ImageView[clickable=true] + TextView', snapshotUrls: 'https://i.gkd.li/i/12888945', diff --git a/src/apps/com.viva.time_todo.ts b/src/apps/com.viva.time_todo.ts index 4e49b8cc..6fbb23cb 100644 --- a/src/apps/com.viva.time_todo.ts +++ b/src/apps/com.viva.time_todo.ts @@ -7,6 +7,9 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, @@ -20,9 +23,10 @@ export default defineGkdApp({ { key: 1, name: '百度广告', + fastQuery: true, activityIds: 'com.baidu.mobads.sdk.api.MobRewardVideoActivity', matches: - '@ImageView[clickable=true] - RelativeLayout > RelativeLayout > ImageView + ImageView', + '@ImageView[clickable=true][childCount=0] - RelativeLayout >3 [text^="摇动手机"]', snapshotUrls: 'https://i.gkd.li/i/13761232', }, ], diff --git a/src/apps/com.viva.timeplan.p5.ts b/src/apps/com.viva.timeplan.p5.ts index 9998c4ce..dc299e20 100644 --- a/src/apps/com.viva.timeplan.p5.ts +++ b/src/apps/com.viva.timeplan.p5.ts @@ -8,6 +8,9 @@ export default defineGkdApp({ key: 1, name: '全屏广告-弹窗广告', desc: '点击关闭', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { fastQuery: true, diff --git a/src/apps/com.vivo.browser.ts b/src/apps/com.vivo.browser.ts index c8873e9d..500ef5ed 100644 --- a/src/apps/com.vivo.browser.ts +++ b/src/apps/com.vivo.browser.ts @@ -24,9 +24,14 @@ export default defineGkdApp({ { key: 1, name: '功能类-免流提示', - activityIds: 'com.vivo.browser.pendant.PendantActivity', - rules: '[id="com.vivo.browser:id/dialog_button_right"][text="继续浏览"]', - snapshotUrls: 'https://i.gkd.li/i/12847431', + rules: [ + { + activityIds: 'com.vivo.browser.pendant.PendantActivity', + matches: + '[id="com.vivo.browser:id/dialog_button_right"][text="继续浏览"]', + snapshotUrls: 'https://i.gkd.li/i/12847431', + }, + ], }, { key: 2, diff --git a/src/apps/com.vivo.space.ts b/src/apps/com.vivo.space.ts index 1d9f7ce8..9f6d3707 100644 --- a/src/apps/com.vivo.space.ts +++ b/src/apps/com.vivo.space.ts @@ -23,13 +23,20 @@ export default defineGkdApp({ { key: 3, name: '全屏广告-活动广告', + fastQuery: true, matchTime: 10000, actionMaximum: 1, - activityIds: 'com.vivo.space.ui.VivoSpaceTabActivity', - rules: 'Image[text=""] + [text=""][clickable=true]', - snapshotUrls: [ - 'https://i.gkd.li/i/13218155', - 'https://i.gkd.li/i/13292907', + resetMatch: 'app', + rules: [ + { + activityIds: 'com.vivo.space.ui.VivoSpaceTabActivity', + matches: + 'View[childCount=2] > @[index=1][clickable=true][visibleToUser=true][childCount=0] < [text="取消"]', snapshotUrls: 'https://i.gkd.li/i/13440881', }, ], diff --git a/src/apps/com.vmos.pro.ts b/src/apps/com.vmos.pro.ts index 48471d9a..6ac958a2 100644 --- a/src/apps/com.vmos.pro.ts +++ b/src/apps/com.vmos.pro.ts @@ -8,9 +8,16 @@ export default defineGkdApp({ key: 1, name: '全屏广告-弹窗广告', fastQuery: true, - activityIds: 'com.vmos.pro.activities.main.MainActivity', - rules: '[id="com.vmos.pro:id/iv_dismiss"] ', - snapshotUrls: 'https://i.gkd.li/i/13536416', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.vmos.pro.activities.main.MainActivity', + matches: '[text="不再显示本活动"]', + snapshotUrls: 'https://i.gkd.li/i/13536416', + }, + ], }, ], }); diff --git a/src/apps/com.vo.icea.ts b/src/apps/com.vo.icea.ts index 42c9a0f8..7c5ed141 100644 --- a/src/apps/com.vo.icea.ts +++ b/src/apps/com.vo.icea.ts @@ -8,7 +8,6 @@ export default defineGkdApp({ key: 5, name: '分段广告-播放界面卡片广告', desc: '需点击二次弹窗关闭原因', - fastQuery: true, activityIds: [ 'com.vo.icea.MainActivity', 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', @@ -21,8 +20,9 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/13510973', }, { - preKeys: 0, + preKeys: [0], name: '原因选"不感兴趣"', + fastQuery: true, matches: '@LinearLayout[clickable=true] > [text="不感兴趣"]', snapshotUrls: 'https://i.gkd.li/i/13510972', }, @@ -34,18 +34,19 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - activityIds: 'com.vo.icea.MainActivity', rules: [ - //字节穿山甲广告SDK: key0-4 { key: 0, fastQuery: true, + activityIds: + 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', matches: '[id="com.byted.pangle:id/tt_reward_full_count_down"]', snapshotUrls: 'https://i.gkd.li/i/13511052', }, { key: 1, fastQuery: true, + activityIds: '.MainActivity', matches: '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', snapshotUrls: [ @@ -56,6 +57,8 @@ export default defineGkdApp({ { key: 2, name: '类型2', + activityIds: + 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', matches: '[text="反馈"] -n View > Image[text=""][width<60]', snapshotUrls: [ 'https://i.gkd.li/i/13511052', @@ -65,6 +68,8 @@ export default defineGkdApp({ { key: 3, name: '类型3', + activityIds: + 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', matches: '[text="反馈"] < View [text*="跳过"][text.length<=10]', snapshotUrls: 'https://i.gkd.li/i/13446063', }, diff --git a/src/apps/com.vphonegaga.titan.ts b/src/apps/com.vphonegaga.titan.ts index 93f68022..a23d56e4 100644 --- a/src/apps/com.vphonegaga.titan.ts +++ b/src/apps/com.vphonegaga.titan.ts @@ -7,10 +7,18 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', - fastQuery: true, - activityIds: 'com.vphonegaga.titan.MyNativeActivity1', - rules: '@Image < View +2 [text="反馈"]', - snapshotUrls: 'https://i.gkd.li/i/13292911', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: '.MyNativeActivity', + matches: + '@Image[childCount=0][text=""][width<60 && height<60] < View[childCount=1] + View +n View > View[childCount=1] > TextView[text$="广告"]', + exampleUrls: 'https://e.gkd.li/ef6b8242-76d7-4ce5-b0fc-4444f72b9b39', + snapshotUrls: 'https://i.gkd.li/i/13292911', + }, + ], }, ], }); diff --git a/src/apps/com.wacai365.ts b/src/apps/com.wacai365.ts index 83af5f24..f060c18e 100644 --- a/src/apps/com.wacai365.ts +++ b/src/apps/com.wacai365.ts @@ -11,21 +11,35 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: - '@ImageView[id="com.wacai365:id/tv_cancel"] - TextView[text^="新版本"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13249620', //com.wacai365.HomeActivity - 'https://i.gkd.li/i/13772291', //com.wacai.android.wind.splash.WindDialogActivity + rules: [ + { + activityIds: [ + 'com.wacai365.HomeActivity', + 'com.wacai.android.wind.splash.WindDialogActivity', + ], + matches: + '@ImageView[id="com.wacai365:id/tv_cancel"] - TextView[text^="新版本"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13249620', + 'https://i.gkd.li/i/13772291', + ], + }, ], }, { key: 2, name: '全屏广告-弹窗广告', fastQuery: true, + matchTime: 10000, actionMaximum: 1, - activityIds: 'com.wacai365.HomeActivity', - rules: '[id^="com.wacai365:id/promote_banner_close"]', - snapshotUrls: 'https://i.gkd.li/i/13249666', + resetMatch: 'app', + rules: [ + { + activityIds: 'com.wacai365.HomeActivity', + matches: '[id^="com.wacai365:id/promote_banner_close"]', + snapshotUrls: 'https://i.gkd.li/i/13249666', + }, + ], }, { key: 3, diff --git a/src/apps/com.wallstreetcn.news.ts b/src/apps/com.wallstreetcn.news.ts index 25fe3932..bedc7025 100644 --- a/src/apps/com.wallstreetcn.news.ts +++ b/src/apps/com.wallstreetcn.news.ts @@ -25,10 +25,10 @@ export default defineGkdApp({ key: 10, name: '局部广告-卡片广告', desc: '点击关闭', - activityIds: ['com.wallstreetcn.news.ProxyMainActivity'], - fastQuery: true, rules: [ { + fastQuery: true, + activityIds: 'com.wallstreetcn.news.ProxyMainActivity', matches: '[text="广告" || text="活动"] + [id="com.wallstreetcn.news:id/close"][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/13262717', diff --git a/src/apps/com.wan.tools.ts b/src/apps/com.wan.tools.ts index 383a8f41..fa6088ae 100644 --- a/src/apps/com.wan.tools.ts +++ b/src/apps/com.wan.tools.ts @@ -7,25 +7,45 @@ export default defineGkdApp({ { key: 1, name: '通知提示-公告弹窗', + fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: 'LinearLayout[childCount=2] > @[text="取消"] + [text="确认"]', - snapshotUrls: 'https://i.gkd.li/i/13392027', + rules: [ + { + activityIds: 'com.one.downloadtools.ui.activity.HomeActivity', + matches: + 'LinearLayout[childCount=2] > @[text="取消"] + [text="确认"]', + snapshotUrls: 'https://i.gkd.li/i/13392027', + }, + ], }, { key: 2, name: '功能类-自动识别解析链接', - activityIds: 'com.one.downloadtools.ui.activity.HomeActivity', - rules: '@[text="识别解析"] -2 * > [text^="检测到你复制链接"]', - snapshotUrls: 'https://i.gkd.li/i/13392085', + rules: [ + { + fastQuery: true, + activityIds: 'com.one.downloadtools.ui.activity.HomeActivity', + matches: '[text="识别解析"]', + snapshotUrls: 'https://i.gkd.li/i/13392085', + }, + ], }, { key: 3, name: '全屏广告-开通会员弹窗', - activityIds: 'com.one.downloadtools.ui.activity.HomeActivity', - rules: '[text^="开通会员"] < * +n * > [text="暂不"]', - snapshotUrls: 'https://i.gkd.li/i/13392112', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.one.downloadtools.ui.activity.HomeActivity', + matches: ['[text^="开通会员"]', '[text="暂不"]'], + snapshotUrls: 'https://i.gkd.li/i/13392112', + }, + ], }, ], }); diff --git a/src/apps/com.weaver.emobile7.ts b/src/apps/com.weaver.emobile7.ts deleted file mode 100644 index b5e1042a..00000000 --- a/src/apps/com.weaver.emobile7.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { defineGkdApp } from '@gkd-kit/define'; - -export default defineGkdApp({ - id: 'com.weaver.emobile7', - name: 'EMobile7', - groups: [ - { - key: 1, - name: '更新提示', - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - rules: [ - { - matches: - '@[id="com.weaver.emobile7:id/sdl__negative_button"][text="取消"] +(2) [id="com.weaver.emobile7:id/sdl__positive_button"][text="更新"]', - snapshotUrls: ['https://i.gkd.li/i/12673154'], - }, - ], - }, - ], -}); diff --git a/src/apps/com.wenhua.bamboo.ts b/src/apps/com.wenhua.bamboo.ts index f34aaa5f..328ed08c 100644 --- a/src/apps/com.wenhua.bamboo.ts +++ b/src/apps/com.wenhua.bamboo.ts @@ -14,6 +14,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.screen.activity.MarketOptionActivity', matches: '@Button[text="稍后再说"] +2 Button[text="马上开启"]', snapshotUrls: 'https://i.gkd.li/i/13407555', }, diff --git a/src/apps/com.wepie.ivy.ts b/src/apps/com.wepie.ivy.ts index 1279bbe7..70f9ae74 100644 --- a/src/apps/com.wepie.ivy.ts +++ b/src/apps/com.wepie.ivy.ts @@ -7,14 +7,16 @@ export default defineGkdApp({ { key: 1, name: '评价提示-好评弹窗', + fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { key: 0, - matches: '[text="我要吐槽"] + [text="五星好评"]', action: 'back', + activityIds: '.module.start.MainActivity', + matches: '[text="我要吐槽"] + [text="五星好评"]', snapshotUrls: 'https://i.gkd.li/i/14602933', }, ], diff --git a/src/apps/com.whpe.qrcode.hunan_xiangtan.ts b/src/apps/com.whpe.qrcode.hunan_xiangtan.ts index 12d3f6a1..4b588eea 100644 --- a/src/apps/com.whpe.qrcode.hunan_xiangtan.ts +++ b/src/apps/com.whpe.qrcode.hunan_xiangtan.ts @@ -11,10 +11,10 @@ export default defineGkdApp({ { key: 0, name: '快手广告', - activityIds: 'com.whpe.qrcode.hunan_xiangtan.MainActivity', fastQuery: true, + activityIds: 'com.whpe.qrcode.hunan_xiangtan.MainActivity', matches: - '@[id="com.whpe.qrcode.hunan_xiangtan:id/iv_close"] +n * >n [text="广告"]', + '[id="com.whpe.qrcode.hunan_xiangtan:id/interact_ad_root"] > [id="com.whpe.qrcode.hunan_xiangtan:id/iv_close"]', snapshotUrls: 'https://i.gkd.li/i/13476265', }, ], diff --git a/src/apps/com.wibo.bigbang.ocr.ts b/src/apps/com.wibo.bigbang.ocr.ts index e4e1ed4b..5f2cb1ae 100644 --- a/src/apps/com.wibo.bigbang.ocr.ts +++ b/src/apps/com.wibo.bigbang.ocr.ts @@ -7,12 +7,14 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { + activityIds: + 'com.vivo.upgradelibrary.upmode.appdialog.VivoUpgradeActivityDialog', matches: '[id="com.wibo.bigbang.ocr:id/vivo_upgrade_negative_btn"][text="忽略本次"]', snapshotUrls: 'https://i.gkd.li/i/13360281', diff --git a/src/apps/com.wifitutu.ts b/src/apps/com.wifitutu.ts index c01b260e..68fed432 100644 --- a/src/apps/com.wifitutu.ts +++ b/src/apps/com.wifitutu.ts @@ -7,15 +7,22 @@ export default defineGkdApp({ { key: 1, name: '局部广告-首页-WiFi列表广告', - activityIds: ['com.wifitutu.ui.main.MainActivity'], + desc: '点击关闭', rules: [ { - matches: 'View < [desc^="dislike"][visibleToUser=true]', + key: 1, + fastQuery: true, + activityIds: 'com.wifitutu.ui.main.MainActivity', + matches: + '@View[clickable=true][childCount=0][visibleToUser=true] < FrameLayout[desc^="dislike"] + FrameLayout >2 [text="广告"]', snapshotUrls: 'https://i.gkd.li/i/13233916', }, { + key: 2, + fastQuery: true, + activityIds: 'com.wifitutu.ui.main.MainActivity', matches: - '@Image[text=""] < View +n View > View > TextView[text="广告"]', + '@Image[text=""] < View +n View > View > TextView[visibleToUser=true][text="广告"] < ViewGroup[childCount=3] >2 ViewGroup[childCount=3] > ImageView[clickable=true][index=2]', - snapshotUrls: 'https://i.gkd.li/i/14927441', - }, - { - key: 1, - activityIds: - 'com.zhuanzhuan.module.reach.channel.impl.uicode.ReachDialogActivity', - matches: - '[id="android:id/content"] > ViewGroup[childCount=3] > FrameLayout > ViewGroup[childCount=2] > ImageView[index=1]', - snapshotUrls: 'https://i.gkd.li/i/15140820', + '[id="android:id/content"] > ViewGroup[childCount=3] >2 ViewGroup[childCount>1] > ImageView[clickable=true][index=parent.childCount.minus(1)]', + snapshotUrls: [ + 'https://i.gkd.li/i/14927441', + 'https://i.gkd.li/i/15140820', + ], }, ], }, @@ -55,6 +53,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.activity.MainActivity', matches: '@ImageView[clickable=true] - ViewGroup > [text="喜欢就给个好评吧"]', snapshotUrls: 'https://i.gkd.li/i/15881026', diff --git a/src/apps/com.wujie.connect.ts b/src/apps/com.wujie.connect.ts index d54b4b76..fa30dc66 100644 --- a/src/apps/com.wujie.connect.ts +++ b/src/apps/com.wujie.connect.ts @@ -7,10 +7,16 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[vid="no_update_tv"]', - snapshotUrls: 'https://i.gkd.li/i/14296122', + rules: [ + { + matches: '[vid="no_update_tv"]', + snapshotUrls: 'https://i.gkd.li/i/14296122', + }, + ], }, ], }); diff --git a/src/apps/com.wzwh.bzpaipan.ts b/src/apps/com.wzwh.bzpaipan.ts index 3f84f562..809bd6c4 100644 --- a/src/apps/com.wzwh.bzpaipan.ts +++ b/src/apps/com.wzwh.bzpaipan.ts @@ -7,11 +7,15 @@ export default defineGkdApp({ { key: 3, name: '全屏广告', - fastQuery: true, - activityIds: 'com.qq.e.ads.PortraitADActivity', - rules: - '@ImageView[clickable=true] < LinearLayout[childCount=1] <2 FrameLayout[childCount=2] < [id="android:id/content"][childCount=1]', - snapshotUrls: 'https://i.gkd.li/i/13162912', + rules: [ + { + fastQuery: true, + activityIds: 'com.qq.e.ads.PortraitADActivity', + matches: + '@ImageView[clickable=true] < LinearLayout[childCount=1] <2 FrameLayout[childCount=2] < [id="android:id/content"][childCount=1]', + snapshotUrls: 'https://i.gkd.li/i/13162912', + }, + ], }, ], }); diff --git a/src/apps/com.x.istar.ts b/src/apps/com.x.istar.ts index 86d0d12d..4ab0e372 100644 --- a/src/apps/com.x.istar.ts +++ b/src/apps/com.x.istar.ts @@ -7,13 +7,17 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', - fastQuery: true, matchTime: 10000, - resetMatch: 'app', actionMaximum: 1, - activityIds: 'com.x.istar.view.main.MainActivity', - rules: '[text="关闭广告"][vid="btn_negative"]', - snapshotUrls: 'https://i.gkd.li/i/13974606', + resetMatch: 'app', + rules: [ + { + fastQuery: true, + activityIds: 'com.x.istar.view.main.MainActivity', + matches: '[text="关闭广告"][vid="btn_negative"]', + snapshotUrls: 'https://i.gkd.li/i/13974606', + }, + ], }, ], }); diff --git a/src/apps/com.x2era.xcloud.app.ts b/src/apps/com.x2era.xcloud.app.ts index 9551d99c..67196f08 100644 --- a/src/apps/com.x2era.xcloud.app.ts +++ b/src/apps/com.x2era.xcloud.app.ts @@ -10,9 +10,14 @@ export default defineGkdApp({ fastQuery: true, matchTime: 10000, actionMaximum: 1, + resetMatch: 'app', rules: [ { - matches: '[id$="com.x2era.xcloud.app:id/iv_cancel"]', + activityIds: '.MainActivity', + matches: [ + '[id="com.x2era.xcloud.app:id/tv_upgrade"]', + '[id="com.x2era.xcloud.app:id/iv_cancel"]', + ], snapshotUrls: 'https://i.gkd.li/i/13420706', }, ], diff --git a/src/apps/com.xfani.app.ts b/src/apps/com.xfani.app.ts index a75d713f..082e66e7 100644 --- a/src/apps/com.xfani.app.ts +++ b/src/apps/com.xfani.app.ts @@ -8,11 +8,18 @@ export default defineGkdApp({ key: 1, name: '全屏广告-弹窗广告', desc: '点击关闭', - fastQuery: true, - activityIds: 'com.xfani.app.MainActivity', - rules: - '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', - snapshotUrls: 'https://i.gkd.li/i/13188550', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + fastQuery: true, + activityIds: 'com.xfani.app.MainActivity', + matches: + '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', + snapshotUrls: 'https://i.gkd.li/i/13188550', + }, + ], }, ], }); diff --git a/src/apps/com.xiachufang.ts b/src/apps/com.xiachufang.ts index fdce4c2f..fed74dde 100644 --- a/src/apps/com.xiachufang.ts +++ b/src/apps/com.xiachufang.ts @@ -10,36 +10,32 @@ export default defineGkdApp({ rules: [ { key: 1, - name: '菜谱底部卡片广告-1', - activityIds: 'com.xiachufang.activity.recipe.RecipeDetailActivity', fastQuery: true, + activityIds: 'com.xiachufang.activity.recipe.RecipeDetailActivity', matches: '[id="com.xiachufang:id/ad_close"][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/13348710', }, { key: 2, - name: '菜谱底部卡片广告-2', - activityIds: 'com.xiachufang.activity.recipe.RecipeDetailActivity', fastQuery: true, + activityIds: 'com.xiachufang.activity.recipe.RecipeDetailActivity', matches: '[id="com.xiachufang:id/jad_feed_close"][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/13363079', }, { key: 3, - name: '菜谱底部卡片广告-1-弹出窗口', - activityIds: 'com.xiachufang.activity.recipe.RecipeDetailActivity', fastQuery: true, - matches: '[id="com.byted.pangle:id/tt_item_tv"][text="不感兴趣"]', + activityIds: 'com.xiachufang.activity.recipe.RecipeDetailActivity', + matches: '@[clickable=true] > [text="不感兴趣"]', snapshotUrls: 'https://i.gkd.li/i/13454534', }, { key: 4, - name: '菜谱底部卡片广告-3', - activityIds: 'com.xiachufang.activity.recipe.RecipeDetailActivity', fastQuery: true, + activityIds: 'com.xiachufang.activity.recipe.RecipeDetailActivity', matches: - '[id="com.xiachufang:id/fl_container"] >6 [name="android.widget.ImageView" && width=32]', + '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] - LinearLayout[childCount=2] > [text="下载应用" || text="立即下载" || text="查看详情" || text="领取优惠" || text="进入小程序"]', snapshotUrls: 'https://i.gkd.li/i/13484117', }, ], @@ -47,12 +43,13 @@ export default defineGkdApp({ { key: 2, name: '其他-厨房问卷', + desc: '点击关闭', rules: [ { key: 1, - name: '厨房问卷', + fastQuery: true, activityIds: 'com.xiachufang.activity.recipe.RecipeDetailActivity', - matches: '[text^="厨房问卷"] + [desc="关闭"]', + matches: '@[desc="关闭"] - [text^="厨房问卷"]', snapshotUrls: 'https://i.gkd.li/i/13363042', }, ], diff --git a/src/apps/com.xiaoe.client.ts b/src/apps/com.xiaoe.client.ts index c6d76e72..76cb0de6 100644 --- a/src/apps/com.xiaoe.client.ts +++ b/src/apps/com.xiaoe.client.ts @@ -8,12 +8,13 @@ export default defineGkdApp({ key: 1, name: '更新提示-版本更新弹窗', desc: '点击暂不更新', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { + activityIds: 'com.xiaoe.app.ui.main.XiaoeMainActivity', matches: 'FrameLayout[vid="centerPopupContainer"] [text="暂不更新"]', snapshotUrls: 'https://i.gkd.li/i/13832282', }, diff --git a/src/apps/com.xiaoenai.app.ts b/src/apps/com.xiaoenai.app.ts index 87629eee..080e9231 100644 --- a/src/apps/com.xiaoenai.app.ts +++ b/src/apps/com.xiaoenai.app.ts @@ -35,25 +35,35 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { - name: '腾讯广告SDK', + key: 1, + fastQuery: true, + activityIds: '.presentation.home.view.activity.HomeActivity', matches: - 'FrameLayout[childCount>1] > FrameLayout[childCount=1] > ImageView[width<90][height<90]', - snapshotUrls: [ - 'https://i.gkd.li/i/13728018', - 'https://i.gkd.li/i/13867878', - ], + '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', + exampleUrls: 'https://e.gkd.li/3997eac2-4b0d-4adc-a00c-d7551ea4f364', + snapshotUrls: 'https://i.gkd.li/i/13728018', + }, + { + key: 2, + fastQuery: true, + activityIds: + 'com.mzd.feature.launcher.view.activity.LauncherActivity', + matches: + '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null] <2 FrameLayout[childCount=5] + FrameLayout[childCount=2] > [text^="立即" || text="查看详情" || text="了解更多" || text="去逛逛" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', + exampleUrls: 'https://e.gkd.li/e11364ec-62dc-483b-b8c9-28feab2563fb', + snapshotUrls: 'https://i.gkd.li/i/13867878', }, ], }, { key: 7, name: '局部广告-信息流广告', - activityIds: - 'com.xiaoenai.app.presentation.home.view.activity.HomeActivity', rules: [ { name: '字节广告SDK', fastQuery: true, + activityIds: + 'com.xiaoenai.app.presentation.home.view.activity.HomeActivity', matches: '@ImageView[clickable=true][width<90][height<90] -3 ImageView <5 [text="不感兴趣"]', + matches: '@[clickable=true] > [text="不感兴趣"]', snapshotUrls: 'https://i.gkd.li/i/13857537', }, ], diff --git a/src/apps/com.xiaohu.olevodmobile.ts b/src/apps/com.xiaohu.olevodmobile.ts index 638470d1..68651cca 100644 --- a/src/apps/com.xiaohu.olevodmobile.ts +++ b/src/apps/com.xiaohu.olevodmobile.ts @@ -11,9 +11,13 @@ export default defineGkdApp({ actionMaximum: 1, resetMatch: 'app', priorityTime: 10000, - rules: - '@[id="com.xiaohu.olevodmobile:id/init_time_text"] + [text="跳过"]', // 这个 app 的开屏广告需要点击倒计时按钮才能跳过 - snapshotUrls: 'https://i.gkd.li/i/12826256', + rules: [ + { + matches: + '@[id="com.xiaohu.olevodmobile:id/init_time_text"] + [text="跳过"]', // 这个 app 的开屏广告需要点击倒计时按钮才能跳过 + snapshotUrls: 'https://i.gkd.li/i/12826256', + }, + ], }, ], }); diff --git a/src/apps/com.xiaolan.tv.chat.ts b/src/apps/com.xiaolan.tv.chat.ts index 38b16deb..396602cc 100644 --- a/src/apps/com.xiaolan.tv.chat.ts +++ b/src/apps/com.xiaolan.tv.chat.ts @@ -10,6 +10,7 @@ export default defineGkdApp({ desc: '点击[确定]', rules: [ { + key: 0, activityIds: 'com.xiaolan.tv.chat.MainActivity', matches: '[desc="确定"][visibleToUser=true]', exampleUrls: diff --git a/src/apps/com.xiaolian.prometheus.ts b/src/apps/com.xiaolian.prometheus.ts index a2a7aeda..7ca9dc2e 100644 --- a/src/apps/com.xiaolian.prometheus.ts +++ b/src/apps/com.xiaolian.prometheus.ts @@ -7,19 +7,33 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '@[vid="close_rel"] - * > [text="发现新版本"]', - snapshotUrls: 'https://i.gkd.li/i/14292788', + rules: [ + { + activityIds: 'com.xiaolian.home.ui.HomeActivity', + matches: '@[vid="close_rel"] - * > [text="发现新版本"]', + snapshotUrls: 'https://i.gkd.li/i/14292788', + }, + ], }, { key: 2, name: '全屏广告-关注公众号弹窗', - activityIds: 'com.xiaolian.home.ui.HomeActivity', + desc: '点击关闭', fastQuery: true, - rules: '@[vid="close_img"] + [text="关注"]', - snapshotUrls: 'https://i.gkd.li/i/14292789', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.xiaolian.home.ui.HomeActivity', + matches: '@[vid="close_img"] + [text="关注"]', + snapshotUrls: 'https://i.gkd.li/i/14292789', + }, + ], }, ], }); diff --git a/src/apps/com.xiaomi.account.ts b/src/apps/com.xiaomi.account.ts deleted file mode 100644 index 9950d18f..00000000 --- a/src/apps/com.xiaomi.account.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { defineGkdApp } from '@gkd-kit/define'; - -export default defineGkdApp({ - id: 'com.xiaomi.account', - name: '小米账号', - groups: [ - { - key: 1, - name: '更新提示', - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - rules: '@[text="以后再说"] + [text="立即升级"]', - snapshotUrls: 'https://i.gkd.li/i/12781280', - }, - ], -}); diff --git a/src/apps/com.xiaomi.gamecenter.sdk.service.ts b/src/apps/com.xiaomi.gamecenter.sdk.service.ts index 0d0af96f..694aa96d 100644 --- a/src/apps/com.xiaomi.gamecenter.sdk.service.ts +++ b/src/apps/com.xiaomi.gamecenter.sdk.service.ts @@ -10,8 +10,13 @@ export default defineGkdApp({ fastQuery: true, actionMaximum: 1, resetMatch: 'app', - rules: '[text="升级提示"] < * + [vid="btn_close"]', - snapshotUrls: 'https://i.gkd.li/i/14188929', + rules: [ + { + activityIds: 'com.xiaomi.gamecenter.sdk.ui.actlayout.ViewUpgrade', + matches: '[text="升级提示"] < * + [vid="btn_close"]', + snapshotUrls: 'https://i.gkd.li/i/14188929', + }, + ], }, ], }); diff --git a/src/apps/com.xiaomi.gamecenter.ts b/src/apps/com.xiaomi.gamecenter.ts index e7baef04..65f10f7c 100644 --- a/src/apps/com.xiaomi.gamecenter.ts +++ b/src/apps/com.xiaomi.gamecenter.ts @@ -7,10 +7,14 @@ export default defineGkdApp({ { key: 1, name: '局部广告-首页右侧悬浮广告', - activityIds: 'com.xiaomi.gamecenter.ui.MainTabActivity', - rules: - '[id="com.xiaomi.gamecenter:id/ad_view"] + [id="com.xiaomi.gamecenter:id/close_btn"]', - snapshotUrls: 'https://i.gkd.li/i/12715800', + rules: [ + { + activityIds: 'com.xiaomi.gamecenter.ui.MainTabActivity', + matches: + '[id="com.xiaomi.gamecenter:id/ad_view"] + [id="com.xiaomi.gamecenter:id/close_btn"]', + snapshotUrls: 'https://i.gkd.li/i/12715800', + }, + ], }, ], }); diff --git a/src/apps/com.xiaomi.hm.health.ts b/src/apps/com.xiaomi.hm.health.ts index 3882ef16..84779e49 100644 --- a/src/apps/com.xiaomi.hm.health.ts +++ b/src/apps/com.xiaomi.hm.health.ts @@ -7,10 +7,14 @@ export default defineGkdApp({ { key: 1, name: '局部广告-首页-底部广告', - fastQuery: true, - activityIds: 'com.xiaomi.hm.health.activity.ChannelMainTabActivity', - rules: 'ImageView[id="com.xiaomi.hm.health:id/close_icon"]', - snapshotUrls: 'https://i.gkd.li/i/13695424', + rules: [ + { + fastQuery: true, + activityIds: 'com.xiaomi.hm.health.activity.ChannelMainTabActivity', + matches: 'ImageView[id="com.xiaomi.hm.health:id/close_icon"]', + snapshotUrls: 'https://i.gkd.li/i/13695424', + }, + ], }, ], }); diff --git a/src/apps/com.xiaomi.market.ts b/src/apps/com.xiaomi.market.ts index de448fa0..d356b7c8 100644 --- a/src/apps/com.xiaomi.market.ts +++ b/src/apps/com.xiaomi.market.ts @@ -7,8 +7,8 @@ export default defineGkdApp({ { key: 0, name: '全屏广告-弹窗广告', - fastQuery: true, matchRoot: true, + fastQuery: true, actionMaximum: 1, matchTime: 10000, resetMatch: 'app', @@ -24,10 +24,14 @@ export default defineGkdApp({ { key: 9, name: '局部广告-卡片广告', - fastQuery: true, - activityIds: 'com.xiaomi.market.ui.UpdateListActivity', - rules: '[id="com.xiaomi.market:id/iv_close_tip"]', - snapshotUrls: 'https://i.gkd.li/i/13197334', + rules: [ + { + fastQuery: true, + activityIds: 'com.xiaomi.market.ui.UpdateListActivity', + matches: '[id="com.xiaomi.market:id/iv_close_tip"]', + snapshotUrls: 'https://i.gkd.li/i/13197334', + }, + ], }, { key: 10, @@ -69,11 +73,9 @@ export default defineGkdApp({ key: 1, name: '开启通知栏提醒', matchTime: 10000, + activityIds: '.business_ui.main.MarketTabActivity', matches: ['[text="开启通知栏提醒"]', '[text="不了，谢谢"]'], - snapshotUrls: [ - 'https://i.gkd.li/i/13197306', - 'https://i.gkd.li/i/13691701', - ], + snapshotUrls: 'https://i.gkd.li/i/13691701', }, ], }, @@ -84,9 +86,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - activityIds: 'com.xiaomi.market.business_ui.main.MarketTabActivity', - rules: '[id="com.xiaomi.market:id/close_float_recommend"]', - snapshotUrls: 'https://i.gkd.li/i/13624971', + rules: [ + { + activityIds: 'com.xiaomi.market.business_ui.main.MarketTabActivity', + matches: '[id="com.xiaomi.market:id/close_float_recommend"]', + snapshotUrls: 'https://i.gkd.li/i/13624971', + }, + ], }, { key: 13, diff --git a/src/apps/com.xiaomi.mico.ts b/src/apps/com.xiaomi.mico.ts index d678afb8..c20913a3 100644 --- a/src/apps/com.xiaomi.mico.ts +++ b/src/apps/com.xiaomi.mico.ts @@ -7,20 +7,29 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-首页弹窗广告', - activityIds: 'com.xiaomi.mico.main.MainActivity', - rules: - '[id="com.xiaomi.mico:id/adImage"] + [id="com.xiaomi.mico:id/ivCloseAd"]', - snapshotUrls: 'https://i.gkd.li/i/12745621', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: '.main.MainActivity', + matches: + '[id="com.xiaomi.mico:id/adImage"] + [id="com.xiaomi.mico:id/ivCloseAd"]', + snapshotUrls: 'https://i.gkd.li/i/12745621', + }, + ], }, { key: 2, name: '权限提示-请求开启定位权限弹窗', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { + activityIds: '.main.MainActivity', matches: ['[text*="开启位置服务"]', '[text="取消"]'], snapshotUrls: 'https://i.gkd.li/i/15284753', }, diff --git a/src/apps/com.xiaomi.scanner.ts b/src/apps/com.xiaomi.scanner.ts index e0c4c993..c61689b9 100644 --- a/src/apps/com.xiaomi.scanner.ts +++ b/src/apps/com.xiaomi.scanner.ts @@ -7,11 +7,17 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '@[text="以后再说"] + [text="立即更新"]', - snapshotUrls: 'https://i.gkd.li/i/14332513', + rules: [ + { + activityIds: '.app.ScanActivity', + matches: '@[text="以后再说"] + [text="立即更新"]', + snapshotUrls: 'https://i.gkd.li/i/14332513', + }, + ], }, ], }); diff --git a/src/apps/com.xiaomi.smarthome.ts b/src/apps/com.xiaomi.smarthome.ts index 6b2a0f33..7d9c070b 100644 --- a/src/apps/com.xiaomi.smarthome.ts +++ b/src/apps/com.xiaomi.smarthome.ts @@ -7,12 +7,12 @@ export default defineGkdApp({ { key: 0, name: '局部广告-卡片广告', - activityIds: 'com.xiaomi.smarthome.SmartHomeMainActivity', rules: [ { + activityIds: 'com.xiaomi.smarthome.SmartHomeMainActivity', matches: 'RelativeLayout[childCount=2] > ImageView[id!=null] + ImageView[clickable=true][id!=null]', - snapshotUrls: ['https://i.gkd.li/i/12639658'], + snapshotUrls: 'https://i.gkd.li/i/12639658', }, ], }, @@ -22,9 +22,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - snapshotUrls: 'https://i.gkd.li/i/12639671', - rules: - '[text*="检测到"&&text*="升级"] < ViewGroup + ViewGroup > Button > [text = "取消"]', + rules: [ + { + matches: + '[text*="检测到"&&text*="升级"] < ViewGroup + ViewGroup > Button > [text = "取消"]', + snapshotUrls: 'https://i.gkd.li/i/12639671', + }, + ], }, ], }); diff --git a/src/apps/com.xiaomi.vipaccount.ts b/src/apps/com.xiaomi.vipaccount.ts index d5b52f0f..c917f12e 100644 --- a/src/apps/com.xiaomi.vipaccount.ts +++ b/src/apps/com.xiaomi.vipaccount.ts @@ -7,34 +7,54 @@ export default defineGkdApp({ { key: 1, name: '更新提示', - matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: - '@[text="稍后安装"] < LinearLayout - ScrollView >(4) [text="发现新版本"]', - snapshotUrls: 'https://i.gkd.li/i/12642466', + rules: [ + { + activityIds: 'miuix.appcompat.app.AlertDialog', + matches: + '@[text="稍后安装"] < LinearLayout - ScrollView >(4) [text="发现新版本"]', + snapshotUrls: 'https://i.gkd.li/i/12642466', + }, + ], }, { key: 2, name: '局部广告-评论区卡片广告', - activityIds: 'com.xiaomi.vipaccount.newbrowser.NormalWebActivity', - rules: '[text="closeGray"][clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/12642459', + rules: [ + { + activityIds: 'com.xiaomi.vipaccount.newbrowser.NormalWebActivity', + matches: '[text="closeGray"][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/12642459', + }, + ], }, { key: 3, name: '全屏广告-签到弹窗', - activityIds: 'com.xiaomi.vipaccount.newbrowser.NormalWebActivity', - rules: '[text="签到赢权益"] +n Image[text*="cancel_circle"]', - snapshotUrls: 'https://i.gkd.li/i/13328271', + rules: [ + { + activityIds: 'com.xiaomi.vipaccount.newbrowser.NormalWebActivity', + matches: '[text="签到赢权益"] +n Image[text*="cancel_circle"]', + snapshotUrls: 'https://i.gkd.li/i/13328271', + }, + ], }, { key: 4, name: '全屏广告-公告板弹窗', - activityIds: 'com.xiaomi.vipaccount.ui.home.page.HomeFrameActivity', fastQuery: true, - rules: '[desc="公告版弹窗"] +2 [id="com.xiaomi.vipaccount:id/close"]', - snapshotUrls: 'https://i.gkd.li/i/13400617', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.xiaomi.vipaccount.ui.home.page.HomeFrameActivity', + matches: + '[desc="公告版弹窗"] +2 [id="com.xiaomi.vipaccount:id/close"]', + snapshotUrls: 'https://i.gkd.li/i/13400617', + }, + ], }, ], }); diff --git a/src/apps/com.xiaomi.youpin.ts b/src/apps/com.xiaomi.youpin.ts index 60bdc218..79480c66 100644 --- a/src/apps/com.xiaomi.youpin.ts +++ b/src/apps/com.xiaomi.youpin.ts @@ -28,6 +28,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.globalpopwindow.popwindow.PopWindowActivity', matches: '[id="com.xiaomi.youpin:id/ypd_alert_close_image"]', snapshotUrls: 'https://i.gkd.li/i/12836775', }, diff --git a/src/apps/com.xiaoxiongyhh.ts b/src/apps/com.xiaoxiongyhh.ts index 41ac11f5..993c225b 100644 --- a/src/apps/com.xiaoxiongyhh.ts +++ b/src/apps/com.xiaoxiongyhh.ts @@ -7,10 +7,12 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-弹窗广告', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 1, - name: '天降福利', activityIds: 'com.uzmap.pkg.EntranceActivity', matches: 'View[childCount=2] > ImageView + Button[childCount=0][clickable=true]', diff --git a/src/apps/com.xifeng.fun.ts b/src/apps/com.xifeng.fun.ts index aa430ab6..2c288228 100644 --- a/src/apps/com.xifeng.fun.ts +++ b/src/apps/com.xifeng.fun.ts @@ -34,6 +34,7 @@ export default defineGkdApp({ key: 2, name: '通知提示-公告弹窗', desc: '点击"我知道了"', + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', rules: [ diff --git a/src/apps/com.ximalaya.ting.android.ts b/src/apps/com.ximalaya.ting.android.ts index 325dc3c4..2dedd033 100644 --- a/src/apps/com.ximalaya.ting.android.ts +++ b/src/apps/com.ximalaya.ting.android.ts @@ -23,10 +23,15 @@ export default defineGkdApp({ { key: 0, name: '局部广告-首页右侧浮动广告', - fastQuery: true, - activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', - rules: '[id="com.ximalaya.ting.android:id/main_ad_broadside_close_real"]', - snapshotUrls: ['https://i.gkd.li/i/12472620'], + rules: [ + { + fastQuery: true, + activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', + matches: + '[id="com.ximalaya.ting.android:id/main_ad_broadside_close_real"]', + snapshotUrls: 'https://i.gkd.li/i/12472620', + }, + ], }, { key: 1, @@ -59,22 +64,12 @@ export default defineGkdApp({ }, { key: 2, - name: '局部广告-播放页面-底部推荐列表-夹杂广告', + name: '分段广告-播放页面-底部推荐列表-夹杂广告', desc: '点击关闭-点击屏蔽', fastQuery: true, rules: [ { - activityIds: [ - 'com.ximalaya.ting.android.main.dialog', - 'com.ximalaya.ting.android.host.activity.MainActivity', - ], - matches: '@[clickable=true] > [text="屏蔽"] + [text="关闭当前广告"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12506269', - 'https://i.gkd.li/i/13296565', //com.ximalaya.ting.android.host.activity.MainActivity - ], - }, - { + key: 1, activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', matches: '@[id="com.ximalaya.ting.android:id/main_close_layout"][visibleToUser=true] > [id="com.ximalaya.ting.android:id/main_mark_text"][text="广告"]', @@ -84,20 +79,38 @@ export default defineGkdApp({ 'https://i.gkd.li/i/13314183', // 原规则clickable=false容易误触"橱窗"'[id="com.ximalaya.ting.android:id/main_mark_text"] + [id="com.ximalaya.ting.android:id/main_close"][visibleToUser=true]', ], }, + { + preKeys: [1], + key: 2, + activityIds: [ + 'com.ximalaya.ting.android.main.dialog', + 'com.ximalaya.ting.android.host.activity.MainActivity', + ], + matches: '@[clickable=true] > [text="屏蔽"] + [text="关闭当前广告"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12506269', + 'https://i.gkd.li/i/13296565', + ], + }, ], }, { key: 3, name: '局部广告-播放页面-播放前广告', - fastQuery: true, - activityIds: [ - 'com.ximalaya.ting.android.host.activity.MainActivity', - 'com.ximalaya.ting.android.framework.view.dialog', - ], - rules: '[id="com.ximalaya.ting.android:id/main_play_ad_close_real"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12506250', - 'https://i.gkd.li/i/12520626', + rules: [ + { + fastQuery: true, + activityIds: [ + 'com.ximalaya.ting.android.host.activity.MainActivity', + 'com.ximalaya.ting.android.framework.view.dialog', + ], + matches: + '[id="com.ximalaya.ting.android:id/main_play_ad_close_real"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12506250', + 'https://i.gkd.li/i/12520626', + ], + }, ], }, { @@ -134,9 +147,9 @@ export default defineGkdApp({ { key: 5, name: '局部广告-热播推荐广告', - activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', rules: [ { + activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', matches: '[text="热播推荐"] + ImageView + ImageView', snapshotUrls: 'https://i.gkd.li/i/12506270', // 点击后出现 com.ximalaya.ting.android.main.dialog 弹窗 @@ -144,24 +157,15 @@ export default defineGkdApp({ ], }, { - key: 6, - name: '更新提示', - desc: '点击关闭', + key: 7, + name: '青少年模式', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '[id="com.ximalaya.ting.android:id/host_tv_update_later"]', - snapshotUrls: 'https://i.gkd.li/i/12506287', - }, - { - key: 7, - name: '青少年模式', - actionMaximum: 1, - resetMatch: 'app', - fastQuery: true, rules: [ { + activityIds: '.host.activity.MainActivity', matches: [ '[text*="青少年模式"][id="com.ximalaya.ting.android:id/host_btn_set"]', '[id="com.ximalaya.ting.android:id/host_dialog_close"]', @@ -173,11 +177,15 @@ export default defineGkdApp({ { key: 8, name: '局部广告-评论区广告', - activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', - fastQuery: true, - rules: - '[id="com.ximalaya.ting.android:id/main_ad_close_real"][visibleToUser=true]', - snapshotUrls: 'https://i.gkd.li/i/12869426', + rules: [ + { + fastQuery: true, + activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', + matches: + '[id="com.ximalaya.ting.android:id/main_ad_close_real"][visibleToUser=true]', + snapshotUrls: 'https://i.gkd.li/i/12869426', + }, + ], }, { key: 10, @@ -186,19 +194,27 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', - rules: - '[text="你可能感兴趣的专辑"] + [id="com.ximalaya.ting.android:id/main_iv_close"]', - snapshotUrls: 'https://i.gkd.li/i/13251713', + rules: [ + { + activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', + matches: + '[text="你可能感兴趣的专辑"] + [id="com.ximalaya.ting.android:id/main_iv_close"]', + snapshotUrls: 'https://i.gkd.li/i/13251713', + }, + ], }, { key: 11, name: '全屏广告-弹窗广告', - fastQuery: true, - activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', - rules: - '@[id="com.ximalaya.ting.android:id/host_close_firework"] +2 [id="com.ximalaya.ting.android:id/host_firework_ad_tag"]', - snapshotUrls: 'https://i.gkd.li/i/13263421', + rules: [ + { + fastQuery: true, + activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', + matches: + '@[id="com.ximalaya.ting.android:id/host_close_firework"] +2 [id="com.ximalaya.ting.android:id/host_firework_ad_tag"]', + snapshotUrls: 'https://i.gkd.li/i/13263421', + }, + ], }, { key: 12, diff --git a/src/apps/com.ximalaya.ting.lite.ts b/src/apps/com.ximalaya.ting.lite.ts index 0f25e26a..aea13a88 100644 --- a/src/apps/com.ximalaya.ting.lite.ts +++ b/src/apps/com.ximalaya.ting.lite.ts @@ -4,13 +4,6 @@ export default defineGkdApp({ id: 'com.ximalaya.ting.lite', name: '喜马拉雅极速版', groups: [ - { - key: 0, - name: '局部广告-首页、推荐页-卡片广告', - fastQuery: true, - activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', - rules: '[id="com.ximalaya.ting.lite:id/main_ad_top_home_iv_close"]', - }, { key: 1, name: '全屏广告-弹窗广告', @@ -29,18 +22,32 @@ export default defineGkdApp({ key: 2, name: '全屏广告-小说推荐弹窗', fastQuery: true, - activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', - rules: '[id="com.ximalaya.ting.lite:id/main_iv_novel_back"]', - snapshotUrls: 'https://i.gkd.li/i/13229127', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', + matches: '[id="com.ximalaya.ting.lite:id/main_iv_novel_back"]', + snapshotUrls: 'https://i.gkd.li/i/13229127', + }, + ], }, { key: 3, name: '全屏广告-支付宝提现弹窗广告', - desc: '点击右上角圆形x', + desc: '点击关闭', fastQuery: true, - activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', - rules: '[id="com.ximalaya.ting.lite:id/main_login_guide_close"]', - snapshotUrls: 'https://i.gkd.li/i/13256447', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.ximalaya.ting.android.host.activity.MainActivity', + matches: '[id="com.ximalaya.ting.lite:id/main_login_guide_close"]', + snapshotUrls: 'https://i.gkd.li/i/13256447', + }, + ], }, { key: 4, @@ -49,9 +56,15 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: - '[text="立即开启"] + [id="com.ximalaya.ting.lite:id/host_dialog_cancel_iv"]', - snapshotUrls: 'https://i.gkd.li/i/13256505', + rules: [ + { + activityIds: + 'com.ximalaya.ting.android.host.activity.WelComeActivity', + matches: + '[text="立即开启"] + [id="com.ximalaya.ting.lite:id/host_dialog_cancel_iv"]', + snapshotUrls: 'https://i.gkd.li/i/13256505', + }, + ], }, ], }); diff --git a/src/apps/com.xingin.xhs.ts b/src/apps/com.xingin.xhs.ts index 14fcab46..39734ea5 100644 --- a/src/apps/com.xingin.xhs.ts +++ b/src/apps/com.xingin.xhs.ts @@ -80,6 +80,10 @@ export default defineGkdApp({ rules: [ { key: 0, + activityIds: [ + '.index.v2.IndexActivityV2', + 'com.xingin.update.UpdateDialogActivity', + ], matches: '@ImageView <2 * + * > [text="NEW"]', snapshotUrls: [ 'https://i.gkd.li/i/13246890', @@ -89,6 +93,7 @@ export default defineGkdApp({ }, { key: 1, + activityIds: '.index.v2.IndexActivityV2', matches: 'Button[text="立即安装"] + Button[text="稍后再说"]', snapshotUrls: 'https://i.gkd.li/i/15283162', }, @@ -105,9 +110,9 @@ export default defineGkdApp({ key: 0, action: 'longClick', name: '长按"赞助"/"广告"卡片', + excludeMatches: 'RecyclerView > LinearLayout > [text^="不喜欢"]', matches: '@FrameLayout[clickable=true] > LinearLayout TextView[text="赞助"||text="广告"][visibleToUser=true]', - excludeMatches: 'RecyclerView > LinearLayout > [text^="不喜欢"]', snapshotUrls: [ 'https://i.gkd.li/i/13455503', 'https://i.gkd.li/i/13470690', @@ -115,7 +120,7 @@ export default defineGkdApp({ ], }, { - preKeys: 0, + preKeys: [0], name: '点"不感兴趣"', matches: 'RecyclerView > @LinearLayout[index=0] > TextView[text^="不喜欢"]', @@ -132,8 +137,8 @@ export default defineGkdApp({ rules: [ { key: 0, - activityIds: 'com.xingin.reactnative.ui.XhsReactTranslucentActivity', fastQuery: true, + activityIds: 'com.xingin.reactnative.ui.XhsReactTranslucentActivity', matches: '@ImageView[visibleToUser=true] < * -2 * > [text="你有新人券待领取"]', snapshotUrls: 'https://i.gkd.li/i/14391484', @@ -150,6 +155,7 @@ export default defineGkdApp({ rules: [ { action: 'back', + activityIds: 'com.xingin.lurker.appscore.ui.AppScoreDialogActivity', matches: '[text="您对小红书的评分如何?"]', exampleUrls: 'https://m.gkd.li/57941037/9727815d-b881-4904-bbdc-19ade426977e', diff --git a/src/apps/com.xingluo.allcolor.ts b/src/apps/com.xingluo.allcolor.ts index 5b8ed48f..0ad17467 100644 --- a/src/apps/com.xingluo.allcolor.ts +++ b/src/apps/com.xingluo.allcolor.ts @@ -15,29 +15,27 @@ export default defineGkdApp({ rules: [ { key: 1, - matches: ['[text="广告"] < * - View < * - View > Image[id=null]'], - snapshotUrls: ['https://i.gkd.li/i/12640359'], + matches: + '@Image[childCount=0][visibleToUser=true] < View[childCount=1] + View[childCount=2] >2 [text="广告"]', + snapshotUrls: 'https://i.gkd.li/i/12640359', }, { key: 2, - matches: [ - '@Image[id=null] < View -(2) View > View > View > TextView[text="广告"]', - ], - snapshotUrls: ['https://i.gkd.li/i/12640362'], + matches: + '@Image[id=null] < View -2 View > View > View > TextView[text="广告"]', + snapshotUrls: 'https://i.gkd.li/i/12640362', }, { key: 3, - matches: [ - '@View[id=null] < FrameLayout[desc^="dislike"] + FrameLayout >(2) TextView[text="广告"]', - ], - snapshotUrls: ['https://i.gkd.li/i/12640374'], + matches: + '@View[clickable=true][childCount=0][visibleToUser=true] < FrameLayout[desc^="dislike"] + FrameLayout >2 [text="广告"]', + snapshotUrls: 'https://i.gkd.li/i/12640374', }, { key: 4, - matches: [ + matches: '@Image[id=null] < View - View > View + View > TextView[text="广告"]', - ], - snapshotUrls: ['https://i.gkd.li/i/12640406'], + snapshotUrls: 'https://i.gkd.li/i/12640406', }, { preKeys: [1, 2, 3, 4], diff --git a/src/apps/com.xingye.app.ts b/src/apps/com.xingye.app.ts index 3a632719..fef09b05 100644 --- a/src/apps/com.xingye.app.ts +++ b/src/apps/com.xingye.app.ts @@ -7,12 +7,17 @@ export default defineGkdApp({ { key: 2, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '[vid="settingUpdateCancelTv"]', - snapshotUrls: 'https://i.gkd.li/i/14137987', + rules: [ + { + activityIds: 'com.weaver.app.MainSplashActivity', + matches: '[vid="settingUpdateCancelTv"]', + snapshotUrls: 'https://i.gkd.li/i/14137987', + }, + ], }, ], }); diff --git a/src/apps/com.xinhang.mobileclient.ts b/src/apps/com.xinhang.mobileclient.ts index 918058fc..37963761 100644 --- a/src/apps/com.xinhang.mobileclient.ts +++ b/src/apps/com.xinhang.mobileclient.ts @@ -24,12 +24,16 @@ export default defineGkdApp({ { key: 2, name: '局部广告-右侧悬浮广告', - activityIds: 'com.xinhang.mobileclient.home.activity.HomeActivity', - rules: - '@[id="com.xinhang.mobileclient:id/iv_close"] + [id="com.xinhang.mobileclient:id/iv_advert"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13024863', - 'https://i.gkd.li/i/13024872', + rules: [ + { + activityIds: 'com.xinhang.mobileclient.home.activity.HomeActivity', + matches: + '@[id="com.xinhang.mobileclient:id/iv_close"] + [id="com.xinhang.mobileclient:id/iv_advert"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13024863', + 'https://i.gkd.li/i/13024872', + ], + }, ], }, ], diff --git a/src/apps/com.xmcy.hykb.ts b/src/apps/com.xmcy.hykb.ts index fc2cc9e0..7647a407 100644 --- a/src/apps/com.xmcy.hykb.ts +++ b/src/apps/com.xmcy.hykb.ts @@ -7,24 +7,36 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: - '@[id="com.xmcy.hykb:id/iv_inner_button_close"] - RelativeLayout >n [id="com.xmcy.hykb:id/text_update_tip"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12870604', - 'https://i.gkd.li/i/13297450', + rules: [ + { + activityIds: '.app.dialog.UpdateDialog', + matches: + '@[id="com.xmcy.hykb:id/iv_inner_button_close"] - RelativeLayout >n [id="com.xmcy.hykb:id/text_update_tip"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12870604', + 'https://i.gkd.li/i/13297450', + ], + }, ], }, { key: 2, name: '全屏广告-弹窗广告', fastQuery: true, - activityIds: 'com.xmcy.hykb.app.ui.main.MainActivity', - rules: '[id="com.xmcy.hykb:id/dialog_home_notice_image_close"]', - snapshotUrls: 'https://i.gkd.li/i/13259427', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.xmcy.hykb.app.ui.main.MainActivity', + matches: '[id="com.xmcy.hykb:id/dialog_home_notice_image_close"]', + snapshotUrls: 'https://i.gkd.li/i/13259427', + }, + ], }, ], }); diff --git a/src/apps/com.xsj.app.ts b/src/apps/com.xsj.app.ts index 0cca1807..f323ae92 100644 --- a/src/apps/com.xsj.app.ts +++ b/src/apps/com.xsj.app.ts @@ -35,8 +35,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[desc="我知道了"]', - snapshotUrls: 'https://i.gkd.li/i/13875711', + rules: [ + { + activityIds: '.MainActivity', + matches: '[desc="我知道了"]', + snapshotUrls: 'https://i.gkd.li/i/13875711', + }, + ], }, ], }); diff --git a/src/apps/com.xt.retouch.ts b/src/apps/com.xt.retouch.ts index 2b6335af..39a3c485 100644 --- a/src/apps/com.xt.retouch.ts +++ b/src/apps/com.xt.retouch.ts @@ -11,8 +11,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.xt.retouch:id/market_feedback_dialog_close"]', - snapshotUrls: 'https://i.gkd.li/i/13062637', + rules: [ + { + activityIds: '.uilauncher.MainActivity', + matches: '[id="com.xt.retouch:id/market_feedback_dialog_close"]', + snapshotUrls: 'https://i.gkd.li/i/13062637', + }, + ], }, ], }); diff --git a/src/apps/com.xtc.watch.ts b/src/apps/com.xtc.watch.ts index d563af01..34dad72b 100644 --- a/src/apps/com.xtc.watch.ts +++ b/src/apps/com.xtc.watch.ts @@ -14,6 +14,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: 'com.xtc.widget.phone.popup.activity.CustomActivity14', matches: [ '[text="App功能更新了"]', '[id="com.xtc.watch:id/iv_close"]', @@ -41,6 +42,7 @@ export default defineGkdApp({ }, { key: 1, + activityIds: '.view.home.activity.XtcHomeActivity', matches: '[id="com.xtc.watch:id/iv_notify_permission_close"]', snapshotUrls: 'https://i.gkd.li/i/13059965', }, diff --git a/src/apps/com.xtuone.android.syllabus.ts b/src/apps/com.xtuone.android.syllabus.ts index 9569304b..e5a65fd3 100644 --- a/src/apps/com.xtuone.android.syllabus.ts +++ b/src/apps/com.xtuone.android.syllabus.ts @@ -7,32 +7,54 @@ export default defineGkdApp({ { key: 1, name: '局部广告-首页卡片广告', - activityIds: ['com.xtuone.android.friday.MainFragmentActivity'], - rules: '[id="com.xtuone.android.syllabus:id/treehole_banner_close"]', - snapshotUrls: 'https://i.gkd.li/i/12840733', + rules: [ + { + activityIds: 'com.xtuone.android.friday.MainFragmentActivity', + matches: + '[id="com.xtuone.android.syllabus:id/treehole_banner_close"]', + snapshotUrls: 'https://i.gkd.li/i/12840733', + }, + ], }, { key: 2, name: '局部广告-课程表界面广告', - activityIds: ['com.xtuone.android.friday.MainFragmentActivity'], - rules: '[id="com.xtuone.android.syllabus:id/imgv_close"]', - snapshotUrls: 'https://i.gkd.li/i/12999642', + rules: [ + { + activityIds: 'com.xtuone.android.friday.MainFragmentActivity', + matches: '[id="com.xtuone.android.syllabus:id/imgv_close"]', + snapshotUrls: 'https://i.gkd.li/i/12999642', + }, + ], }, { key: 3, name: '全屏广告-弹窗广告', - activityIds: 'com.xtuone.android.friday.MainFragmentActivity', - rules: '[id="com.xtuone.android.syllabus:id/dialog_ad_close"]', - snapshotUrls: 'https://i.gkd.li/i/13166501', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.xtuone.android.friday.MainFragmentActivity', + matches: '[id="com.xtuone.android.syllabus:id/dialog_ad_close"]', + snapshotUrls: 'https://i.gkd.li/i/13166501', + }, + ], }, { key: 4, name: '更新提示', + fastQuery: true, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: '@[vid="update_cancel"] + [vid="go_to_update"]', - snapshotUrls: 'https://i.gkd.li/i/14292875', + rules: [ + { + activityIds: 'com.xtuone.android.friday.UpdateActivity', + matches: '@[vid="update_cancel"] + [vid="go_to_update"]', + snapshotUrls: 'https://i.gkd.li/i/14292875', + }, + ], }, ], }); diff --git a/src/apps/com.xuexiaoyi.xxy.ts b/src/apps/com.xuexiaoyi.xxy.ts index 4392a912..f0a7dd67 100644 --- a/src/apps/com.xuexiaoyi.xxy.ts +++ b/src/apps/com.xuexiaoyi.xxy.ts @@ -6,7 +6,7 @@ export default defineGkdApp({ groups: [ { key: 1, - name: '局部广告-首页-底部广告', + name: '分段广告-首页-底部广告', activityIds: [ 'com.xuexiaoyi.entrance.main.MainActivity', 'com.xuexiaoyi.platform.base.arch.RouterFragmentActivity', @@ -15,9 +15,8 @@ export default defineGkdApp({ { key: 0, name: '点击在下方的X', - matches: [ + matches: 'View[text="广告"&&longClickable=null] < View View > Image[text.length=0]', // longClickable=null为了与 key:3 区别防止误触 - ], snapshotUrls: [ 'https://i.gkd.li/i/13068836', 'https://i.gkd.li/i/13375502', @@ -27,9 +26,8 @@ export default defineGkdApp({ { key: 1, name: '点击在上方的X-类型1', - matches: [ + matches: 'Image[text.length>=20] < View < View + View > Image[text.length=0]', - ], snapshotUrls: [ 'https://i.gkd.li/i/13068811', 'https://i.gkd.li/i/13202990', @@ -42,10 +40,9 @@ export default defineGkdApp({ { key: 2, name: '点击在上方的X-类型2', - matches: [ + matches: '[text.length>=2&&text.length<=6] < FrameLayout -n FrameLayout > View', - ], - snapshotUrls: ['https://i.gkd.li/i/13266689'], + snapshotUrls: 'https://i.gkd.li/i/13266689', }, { key: 3, @@ -71,13 +68,18 @@ export default defineGkdApp({ { key: 10, name: '更新提示', - desc: '自动点击以后再说。', + desc: '点击以后再说', fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[text="立即体验"] + [text="以后再说"]', - snapshotUrls: 'https://i.gkd.li/i/13203105', + rules: [ + { + activityIds: 'com.xuexiaoyi.entrance.main.MainActivity', + matches: '[text="立即体验"] + [text="以后再说"]', + snapshotUrls: 'https://i.gkd.li/i/13203105', + }, + ], }, ], }); diff --git a/src/apps/com.xunlei.downloadprovider.ts b/src/apps/com.xunlei.downloadprovider.ts index 154a3673..afe878b8 100644 --- a/src/apps/com.xunlei.downloadprovider.ts +++ b/src/apps/com.xunlei.downloadprovider.ts @@ -53,24 +53,6 @@ export default defineGkdApp({ '[id="com.xunlei.downloadprovider:id/hermes_ad_banner_negative"]', snapshotUrls: 'https://i.gkd.li/i/12707701', }, - { - preKeys: [0], - key: 1, - name: '点击不感兴趣', - activityIds: [ - 'com.xunlei.downloadprovider.frame.MainTabActivity', - 'com.xunlei.downloadprovider.download.taskdetails.newui.DownloadDetailsActivity', - 'com.xunlei.downloadprovider.feedback.view', - ], - fastQuery: true, - 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: '点击关闭-2', @@ -89,6 +71,24 @@ export default defineGkdApp({ '[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', + ], + }, ], }, { @@ -262,8 +262,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.xunlei.downloadprovider:id/x_upgrade_cancel"]', - snapshotUrls: 'https://i.gkd.li/i/13228920', + rules: [ + { + activityIds: 'com.xunlei.upgrade.XUpgradeActivity', + matches: '[id="com.xunlei.downloadprovider:id/x_upgrade_cancel"]', + snapshotUrls: 'https://i.gkd.li/i/13228920', + }, + ], }, { key: 10, @@ -356,6 +361,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: 'com.xunlei.uikit.activity.TransformActivity', matches: ['[text="是否打开系统通知"]', '[vid="btn_close"]'], exampleUrls: 'https://m.gkd.li/57941037/bf1ee4f5-126c-46c7-bac1-5e41ec4546e3', diff --git a/src/apps/com.xunmeng.pinduoduo.ts b/src/apps/com.xunmeng.pinduoduo.ts index b67a67d1..d47d4efa 100644 --- a/src/apps/com.xunmeng.pinduoduo.ts +++ b/src/apps/com.xunmeng.pinduoduo.ts @@ -13,6 +13,7 @@ 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', }, @@ -248,6 +249,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.ui.activity.HomeActivity', matches: '[text="青少年模式"] < FrameLayout +5 ViewGroup [text="我知道了"]', snapshotUrls: 'https://i.gkd.li/i/13809053', @@ -262,6 +264,7 @@ export default defineGkdApp({ rules: [ { key: 0, + activityIds: '.ui.activity.HomeActivity', matches: 'FrameLayout > ViewGroup[vid="pdd"] > ViewGroup > ViewGroup[childCount<3] > ViewGroup[childCount=3 || childCount=2] >(1,2) ImageView[clickable=true][visibleToUser=true]', snapshotUrls: [ @@ -274,6 +277,10 @@ export default defineGkdApp({ key: 1, fastQuery: true, action: 'back', + activityIds: [ + '.ui.activity.HomeActivity', + '.activity.NewPageActivity', + ], matches: '[text="及时获取物流消息" || text="开启通知"]', snapshotUrls: [ 'https://i.gkd.li/i/15004580', diff --git a/src/apps/com.xyhui.ts b/src/apps/com.xyhui.ts index 1329945f..6d8253d3 100644 --- a/src/apps/com.xyhui.ts +++ b/src/apps/com.xyhui.ts @@ -121,27 +121,36 @@ export default defineGkdApp({ key: 2, name: '局部广告-首页-右侧浮窗广告', fastQuery: true, - activityIds: [ - 'com.xyhui.start.PUMainActivity', - 'com.xyhui.start.LoadingActivity', - ], - rules: 'ImageView[id="com.xyhui:id/deleteIv"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12846543', - 'https://i.gkd.li/i/12868119', + rules: [ + { + activityIds: [ + 'com.xyhui.start.PUMainActivity', + 'com.xyhui.start.LoadingActivity', + ], + matches: 'ImageView[id="com.xyhui:id/deleteIv"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12846543', + 'https://i.gkd.li/i/12868119', + ], + }, ], }, { key: 3, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: 'ImageView[id="com.xyhui:id/closeIv"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12908853', - 'https://i.gkd.li/i/12908865', + rules: [ + { + activityIds: ['.start.PUMainActivity', '.start.LoadingActivity'], + matches: 'ImageView[id="com.xyhui:id/closeIv"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12908853', + 'https://i.gkd.li/i/12908865', + ], + }, ], }, ], diff --git a/src/apps/com.yaerxing.fkst.ts b/src/apps/com.yaerxing.fkst.ts deleted file mode 100644 index 31b8a4d7..00000000 --- a/src/apps/com.yaerxing.fkst.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { defineGkdApp } from '@gkd-kit/define'; - -export default defineGkdApp({ - id: 'com.yaerxing.fkst', - name: '疯狂刷题', - groups: [ - { - key: 1, - name: '更新提示', - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - rules: - '@[id="com.yaerxing.fkst:id/iv_close"] < LinearLayout - LinearLayout > [id="com.yaerxing.fkst:id/btn_update"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12715037', - 'https://i.gkd.li/i/12715047', - 'https://i.gkd.li/i/12715053', - ], - }, - ], -}); diff --git a/src/apps/com.yek.android.uniqlo.ts b/src/apps/com.yek.android.uniqlo.ts index 12cb4a3d..650d41e6 100644 --- a/src/apps/com.yek.android.uniqlo.ts +++ b/src/apps/com.yek.android.uniqlo.ts @@ -8,9 +8,16 @@ export default defineGkdApp({ key: 1, name: '全屏广告-弹窗广告', fastQuery: true, - activityIds: 'com.yek.android.uniqlo.uiux.Home.activity.HomeActivity', - rules: 'ImageView[id="com.yek.android.uniqlo:id/pop_close"]', - snapshotUrls: 'https://i.gkd.li/i/13212320', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.yek.android.uniqlo.uiux.Home.activity.HomeActivity', + matches: 'ImageView[id="com.yek.android.uniqlo:id/pop_close"]', + snapshotUrls: 'https://i.gkd.li/i/13212320', + }, + ], }, { key: 2, @@ -22,6 +29,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.activity.WelcomeActivity', matches: '@TextView[text="取消"] + TextView[text="确定"]', snapshotUrls: 'https://i.gkd.li/i/13446421', }, diff --git a/src/apps/com.ygkj.chelaile.standard.ts b/src/apps/com.ygkj.chelaile.standard.ts index f9533c54..4d960001 100644 --- a/src/apps/com.ygkj.chelaile.standard.ts +++ b/src/apps/com.ygkj.chelaile.standard.ts @@ -73,6 +73,7 @@ export default defineGkdApp({ fastQuery: true, rules: [ { + activityIds: 'dev.xesam.chelaile.app.module.PanelHostActivity', matches: '[id="com.ygkj.chelaile.standard:id/cll_interstitial_close"][clickable=true]', exampleUrls: diff --git a/src/apps/com.yikaobang.yixue.ts b/src/apps/com.yikaobang.yixue.ts index 4faea6de..fee0a59c 100644 --- a/src/apps/com.yikaobang.yixue.ts +++ b/src/apps/com.yikaobang.yixue.ts @@ -11,9 +11,9 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - activityIds: 'com.psychiatrygarden.activity.HomePageNewActivity', rules: [ { + activityIds: 'com.psychiatrygarden.activity.HomePageNewActivity', matches: '@ImageView[id="com.yikaobang.yixue:id/close"]', snapshotUrls: 'https://i.gkd.li/i/13425853', }, diff --git a/src/apps/com.yitong.mbank.psbc.ts b/src/apps/com.yitong.mbank.psbc.ts index 1b688a48..2d171b87 100644 --- a/src/apps/com.yitong.mbank.psbc.ts +++ b/src/apps/com.yitong.mbank.psbc.ts @@ -7,12 +7,16 @@ export default defineGkdApp({ { key: 1, name: '更新提示', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, rules: [ { + activityIds: [ + '.module.home.view.activity.MainActivity', + '.module.app.view.customview.dialog.DialogUpdateApk', + ], matches: 'Button[id="com.yitong.mbank.psbc:id/bt_cancel"]', snapshotUrls: [ 'https://i.gkd.li/i/12685350', @@ -24,19 +28,35 @@ export default defineGkdApp({ { key: 2, name: '全屏广告-首页弹窗广告', - activityIds: - 'com.yitong.mbank.psbc.module.home.view.activity.MainActivity', - rules: - '[id="com.yitong.mbank.psbc:id/iv_theme"] + [id="com.yitong.mbank.psbc:id/iv_theme_close_btn"]', - snapshotUrls: 'https://i.gkd.li/i/12755516', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: + 'com.yitong.mbank.psbc.module.home.view.activity.MainActivity', + matches: + '[id="com.yitong.mbank.psbc:id/iv_theme"] + [id="com.yitong.mbank.psbc:id/iv_theme_close_btn"]', + snapshotUrls: 'https://i.gkd.li/i/12755516', + }, + ], }, { key: 3, name: '局部广告-首页-浮窗广告', - activityIds: - 'com.yitong.mbank.psbc.module.home.view.activity.MainActivity', - rules: '[id="com.yitong.mbank.psbc:id/img_close_float_window"]', - snapshotUrls: 'https://i.gkd.li/i/13797314', + rules: [ + { + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + activityIds: + 'com.yitong.mbank.psbc.module.home.view.activity.MainActivity', + matches: '[id="com.yitong.mbank.psbc:id/img_close_float_window"]', + snapshotUrls: 'https://i.gkd.li/i/13797314', + }, + ], }, ], }); diff --git a/src/apps/com.yoloho.dayima.ts b/src/apps/com.yoloho.dayima.ts index 7b54235d..0fee7129 100644 --- a/src/apps/com.yoloho.dayima.ts +++ b/src/apps/com.yoloho.dayima.ts @@ -26,11 +26,14 @@ export default defineGkdApp({ key: 1, name: '全屏广告-弹窗广告', matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 0, name: '腾讯SDK', fastQuery: true, + activityIds: '.activity.MainPageActivity', matches: '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', snapshotUrls: 'https://i.gkd.li/i/13800255', diff --git a/src/apps/com.youdao.dict.ts b/src/apps/com.youdao.dict.ts index 36ac7931..69577ad9 100644 --- a/src/apps/com.youdao.dict.ts +++ b/src/apps/com.youdao.dict.ts @@ -122,10 +122,18 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.youdao.dict:id/btn_never"][text*="不再提醒"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13540941', - 'https://i.gkd.li/i/14256301', + rules: [ + { + activityIds: [ + '.activity.MainActivity', + '.activity.DictQueryActivity', + ], + matches: '[id="com.youdao.dict:id/btn_never"][text*="不再提醒"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13540941', + 'https://i.gkd.li/i/14256301', + ], + }, ], }, { @@ -135,19 +143,28 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: - '[id="com.youdao.dict:id/tv_version"] + [id="com.youdao.dict:id/iv_close"]', - snapshotUrls: 'https://i.gkd.li/i/13627912', + rules: [ + { + activityIds: '.activity.MainActivity', + matches: + '[id="com.youdao.dict:id/tv_version"] + [id="com.youdao.dict:id/iv_close"]', + snapshotUrls: 'https://i.gkd.li/i/13627912', + }, + ], }, { key: 7, name: '功能类-点击显示释义', activityIds: 'com.youdao.dict_flutter_android_bridge.WordBookFlutterActivity', - rules: '[desc="点击显示释义"] > View[index=3][visibleToUser=true]', - snapshotUrls: [ - 'https://i.gkd.li/i/14292588', // 点击显示释义前 - 'https://i.gkd.li/i/14292587', // 点击显示释义后 + rules: [ + { + matches: '[desc="点击显示释义"] > View[index=3][visibleToUser=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/14292588', // 点击显示释义前 + 'https://i.gkd.li/i/14292587', // 点击显示释义后 + ], + }, ], }, { diff --git a/src/apps/com.youdao.note.ts b/src/apps/com.youdao.note.ts index b8962a06..c6fe56de 100644 --- a/src/apps/com.youdao.note.ts +++ b/src/apps/com.youdao.note.ts @@ -11,8 +11,8 @@ export default defineGkdApp({ { key: 1, name: '首页上方卡片广告', - activityIds: 'com.youdao.note.activity2.MainActivity', fastQuery: true, + activityIds: 'com.youdao.note.activity2.MainActivity', matches: '[id="com.youdao.note:id/recycle_view"] + [id="com.youdao.note:id/close_ad"]', snapshotUrls: 'https://i.gkd.li/i/13379524', diff --git a/src/apps/com.youdao.translator.ts b/src/apps/com.youdao.translator.ts index 0ca645f8..f3a51501 100644 --- a/src/apps/com.youdao.translator.ts +++ b/src/apps/com.youdao.translator.ts @@ -7,11 +7,12 @@ export default defineGkdApp({ { key: 1, name: '局部广告-翻译界面-结果下方广告', - desc: '点击卡片广告右上角x', - fastQuery: true, - activityIds: ['com.youdao.translator.activity.trans.TransResultActivity'], + desc: '点击关闭', rules: [ { + fastQuery: true, + activityIds: + 'com.youdao.translator.activity.trans.TransResultActivity', matches: '@ImageView[id="com.youdao.translator:id/close_iv"] + [id="com.youdao.translator:id/native_ad_flag_tv"]', snapshotUrls: 'https://i.gkd.li/i/13259910', diff --git a/src/apps/com.youku.phone.ts b/src/apps/com.youku.phone.ts index f8ec7e32..976a8400 100644 --- a/src/apps/com.youku.phone.ts +++ b/src/apps/com.youku.phone.ts @@ -8,9 +8,16 @@ export default defineGkdApp({ key: 3, name: '全屏广告-视频推荐弹窗', fastQuery: true, - activityIds: 'com.youku.vip.wrapper.VipHomeActivity', - rules: '[id="com.youku.phone:id/closeView"][desc="关闭弹层"]', - snapshotUrls: 'https://i.gkd.li/i/12701029', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.youku.vip.wrapper.VipHomeActivity', + matches: '[id="com.youku.phone:id/closeView"][desc="关闭弹层"]', + snapshotUrls: 'https://i.gkd.li/i/12701029', + }, + ], }, { key: 4, diff --git a/src/apps/com.youloft.calendar.ts b/src/apps/com.youloft.calendar.ts index 8b40d0e5..1a8d89b9 100644 --- a/src/apps/com.youloft.calendar.ts +++ b/src/apps/com.youloft.calendar.ts @@ -11,8 +11,8 @@ export default defineGkdApp({ { key: 0, name: '万年历页面-右侧悬浮广告', - activityIds: 'com.youloft.calendar.MainActivity', fastQuery: true, + activityIds: 'com.youloft.calendar.MainActivity', matches: '[id="com.youloft.calendar:id/ad_iv_close"]', snapshotUrls: 'https://i.gkd.li/i/13348416', }, diff --git a/src/apps/com.youloft.icloser.ts b/src/apps/com.youloft.icloser.ts index ef684c95..dd621ae1 100644 --- a/src/apps/com.youloft.icloser.ts +++ b/src/apps/com.youloft.icloser.ts @@ -7,18 +7,26 @@ export default defineGkdApp({ { key: 1, name: '全屏广告-购买会员弹窗广告', - fastQuery: true, - activityIds: 'com.youloft.icloser.view.dialog.VipRetainPacketDialog', - rules: '[id="com.youloft.icloser:id/tv_later_buy"]', - snapshotUrls: 'https://i.gkd.li/i/13067183', + rules: [ + { + fastQuery: true, + activityIds: 'com.youloft.icloser.view.dialog.VipRetainPacketDialog', + matches: '[id="com.youloft.icloser:id/tv_later_buy"]', + snapshotUrls: 'https://i.gkd.li/i/13067183', + }, + ], }, { key: 2, name: '局部广告-右下角悬浮窗小广告', - fastQuery: true, - activityIds: 'com.youloft.icloser.activity.MainActivity', - rules: '[id="com.youloft.icloser:id/iv_close"]', - snapshotUrls: 'https://i.gkd.li/i/13164387', + rules: [ + { + fastQuery: true, + activityIds: 'com.youloft.icloser.activity.MainActivity', + matches: '[id="com.youloft.icloser:id/iv_close"]', + snapshotUrls: 'https://i.gkd.li/i/13164387', + }, + ], }, ], }); diff --git a/src/apps/com.yujian.ResideMenuDemo.ts b/src/apps/com.yujian.ResideMenuDemo.ts index 70cf0675..8c8b78a3 100644 --- a/src/apps/com.yujian.ResideMenuDemo.ts +++ b/src/apps/com.yujian.ResideMenuDemo.ts @@ -11,8 +11,14 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: 'TextView[id="com.yujian.ResideMenuDemo:id/btn_selectOther"]', - snapshotUrls: 'https://i.gkd.li/i/13224234', + rules: [ + { + activityIds: 'cn.yujian.MainActivity', + matches: + 'TextView[id="com.yujian.ResideMenuDemo:id/btn_selectOther"]', + snapshotUrls: 'https://i.gkd.li/i/13224234', + }, + ], }, ], }); diff --git a/src/apps/com.yunxiang.wuyu.ts b/src/apps/com.yunxiang.wuyu.ts index bf170dac..9882c5ce 100644 --- a/src/apps/com.yunxiang.wuyu.ts +++ b/src/apps/com.yunxiang.wuyu.ts @@ -10,8 +10,13 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[desc^="人生嘛"] +4 ImageView[clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/13455634', + rules: [ + { + activityIds: '.MainActivity', + matches: '[desc="我知道了"]', + snapshotUrls: 'https://i.gkd.li/i/13455634', + }, + ], }, { key: 3, @@ -23,12 +28,14 @@ export default defineGkdApp({ activityIds: 'com.yunxiang.wuyu.MainActivity', rules: [ { + key: 1, name: '"x"型', matches: 'ImageView < @ViewGroup[clickable=true] < ViewGroup +n ViewGroup [text="广告"]', snapshotUrls: 'https://i.gkd.li/i/13455628', }, { + key: 2, name: '"跳过"型', matches: [ 'TextView[text="广告"]', diff --git a/src/apps/com.yunzhi.tiyu.ts b/src/apps/com.yunzhi.tiyu.ts index 68745b13..830e07f8 100644 --- a/src/apps/com.yunzhi.tiyu.ts +++ b/src/apps/com.yunzhi.tiyu.ts @@ -21,44 +21,30 @@ export default defineGkdApp({ }, ], }, - { - key: 1, - name: '局部广告-卡片广告', - desc: '点击关闭', - rules: [ - { - key: 0, - activityIds: 'com.yunzhi.tiyu.module.MainActivity', - matches: - 'WebView[text=""] >3 View > View > Image[text=""][visibleToUser=true]', - exampleUrls: - 'https://m.gkd.li/57941037/fa043e1b-4dc6-4824-8b25-5f6c1cfdf0da', - snapshotUrls: [ - 'https://i.gkd.li/i/14428780', - 'https://i.gkd.li/i/14428777', - ], - }, - ], - }, { key: 2, name: '分段广告-首页卡片广告', desc: '点击关闭-点击[不感兴趣]', + fastQuery: true, rules: [ { key: 0, name: '点击关闭', activityIds: 'com.yunzhi.tiyu.module.MainActivity', - matches: '@View[visibleToUser=true] +2 View >3 [text="广告"]', + matches: + '@Image[childCount=0][visibleToUser=true][width<80&&height<80] < View[childCount=1] +n View[childCount=2] >(2,3) [text="广告"] < [text="不感兴趣"]', exampleUrls: diff --git a/src/apps/com.yuque.mobile.android.app.ts b/src/apps/com.yuque.mobile.android.app.ts index bcd87aec..99fbd527 100644 --- a/src/apps/com.yuque.mobile.android.app.ts +++ b/src/apps/com.yuque.mobile.android.app.ts @@ -8,10 +8,10 @@ export default defineGkdApp({ key: 0, name: '局部广告-"用语雀公众号"横幅提示', desc: '点x取消提示', - activityIds: - 'com.yuque.mobile.android.app.rn.activity.ReactNativeMainActivity', rules: [ { + activityIds: + 'com.yuque.mobile.android.app.rn.activity.ReactNativeMainActivity', matches: 'TextView[text="了解更多"] + ViewGroup[clickable=true]', snapshotUrls: 'https://i.gkd.li/i/12911014', }, @@ -21,10 +21,10 @@ export default defineGkdApp({ key: 1, name: '功能类-自动原图', desc: '如果没有勾选原图, 则勾选', - activityIds: - 'com.yuque.mobile.android.app.rn.activity.ReactNativeMainActivity', rules: [ { + activityIds: + 'com.yuque.mobile.android.app.rn.activity.ReactNativeMainActivity', matches: 'ViewGroup[desc="原图未勾选"][clickable=true][childCount=2]', snapshotUrls: 'https://i.gkd.li/i/12911013', }, diff --git a/src/apps/com.zdbq.ljtq.ljweather.ts b/src/apps/com.zdbq.ljtq.ljweather.ts deleted file mode 100644 index abff045c..00000000 --- a/src/apps/com.zdbq.ljtq.ljweather.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { defineGkdApp } from '@gkd-kit/define'; - -export default defineGkdApp({ - id: 'com.zdbq.ljtq.ljweather', - name: '莉景天气', - groups: [ - { - key: 1, - name: '全屏广告-弹窗广告', - desc: '点击关闭', - rules: [ - { - key: 0, - fastQuery: true, - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - activityIds: 'com.zdbq.ljtq.ljweather.IndexActivity', - matches: '[vid="dialog_daily_activity_card_cancel"]', - }, - ], - }, - ], -}); diff --git a/src/apps/com.zhaopin.social.ts b/src/apps/com.zhaopin.social.ts deleted file mode 100644 index 7b363df6..00000000 --- a/src/apps/com.zhaopin.social.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { defineGkdApp } from '@gkd-kit/define'; - -export default defineGkdApp({ - id: 'com.zhaopin.social', - name: '智联招聘', - groups: [ - { - key: 1, - name: '更新提示', - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - rules: - '[id="com.zhaopin.social:id/update"] + [id="com.zhaopin.social:id/ignore"]', - snapshotUrls: ['https://i.gkd.li/i/12706186'], - }, - { - key: 2, - name: '局部广告-我的页面卡片广告', - activityIds: 'com.zhaopin.social.homepage.ZSC_MainTabActivity', - rules: '[id="com.zhaopin.social:id/rl_banner_close"][clickable=true]', - snapshotUrls: ['https://i.gkd.li/i/12706181'], - }, - { - key: 3, - name: '全屏广告-社区页面弹窗广告', - activityIds: ['com.zhaopin.social.homepage.ZSC_MainTabActivity'], - rules: - 'ImageView[clickable=true&&focusable=true] < FrameLayout + FrameLayout > ImageView[clickable=false&&focusable=false]', - snapshotUrls: 'https://i.gkd.li/i/13063442', - }, - { - key: 4, - name: '权限提示-通知权限', - desc: '自动点击关闭', - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - fastQuery: true, - rules: '[id="com.zhaopin.social:id/message_pushlayout_close"]', - snapshotUrls: 'https://i.gkd.li/i/13063427', - }, - ], -}); diff --git a/src/apps/com.zhengnengliang.precepts.ts b/src/apps/com.zhengnengliang.precepts.ts index fffb2e75..caf5137f 100644 --- a/src/apps/com.zhengnengliang.precepts.ts +++ b/src/apps/com.zhengnengliang.precepts.ts @@ -4,18 +4,6 @@ export default defineGkdApp({ id: 'com.zhengnengliang.precepts', name: '正气', groups: [ - { - key: 1, - name: '更新提示', - matchTime: 10000, - actionMaximum: 1, - resetMatch: 'app', - rules: '@[text="取消"] +2 [text="升级"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12727650', - 'https://i.gkd.li/i/12715352', - ], - }, { key: 2, name: '全屏广告-弹窗广告', diff --git a/src/apps/com.zhihu.android.ts b/src/apps/com.zhihu.android.ts index 4a24a649..15db0d8a 100644 --- a/src/apps/com.zhihu.android.ts +++ b/src/apps/com.zhihu.android.ts @@ -266,6 +266,10 @@ export default defineGkdApp({ fastQuery: true, resetMatch: 'app', actionMaximum: 1, + activityIds: [ + '.app.ui.activity.MainActivity', + '.feature.short_container_feature.ui.ShortContainerHostActivity', + ], rules: [ { key: 0, @@ -279,7 +283,7 @@ export default defineGkdApp({ ], }, { - preKeys: 0, + preKeys: [0], key: 1, name: '点击[取消]', matches: ['[text="去应用市场"]', '[text="取消"]'], @@ -309,6 +313,7 @@ export default defineGkdApp({ desc: '自动点击展开', rules: [ { + fastQuery: true, activityIds: 'com.zhihu.android.mixshortcontainer.MixShortContainerActivity', matches: diff --git a/src/apps/com.zhiwei.rjm.ts b/src/apps/com.zhiwei.rjm.ts index 83ac573b..13fb3564 100644 --- a/src/apps/com.zhiwei.rjm.ts +++ b/src/apps/com.zhiwei.rjm.ts @@ -12,6 +12,9 @@ export default defineGkdApp({ { key: 0, fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', activityIds: 'com.zhiwei.rjm.MainActivity', matches: 'ImageView < @ViewGroup[clickable=true] < * +2 ViewGroup > [text="广告"]', @@ -29,8 +32,10 @@ export default defineGkdApp({ { key: 0, name: '视频播放页卡片广告', + fastQuery: true, activityIds: 'com.zhiwei.rjm.MainActivity', - matches: '@TextView[clickable=true] <2 View + View > [text="广告"]', + matches: + '@TextView[clickable=true] <2 View + View > [visibleToUser=true][text="广告"] < [id="com.byted.pangle.m:id/tt_item_tv"][text="不感兴趣"]', snapshotUrls: 'https://i.gkd.li/i/13425306', diff --git a/src/apps/com.zmsoft.forwatch.ts b/src/apps/com.zmsoft.forwatch.ts index 23cb70e2..339e2a27 100644 --- a/src/apps/com.zmsoft.forwatch.ts +++ b/src/apps/com.zmsoft.forwatch.ts @@ -11,10 +11,12 @@ export default defineGkdApp({ { key: 0, name: '字节广告', - activityIds: 'com.zmapp.fwatch.activity.NativeAdActivity', fastQuery: true, - matches: - '@[id="com.zmsoft.forwatch:id/ad_close"] - * >n [text="广告"]', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + activityIds: 'com.zmapp.fwatch.activity.NativeAdActivity', + matches: '[id="com.zmsoft.forwatch:id/ad_close"]', snapshotUrls: 'https://i.gkd.li/i/13545995', }, ], diff --git a/src/apps/com.zmzx.college.search.ts b/src/apps/com.zmzx.college.search.ts index b34768fc..d1087d4a 100644 --- a/src/apps/com.zmzx.college.search.ts +++ b/src/apps/com.zmzx.college.search.ts @@ -78,7 +78,8 @@ export default defineGkdApp({ 'com.bilibili.ship.theseus.detail.UnitedBizDetailsActivity', 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', ], - matches: '[id$="tt_reward_full_count_down"]', + matches: + '[id="com.byted.pangle.m:id/tt_reward_full_count_down_after_close"]', snapshotUrls: [ 'https://i.gkd.li/i/12893408', 'https://i.gkd.li/i/13929945', @@ -128,10 +129,18 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.zmzx.college.search:id/update_close"]', - snapshotUrls: [ - 'https://i.gkd.li/i/13063373', - 'https://i.gkd.li/i/13623469', + rules: [ + { + activityIds: [ + '.activity.main.activity.MainActivity', + '.activity.init.InitActivity', + ], + matches: '[id="com.zmzx.college.search:id/update_close"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13063373', + 'https://i.gkd.li/i/13623469', + ], + }, ], }, { @@ -143,6 +152,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { + activityIds: '.activity.main.activity.MainActivity', matches: '[text="开启推送通知"] - [id="com.zmzx.college.search:id/siv_dialog_close"]', snapshotUrls: 'https://i.gkd.li/i/13440939', @@ -152,13 +162,18 @@ export default defineGkdApp({ { key: 7, name: '评价提示-请求好评弹窗', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: - '[id="com.zmzx.college.search:id/iv_logo"] + [id="com.zmzx.college.search:id/siv_close"]', - snapshotUrls: 'https://i.gkd.li/i/13476308', + rules: [ + { + activityIds: '.activity.camerasdk.ZybCameraSDKActivity', + matches: + '[id="com.zmzx.college.search:id/iv_logo"] + [id="com.zmzx.college.search:id/siv_close"]', + snapshotUrls: 'https://i.gkd.li/i/13476308', + }, + ], }, { key: 11, diff --git a/src/apps/com.zuoyebang.knowledge.ts b/src/apps/com.zuoyebang.knowledge.ts index 2c240d91..5d7163da 100644 --- a/src/apps/com.zuoyebang.knowledge.ts +++ b/src/apps/com.zuoyebang.knowledge.ts @@ -11,18 +11,27 @@ export default defineGkdApp({ matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - rules: '[id="com.zuoyebang.knowledge:id/cancel_button"]', - snapshotUrls: 'https://i.gkd.li/i/13695522', + rules: [ + { + matches: '[id="com.zuoyebang.knowledge:id/cancel_button"]', + snapshotUrls: 'https://i.gkd.li/i/13695522', + }, + ], }, { key: 3, name: '评价提示-赏好评弹窗', + fastQuery: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', - fastQuery: true, - rules: 'TextView[id="com.zuoyebang.knowledge:id/btn_cancle"]', - snapshotUrls: 'https://i.gkd.li/i/13043228', + rules: [ + { + activityIds: 'com.baidu.homework.activity.init.InitActivity', + matches: 'TextView[id="com.zuoyebang.knowledge:id/btn_cancle"]', + snapshotUrls: 'https://i.gkd.li/i/13043228', + }, + ], }, ], }); diff --git a/src/apps/com.zzw.october.ts b/src/apps/com.zzw.october.ts index 46944e50..83b5b1eb 100644 --- a/src/apps/com.zzw.october.ts +++ b/src/apps/com.zzw.october.ts @@ -7,17 +7,17 @@ export default defineGkdApp({ { key: 2, name: '全屏广告-弹窗广告', - activityIds: ['com.zzw.october.MainActivity'], + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { key: 1, fastQuery: true, + activityIds: 'com.zzw.october.MainActivity', matches: '[id="com.zzw.october:id/interact_ad_root"] >n ImageView[id="com.zzw.october:id/iv_close"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12842675', - 'https://i.gkd.li/i/12869369', - ], + snapshotUrls: 'https://i.gkd.li/i/12842675', }, ], },