From 81c3308f118872d31b4f073d9a2649dabf47fb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=A6=E5=BF=B5=E9=80=8D=E9=81=A5?= <2589141604@qq.com> Date: Mon, 8 Jul 2024 08:35:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/appDeprecatedKeys.ts | 7 +- src/apps/cn.runningquotient.rq.ts | 41 +++++++++++ src/apps/com.android.vending.ts | 6 ++ src/apps/com.baidu.netdisk.ts | 3 +- src/apps/com.baidu.tieba.ts | 9 ++- src/apps/com.cainiao.wireless.ts | 18 +++-- src/apps/com.cn21.ecloud.ts | 16 +++-- src/apps/com.dianxinai.mobile.ts | 8 +-- src/apps/com.douban.frodo.ts | 12 ++++ src/apps/com.eg.android.AlipayGphone.ts | 16 +++++ src/apps/com.example.yr.ts | 26 +++++++ src/apps/com.heytap.cloud.ts | 24 +++++++ src/apps/com.jingyao.easybike.ts | 92 +++++++++++++++---------- src/apps/com.kugou.android.ts | 9 +++ src/apps/com.paokeji.yiqu.ts | 7 +- src/apps/com.sankuai.meituan.ts | 31 ++++++--- src/apps/com.tencent.mtt.ts | 17 ++--- src/apps/me.zhouzhuo810.zznote.ts | 13 +++- src/apps/mikuclub.app.ts | 1 + 19 files changed, 272 insertions(+), 84 deletions(-) create mode 100644 src/apps/cn.runningquotient.rq.ts create mode 100644 src/apps/com.example.yr.ts create mode 100644 src/apps/com.heytap.cloud.ts diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts index 230d12b7..c7ced161 100644 --- a/src/appDeprecatedKeys.ts +++ b/src/appDeprecatedKeys.ts @@ -276,7 +276,7 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ { id: 'com.cainiao.wireless', name: '菜鸟', - deprecatedKeys: [0, 3], + deprecatedKeys: [0, 3, 7, 8, 11], }, { id: 'com.cctv.cctv5ultimate', @@ -544,4 +544,9 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ name: '微博', deprecatedKeys: [10], }, + { + id: 'com.jingyao.easybike', + name: '哈啰', + deprecatedKeys: [11, 13, 14], + }, ]; diff --git a/src/apps/cn.runningquotient.rq.ts b/src/apps/cn.runningquotient.rq.ts new file mode 100644 index 00000000..131e1472 --- /dev/null +++ b/src/apps/cn.runningquotient.rq.ts @@ -0,0 +1,41 @@ +import { defineGkdApp } from '@gkd-kit/define'; + +export default defineGkdApp({ + id: 'cn.runningquotient.rq', + name: 'RQrun', + groups: [ + { + key: 1, + name: '功能类-自动签到', + desc: '点击右侧[签到福利]', + quickFind: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + key: 0, + activityIds: 'cn.runningquotient.rq.page.common_page.MainActivity', + matches: '[vid="iv_main_checkin_entry"]', + snapshotUrls: 'https://i.gkd.li/i/16105502', + }, + { + preKeys: [0], + key: 1, + activityIds: + 'cn.runningquotient.rq.page.common_page.CommonContainerActivity', + matches: '@[text="我知道了"] <n FrameLayout >n @ImageView[desc=null] - View < View[childCount=2]', - snapshotUrls: [ - 'https://i.gkd.li/i/12865481', - 'https://i.gkd.li/i/12865488', + activityIds: 'com.cn21.ecloud.activity.MainPageActivity', + rules: [ + { + matches: + '[id="com.cn21.ecloud:id/content_frame"] >(5,7) View[childCount=2] > ImageView[childCount=0][clickable=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/12865481', + 'https://i.gkd.li/i/12865488', + ], + }, ], }, { diff --git a/src/apps/com.dianxinai.mobile.ts b/src/apps/com.dianxinai.mobile.ts index 0b9af25d..42154dad 100644 --- a/src/apps/com.dianxinai.mobile.ts +++ b/src/apps/com.dianxinai.mobile.ts @@ -7,16 +7,14 @@ export default defineGkdApp({ { key: 0, name: '开屏广告', + quickFind: true, matchTime: 10000, actionMaximum: 1, resetMatch: 'app', rules: [ { - matches: - '@ViewGroup[clickable=true] > TextView[text$="s" && text.length=2]', - exampleUrls: - 'https://m.gkd.li/57941037/a4b9c558-1d1f-4964-9545-95533253c9d1', - snapshotUrls: 'https://i.gkd.li/i/12847518', + matches: '[text$="s"][text.length=2]', + snapshotUrls: 'https://i.gkd.li/i/16115075', }, ], }, diff --git a/src/apps/com.douban.frodo.ts b/src/apps/com.douban.frodo.ts index 51d418e0..65b9c884 100644 --- a/src/apps/com.douban.frodo.ts +++ b/src/apps/com.douban.frodo.ts @@ -25,11 +25,23 @@ export default defineGkdApp({ left: 'width * 0.8833', top: 'width * 0.1388', }, + excludeMatches: '[id="com.douban.frodo:id/_ad_image_"][width=1200]', matches: '[id="com.douban.frodo:id/_ad_image_"]', snapshotUrls: [ 'https://i.gkd.li/i/13575257', 'https://i.gkd.li/i/13575547', + ], + }, + { + key: 2, + position: { + left: 'width * 0.8666', + top: 'width * 0.1625', + }, + matches: '[id="com.douban.frodo:id/_ad_image_"][width=1200]', + snapshotUrls: [ 'https://i.gkd.li/i/13601755', + 'https://i.gkd.li/i/16054268', ], }, ], diff --git a/src/apps/com.eg.android.AlipayGphone.ts b/src/apps/com.eg.android.AlipayGphone.ts index cdbac5af..dc52c852 100644 --- a/src/apps/com.eg.android.AlipayGphone.ts +++ b/src/apps/com.eg.android.AlipayGphone.ts @@ -328,5 +328,21 @@ export default defineGkdApp({ }, ], }, + { + key: 23, + name: '全屏广告-[银行卡还款服务升级]弹窗', + desc: '点击[放弃升级，直接付款]', + rules: [ + { + quickFind: true, + activityIds: + 'com.alipay.mobile.nebulax.xriver.activity.XRiverActivity', + matches: '@[clickable=true] >2 [text="放弃升级，直接付款"]', + exampleUrls: + 'https://m.gkd.li/57941037/1b788a34-68f6-43c0-8be4-e13cb8221852', + snapshotUrls: 'https://i.gkd.li/i/16106615', + }, + ], + }, ], }); diff --git a/src/apps/com.example.yr.ts b/src/apps/com.example.yr.ts new file mode 100644 index 00000000..f85e8b0b --- /dev/null +++ b/src/apps/com.example.yr.ts @@ -0,0 +1,26 @@ +import { defineGkdApp } from '@gkd-kit/define'; + +export default defineGkdApp({ + id: 'com.example.yr', + name: '剧兔', + groups: [ + { + key: 1, + name: '全屏广告-弹窗广告', + desc: '点击关闭', + rules: [ + { + activityIds: 'com.example.yr.MainActivity', + matches: + '[id="android:id/content"] >(3,4) FrameLayout[childCount>3] > FrameLayout[childCount=1] > ImageView', + exampleUrls: + 'https://m.gkd.li/57941037/e5ab8198-9705-4976-8a24-7d128b9a576e', + snapshotUrls: [ + 'https://i.gkd.li/i/16115831', + 'https://i.gkd.li/i/16115830', + ], + }, + ], + }, + ], +}); diff --git a/src/apps/com.heytap.cloud.ts b/src/apps/com.heytap.cloud.ts new file mode 100644 index 00000000..37db507b --- /dev/null +++ b/src/apps/com.heytap.cloud.ts @@ -0,0 +1,24 @@ +import { defineGkdApp } from '@gkd-kit/define'; + +export default defineGkdApp({ + id: 'com.heytap.cloud', + name: '云服务', + groups: [ + { + key: 1, + name: '更新提示', + desc: '点击关闭', + quickFind: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.heytap.cloud.home.ui.CloudSettingsActivity2', + matches: ['[text="检测到新版本"]', '[vid="cancel"]'], + snapshotUrls: 'https://i.gkd.li/i/16097208', + }, + ], + }, + ], +}); diff --git a/src/apps/com.jingyao.easybike.ts b/src/apps/com.jingyao.easybike.ts index a980d141..b53b7b6d 100644 --- a/src/apps/com.jingyao.easybike.ts +++ b/src/apps/com.jingyao.easybike.ts @@ -5,6 +5,21 @@ export default defineGkdApp({ name: '哈啰', groups: [ // 预留 key 0-8 + { + key: 1, + name: '更新提示', + desc: '点击关闭', + quickFind: true, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.hellobike.atlas.business.portal.PortalActivity', + matches: '@ImageView + [vid="contentContainer"] >2 [text*="新版本"]', + snapshotUrls: 'https://i.gkd.li/i/16108173', + }, + ], + }, { key: 8, name: '权限提示-通知权限', @@ -15,7 +30,7 @@ export default defineGkdApp({ rules: '[text*="开启通知"] < FrameLayout + FrameLayout >2 [text="取消"]', snapshotUrls: [ 'https://i.gkd.li/i/13228735', - 'https://i.gkd.li/i/13402675', // activityIds: com.hellobike.atlas.business.portal.PortalActivity + 'https://i.gkd.li/i/13402675', ], }, { @@ -31,30 +46,46 @@ export default defineGkdApp({ }, { key: 10, - name: '全屏广告-应用内活动、弹窗广告（大部分）', - activityIds: [ - 'com.hellobike.ads.widget.insert.dialog.HBAdvertDialog', - 'com.hellobike.atlas.business.portal.PortalActivity', - ], - rules: - 'FrameLayout[id="com.jingyao.easybike:id/hbDialogLayout"] + ImageView[id="com.jingyao.easybike:id/actionDialogClose"][clickable=true]', - snapshotUrls: [ - 'https://i.gkd.li/i/12650028', // 哈啰出行保弹窗 - 'https://i.gkd.li/i/12650090', // 账单查看弹窗 - 'https://i.gkd.li/i/13331231', // 骑行卡 atlas.business.portal.PortalActivity + name: '全屏广告-弹窗广告', + rules: [ + { + key: 0, + activityIds: [ + 'com.hellobike.ads.widget.insert.dialog.HBAdvertDialog', + 'com.hellobike.atlas.business.portal.PortalActivity', + ], + matches: + 'FrameLayout[id="com.jingyao.easybike:id/hbDialogLayout"] + ImageView[id="com.jingyao.easybike:id/actionDialogClose"][clickable=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/12650028', + 'https://i.gkd.li/i/12650090', + 'https://i.gkd.li/i/13331231', + ], + }, + { + key: 1, + quickFind: true, + activityIds: + 'com.hellobike.evehicle.business.main.EVehicleHomeManagerActivity', + matches: + '[id="com.jingyao.easybike:id/lottie_view"] < ViewGroup + [id="com.jingyao.easybike:id/btn_close"]', + snapshotUrls: 'https://i.gkd.li/i/12650163', + }, + { + key: 2, + activityIds: 'com.alipay.mobile.nebulacore.ui.H5Activity', + matches: + '[text="订单完成"] >(2) View[childCount=2] > Image[id=null][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/12684673', + }, + { + key: 3, + activityIds: 'com.hellobike.atlas.business.portal.PortalActivity', + matches: '[desc="去使用"] + Button[text=null][visibleToUser=true]', + snapshotUrls: 'https://i.gkd.li/i/12739316', + }, ], }, - { - key: 11, - name: '全屏广告-哈啰智能电动车-弹窗广告', - quickFind: true, - activityIds: [ - 'com.hellobike.evehicle.business.main.EVehicleHomeManagerActivity', - ], - rules: - '[id="com.jingyao.easybike:id/lottie_view"] < ViewGroup + [id="com.jingyao.easybike:id/btn_close"]', - snapshotUrls: 'https://i.gkd.li/i/12650163', - }, { key: 12, name: '局部广告-右侧悬浮广告', @@ -64,21 +95,6 @@ export default defineGkdApp({ '@[id="com.jingyao.easybike:id/closeFloatArea"] + [id="com.jingyao.easybike:id/floatADContainer"]', snapshotUrls: 'https://i.gkd.li/i/12650071', }, - { - key: 13, - name: '全屏广告-骑行订单完成-弹窗广告', - activityIds: 'com.alipay.mobile.nebulacore.ui.H5Activity', - rules: - '[text="订单完成"] >(2) View[childCount=2] > Image[id=null][clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/12684673', - }, - { - key: 14, - name: '全屏广告-骑行卡-优惠券弹窗', - activityIds: 'com.hellobike.atlas.business.portal.PortalActivity', - rules: '[desc="去使用"] + Button[text=null][visibleToUser=true]', - snapshotUrls: 'https://i.gkd.li/i/12739316', - }, { key: 15, quickFind: true, diff --git a/src/apps/com.kugou.android.ts b/src/apps/com.kugou.android.ts index 03650d6d..12e63cff 100644 --- a/src/apps/com.kugou.android.ts +++ b/src/apps/com.kugou.android.ts @@ -70,6 +70,15 @@ export default defineGkdApp({ matches: '@ImageView[clickable=true] [text="广告"]', snapshotUrls: 'https://i.gkd.li/i/15520336', }, + { + key: 4, + activityIds: 'com.kugou.android.app.MediaActivity', + matches: + 'RelativeLayout > @RelativeLayout[clickable=true] > [desc="关闭"]', + exampleUrls: + 'https://m.gkd.li/57941037/c8c92512-d1cf-43ab-9934-05934b9c4059', + snapshotUrls: 'https://i.gkd.li/i/16114590', + }, ], }, { diff --git a/src/apps/com.paokeji.yiqu.ts b/src/apps/com.paokeji.yiqu.ts index dcd7e400..1becc8c1 100644 --- a/src/apps/com.paokeji.yiqu.ts +++ b/src/apps/com.paokeji.yiqu.ts @@ -136,8 +136,11 @@ export default defineGkdApp({ activityIds: 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', matches: - 'Image[text=""] < @View +4 [text="反馈"] + * >2 [text="广告"]', - snapshotUrls: 'https://i.gkd.li/i/14717730', + '[text="反馈"] -(2,4) @View[childCount=1][visibleToUser=true] > Image[childCount=0][text=""]', + snapshotUrls: [ + 'https://i.gkd.li/i/14717730', + 'https://i.gkd.li/i/16062358', + ], }, { key: 2, diff --git a/src/apps/com.sankuai.meituan.ts b/src/apps/com.sankuai.meituan.ts index afaab4ea..ecaaa06b 100644 --- a/src/apps/com.sankuai.meituan.ts +++ b/src/apps/com.sankuai.meituan.ts @@ -109,15 +109,28 @@ export default defineGkdApp({ }, { key: 4, - name: '局部广告-首页右侧抽奖小广告', - activityIds: [ - 'com.meituan.android.pt.homepage.activity.MainActivity', - 'com.miui.home.launcher.Launcher', - ], - rules: 'FrameLayout > @ImageView + ImageView[desc="资质与规则"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12639815', - 'https://i.gkd.li/i/12639734', + name: '局部广告-悬浮广告', + rules: [ + { + key: 0, + activityIds: [ + 'com.meituan.android.pt.homepage.activity.MainActivity', + 'com.miui.home.launcher.Launcher', + ], + matches: 'FrameLayout > @ImageView + ImageView[desc="资质与规则"]', + snapshotUrls: [ + 'https://i.gkd.li/i/12639815', + 'https://i.gkd.li/i/12639734', + ], + }, + { + key: 1, + quickFind: true, + activityIds: + 'com.sankuai.waimai.business.page.homepage.TakeoutActivity', + matches: '[vid="marking_sidebar_close"]', + snapshotUrls: 'https://i.gkd.li/i/16079638', + }, ], }, { diff --git a/src/apps/com.tencent.mtt.ts b/src/apps/com.tencent.mtt.ts index fb8bbdd8..1d4976fd 100644 --- a/src/apps/com.tencent.mtt.ts +++ b/src/apps/com.tencent.mtt.ts @@ -43,21 +43,14 @@ export default defineGkdApp({ ], }, { - preKeys: 0, + preKeys: [0], key: 1, - name: '点击[屏蔽此广告]', - matches: '@ViewGroup > [desc="屏蔽此广告"]', + name: '点击[屏蔽此广告]/[直接关闭]', + matches: + '@ViewGroup[childCount=1 || childCount=3] > [desc="屏蔽此广告" || desc="直接关闭"]', snapshotUrls: [ 'https://i.gkd.li/i/12907654', 'https://i.gkd.li/i/12907651', - ], - }, - { - preKeys: 1, - key: 2, - name: '点击[不感兴趣]', - matches: '@ViewGroup > [desc="不感兴趣"]', - snapshotUrls: [ 'https://i.gkd.li/i/12907655', 'https://i.gkd.li/i/12907653', ], @@ -75,7 +68,7 @@ export default defineGkdApp({ snapshotUrls: 'https://i.gkd.li/i/12909822', }, { - preKeys: 0, + preKeys: [0], key: 1, matches: '[id="com.tencent.mtt:id/reward_dialog_close"]', snapshotUrls: 'https://i.gkd.li/i/12908955', diff --git a/src/apps/me.zhouzhuo810.zznote.ts b/src/apps/me.zhouzhuo810.zznote.ts index 0d1fd4b5..5b24618a 100644 --- a/src/apps/me.zhouzhuo810.zznote.ts +++ b/src/apps/me.zhouzhuo810.zznote.ts @@ -23,8 +23,17 @@ export default defineGkdApp({ }, { key: 1, - matches: '@LinearLayout > [text*="跳过"]', - snapshotUrls: 'https://i.gkd.li/i/13800235', + matches: '[text*="跳过"][text.length<10][visibleToUser=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/13800235', + 'https://i.gkd.li/i/16115850', + ], + }, + { + key: 2, + matches: + 'FrameLayout > FrameLayout[childCount>2] > @View[clickable=true][visibleToUser=true] + TextView[text=null] <