Skip to content

Commit 566f7cd

Browse files
jiuqianyuanjiuqianyuan
committed
feat: merge any rules
1 parent ada875c commit 566f7cd

7 files changed

+127
-82
lines changed

‎src/apps/cn.soulapp.android.ts

+15
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,20 @@ export default defineGkdApp({
128128
},
129129
],
130130
},
131+
{
132+
key: 7,
133+
name: '功能类-送礼开聊会话',
134+
desc: '自动点击先不聊了',
135+
fastQuery: true,
136+
matchTime: 10000,
137+
actionMaximum: 1,
138+
activityIds: '.component.chat.ConversationActivity',
139+
rules: [
140+
{
141+
matches: '[vid="cl_gift_normal"] > TextView[vid="tv_btn_close"]',
142+
snapshotUrls: 'https://i.gkd.li/i/19448971',
143+
},
144+
],
145+
},
131146
],
132147
});

‎src/apps/com.eg.android.AlipayGphone.ts

+15
Original file line numberDiff line numberDiff line change
@@ -439,5 +439,20 @@ export default defineGkdApp({
439439
},
440440
],
441441
},
442+
{
443+
key: 25,
444+
name: '全屏广告-付款后的免密支付开通广告',
445+
matchTime: 10000,
446+
actionMaximum: 1,
447+
resetMatch: 'app',
448+
fastQuery: true,
449+
rules: [
450+
{
451+
activityIds: 'com.alipay.android.msp.ui.views.MspContainerActivity',
452+
matches: ['TextView[text *="免密支付"]', 'TextView[text="不感兴趣"]'],
453+
snapshotUrls: 'https://i.gkd.li/i/19449399',
454+
},
455+
],
456+
},
442457
],
443458
});

‎src/apps/com.qiyi.video.ts

+2
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,13 @@ export default defineGkdApp({
6969
activityIds: [
7070
'org.qiyi.android.video.MainActivity',
7171
'org.qiyi.android.search.view.PhoneSearchActivity',
72+
'.qysplashscreen.hotlaunch.HotSplashScreenActivity',
7273
],
7374
matches: '[id="com.qiyi.video:id/cancel_btn"][text="暂不升级"]',
7475
snapshotUrls: [
7576
'https://i.gkd.li/i/12838158',
7677
'https://i.gkd.li/i/13684912',
78+
'https://i.gkd.li/i/19049372',
7779
],
7880
},
7981
],

‎src/apps/com.videogo.ts

+18-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default defineGkdApp({
2424
},
2525
{
2626
key: 7,
27-
name: '全屏广告-在线值守广告',
27+
name: '全屏广告-首页广告',
2828
fastQuery: true,
2929
actionMaximum: 1,
3030
matchTime: 10000,
@@ -33,10 +33,26 @@ export default defineGkdApp({
3333
{
3434
action: 'back',
3535
activityIds: '.main.MainTabActivity',
36-
matches: 'TextView[text="了解并试用服务"]',
36+
matches: 'TextView[text="了解并试用服务"][visibleToUser=true]',
3737
snapshotUrls: 'https://i.gkd.li/i/15338834',
3838
},
3939
],
4040
},
41+
{
42+
key: 8,
43+
name: '功能类-新机权益',
44+
fastQuery: true,
45+
actionMaximum: 1,
46+
matchTime: 10000,
47+
resetMatch: 'app',
48+
rules: [
49+
{
50+
action: 'back',
51+
activityIds: '.main.MainTabActivity',
52+
matches: 'TextView[text="新机礼包专享"][visibleToUser=true]',
53+
snapshotUrls: 'https://i.gkd.li/i/18843418',
54+
},
55+
],
56+
},
4157
],
4258
});

‎src/apps/com.xunmeng.pinduoduo.ts

+58-78
Original file line numberDiff line numberDiff line change
@@ -21,95 +21,38 @@ export default defineGkdApp({
2121
},
2222
{
2323
key: 2,
24-
name: '全屏广告-弹窗广告',
24+
name: '全屏广告-首页弹窗广告',
25+
matchTime: 10000,
26+
actionMaximum: 1,
27+
resetMatch: 'app',
28+
activityIds: [
29+
'.ui.activity.HomeActivity',
30+
'.ui.activity.MainFrameActivity',
31+
],
2532
rules: [
2633
{
27-
key: 3,
34+
key: 1,
35+
name: '首页弹窗1',
2836
fastQuery: true,
2937
action: 'back',
30-
activityIds: [
31-
'.ui.activity.HomeActivity',
32-
'.ui.activity.MainFrameActivity',
33-
],
3438
matches:
35-
'[text="开心收下" || text="去抢购" || text="立即抽免单" || text="去刮奖" || text="立即领取" || text="去领大额金币" || text="送你大额现金" || text*="红包助手" || text="刮刮卡发来的消息通知"][visibleToUser=true]',
36-
snapshotUrls: [
37-
'https://i.gkd.li/i/13625441',
38-
'https://i.gkd.li/i/13761182',
39-
'https://i.gkd.li/i/13944165',
40-
'https://i.gkd.li/i/14456101',
41-
'https://i.gkd.li/i/14596990',
42-
'https://i.gkd.li/i/14614135',
43-
'https://i.gkd.li/i/15360330',
44-
'https://i.gkd.li/i/15032649',
45-
'https://i.gkd.li/i/15076322',
46-
'https://i.gkd.li/i/17564786',
47-
'https://i.gkd.li/i/17585645',
48-
'https://i.gkd.li/i/17625608',
49-
],
50-
},
51-
{
52-
key: 4,
53-
fastQuery: true,
54-
activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity',
55-
matches:
56-
'@ViewGroup[clickable=true] - ViewGroup[childCount=3] >2 [text="其他"]',
57-
snapshotUrls: 'https://i.gkd.li/i/15103543',
39+
'ImageView[visibleToUser=true][width<120][height<120] <<(1,2,3) @ViewGroup[childCount=1][clickable=true] <<n ViewGroup[visibleToUser=true][vid="pdd"]',
40+
exampleUrls: 'https://e.gkd.li/1d6f07ff-15b6-4a87-80de-79a712aebea0',
41+
snapshotUrls: 'https://i.gkd.li/i/18481318',
5842
},
5943
{
60-
key: 5,
44+
key: 2,
45+
name: '首页弹窗2',
6146
fastQuery: true,
62-
activityIds: 'com.xunmeng.pinduoduo.activity.NewPageMaskActivity',
63-
matches: [
64-
'[text="继续拼单"]',
65-
'@[clickable=true] > [text="先去逛逛"]',
66-
],
67-
snapshotUrls: [
68-
'https://i.gkd.li/i/15197527',
69-
'https://i.gkd.li/i/15211473',
70-
],
71-
},
72-
{
73-
key: 6,
74-
activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity',
75-
matches: '[text="上滑看视频得现金"] - [text="webp"]',
76-
snapshotUrls: 'https://i.gkd.li/i/13809053',
77-
},
78-
{
79-
key: 7,
80-
matchTime: 10000,
81-
actionMaximum: 1,
82-
resetMatch: 'app',
83-
activityIds: [
84-
'.ui.activity.HomeActivity',
85-
'.ui.activity.MainFrameActivity',
86-
],
87-
matches:
88-
'ImageView[childCount=0] < ViewGroup[childCount=1] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] < ViewGroup <(1,2) ViewGroup < ViewGroup < FrameLayout < FrameLayout < FrameLayout < FrameLayout < FrameLayout <(1,2,3) [parent=null]',
89-
exampleUrls: 'https://e.gkd.li/f74b5f58-e518-4e33-bbb4-0bf28e2b79d8',
90-
snapshotUrls: [
91-
'https://i.gkd.li/i/17528782',
92-
'https://i.gkd.li/i/17655498',
93-
'https://i.gkd.li/i/17893977',
94-
],
95-
},
96-
{
97-
key: 8,
98-
matchTime: 10000,
99-
actionMaximum: 1,
100-
resetMatch: 'app',
101-
activityIds: '.ui.activity.HomeActivity',
47+
action: 'back',
10248
matches:
103-
'@ViewGroup[childCount=1][clickable=true] < ViewGroup[childCount=2] < [childCount=1] < [childCount=1] < [childCount=1] < [childCount=1] < [childCount=1] < [childCount=1] < [childCount=1] <2 FrameLayout <2 [parent=null]',
104-
exampleUrls: 'https://e.gkd.li/e5428072-9ee3-47e9-87ad-d8b47e24f173',
105-
snapshotUrls: 'https://i.gkd.li/i/17773799',
49+
'@ImageView[visibleToUser=true][width<120][height<120][clickable=true] <<(1,2,3) ViewGroup[childCount=1] <<n ViewGroup[visibleToUser=true][vid="pdd"]',
50+
snapshotUrls: 'https://i.gkd.li/i/14456101',
10651
},
52+
10753
{
108-
key: 9,
109-
matchTime: 10000,
110-
actionMaximum: 1,
111-
resetMatch: 'app',
112-
activityIds: '.ui.activity.HomeActivity',
54+
key: 3,
55+
name: '首页弹窗3',
11356
matches:
11457
'@ImageView[index=0][vid="pdd"][childCount=0][visibleToUser=true][width<120&&height<120] < RelativeLayout[childCount=2] < FrameLayout[childCount=1] < FrameLayout[childCount=1] < [parent=null]',
11558
exampleUrls: 'https://e.gkd.li/64f35ab7-37e1-4060-aa91-468116a42cae',
@@ -346,5 +289,42 @@ export default defineGkdApp({
346289
},
347290
],
348291
},
292+
{
293+
key: 22,
294+
name: '全屏广告-商品页弹窗',
295+
fastQuery: true,
296+
activityIds: 'com.xunmeng.pinduoduo.activity.NewPageMaskActivity',
297+
rules: [
298+
{
299+
key: 1,
300+
matches: [
301+
'[text="继续拼单"]',
302+
'@[clickable=true] > [text="先去逛逛"]',
303+
],
304+
snapshotUrls: [
305+
'https://i.gkd.li/i/15197527',
306+
'https://i.gkd.li/i/15211473',
307+
],
308+
},
309+
],
310+
},
311+
{
312+
key: 23,
313+
name: '全屏广告-多多视频弹窗',
314+
fastQuery: true,
315+
activityIds: '.ui.activity.HomeActivity',
316+
rules: [
317+
{
318+
key: 1,
319+
matches:
320+
'[text="开心收下" || text="去抢购" || text="立即抽免单" || text="去刮奖" || text="立即领取" || text="去领大额金币" || text="送你大额现金" || text*="红包助手" || text="刮刮卡发来的消息通知" || text="上滑看视频得现金"][visibleToUser=true]',
321+
snapshotUrls: [
322+
'https://i.gkd.li/i/13625441',
323+
'https://i.gkd.li/i/13944165',
324+
'https://i.gkd.li/i/13809053',
325+
],
326+
},
327+
],
328+
},
349329
],
350330
});

‎src/apps/ctrip.android.view.ts

+18-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default defineGkdApp({
3838
},
3939
{
4040
key: 2,
41-
name: '全屏广告-弹窗广告',
41+
name: '全屏广告-首页弹窗广告',
4242
desc: '点击关闭',
4343
rules: [
4444
{
@@ -55,5 +55,22 @@ export default defineGkdApp({
5555
},
5656
],
5757
},
58+
{
59+
key: 3,
60+
name: '全屏广告-机票页弹窗广告',
61+
desc: '点击关闭',
62+
rules: [
63+
{
64+
fastQuery: true,
65+
matchTime: 10000,
66+
actionMaximum: 1,
67+
activityIds: 'ctrip.business.planthome.CtripPlantHomeActivity',
68+
matches:
69+
'@ImageView[clickable=true][vid="a"][width<120][height<120] <<n FrameLayout[id="android:id/content"]',
70+
exampleUrls: 'https://e.gkd.li/6170a942-3fc9-42d8-9ecd-c48b2f453c98',
71+
snapshotUrls: 'https://i.gkd.li/i/19050401',
72+
},
73+
],
74+
},
5875
],
5976
});

‎src/globalGroups.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default defineGkdGlobalGroups([
6363
matches: [
6464
'[text*="内测" || text*="测试版" || text*="新版" || text*="更新" || text*="升级" || text*="体验" || text*="內測" || text*="測試版" || text*="升級" || text*="體驗" || text*="Update" || text*="Upgrade" || text*="Experience"][text!*="自动" && text!*="自動" && text!*="成功" && text!*="失败" && text!*="失敗" && text!*="检查更新" && text!*="检测更新" && text!*="卸载"][name!$=".CheckBox"][childCount=0][visibleToUser=true]',
6565
'[text*="更新" || text*="下载" || text*="安装" || text*="升级" || text*="查看" || text*="体验" || text*="确定" || text*="确认"][text.length<6][name!$=".CheckBox"][childCount=0][visibleToUser=true]',
66-
'[text*="不再提醒" || text$="再说" || text$="拒绝" || text$="再想想" || text*="再看看" || text^="忽略" || text^="暂不" || text^="放弃" || text^="取消" || text$="不要" || text$="再說" || text$="暫不" || text$="拒絕" || text*="稍后" || text^="关闭" || text$="Later" || text^="Ignore" || text^="Not now" || text^="Cancel" || vid="iv_close" || vid="iv_cancel" || vid="close" || vid="Close" || vid="img_close" || vid="btn_close" || vid="ivCancel" || vid="tvCancel" || vid="cancel" || vid="Cancel" || vid="ivClose" || vid="imgClose" || vid="iv_negative"][name!$=".CheckBox"][childCount=0][visibleToUser=true]',
66+
'[text*="不再提醒" || text$="再说" || text$="拒绝" || text$="再想想" || text*="再看看" || text^="忽略" || text^="暂不" || text^="放弃" || text^="取消" || text$="不要" || text$="再說" || text$="暫不" || text$="拒絕" || text*="稍后" || text^="关闭" || text$="Later" || text^="Ignore" || text^="Not now" || text^="Cancel" || vid="iv_close" || vid="iv_cancel" || vid="close" || vid="Close" || vid="img_close" || vid="btn_close" || vid="ivCancel" || vid="tvCancel" || vid="cancel" || vid="Cancel" || vid="ivClose" || vid="imgClose" || vid="iv_negative" || vid="update_close_icon"][name!$=".CheckBox"][childCount=0][visibleToUser=true]',
6767
],
6868
excludeSnapshotUrls: [
6969
// 避免误触

0 commit comments

Comments
 (0)