diff --git a/src/apps/cn.soulapp.android.ts b/src/apps/cn.soulapp.android.ts index b5312fef..b057d646 100644 --- a/src/apps/cn.soulapp.android.ts +++ b/src/apps/cn.soulapp.android.ts @@ -128,5 +128,20 @@ export default defineGkdApp({ }, ], }, + { + key: 7, + name: '全屏广告-送礼开聊会话', + desc: '自动点击先不聊了', + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + rules: [ + { + activityIds: '.component.chat.ConversationActivity', + matches: '[vid="cl_gift_normal"] > TextView[vid="tv_btn_close"]', + snapshotUrls: 'https://i.gkd.li/i/19448971', + }, + ], + }, ], }); diff --git a/src/apps/com.eg.android.AlipayGphone.ts b/src/apps/com.eg.android.AlipayGphone.ts index 9dad1ca8..87d457ab 100644 --- a/src/apps/com.eg.android.AlipayGphone.ts +++ b/src/apps/com.eg.android.AlipayGphone.ts @@ -292,10 +292,11 @@ export default defineGkdApp({ }, { key: 17, - name: '功能类-关闭免密支付开关', + name: '全屏广告-关闭免密支付广告', actionMaximum: 1, rules: [ { + key: 0, fastQuery: true, activityIds: 'com.alipay.android.msp.ui.views.MspContainerActivity', matches: @@ -307,6 +308,17 @@ export default defineGkdApp({ 'https://i.gkd.li/i/17107841', ], }, + { + key: 1, + fastQuery: true, + activityIds: 'com.alipay.android.msp.ui.views.MspContainerActivity', + matches: [ + '[text^="开通"][text$="免密支付"][visibleToUser=true]', + '@[clickable=true] > [text="关闭"][visibleToUser=true]', + ], + exampleUrls: 'https://e.gkd.li/c8388cd5-a97f-4683-9ef1-2caa0a24de91', + snapshotUrls: 'https://i.gkd.li/i/19449399', + }, ], }, { diff --git a/src/apps/com.qiyi.video.ts b/src/apps/com.qiyi.video.ts index 91c82edd..30001922 100644 --- a/src/apps/com.qiyi.video.ts +++ b/src/apps/com.qiyi.video.ts @@ -69,11 +69,13 @@ export default defineGkdApp({ activityIds: [ 'org.qiyi.android.video.MainActivity', 'org.qiyi.android.search.view.PhoneSearchActivity', + '.qysplashscreen.hotlaunch.HotSplashScreenActivity', ], - matches: '[id="com.qiyi.video:id/cancel_btn"][text="暂不升级"]', + matches: '[text="暂不升级"][visibleToUser=true]', snapshotUrls: [ 'https://i.gkd.li/i/12838158', 'https://i.gkd.li/i/13684912', + 'https://i.gkd.li/i/19049372', ], }, ], diff --git a/src/apps/com.videogo.ts b/src/apps/com.videogo.ts index c16fc90c..9c35877a 100644 --- a/src/apps/com.videogo.ts +++ b/src/apps/com.videogo.ts @@ -24,18 +24,27 @@ export default defineGkdApp({ }, { key: 7, - name: '全屏广告-在线值守广告', + name: '全屏广告-弹窗广告', fastQuery: true, - actionMaximum: 1, matchTime: 10000, + actionMaximum: 1, resetMatch: 'app', rules: [ { + key: 0, action: 'back', activityIds: '.main.MainTabActivity', - matches: 'TextView[text="了解并试用服务"]', + matches: 'TextView[text="了解并试用服务"][visibleToUser=true]', snapshotUrls: 'https://i.gkd.li/i/15338834', }, + { + key: 1, + action: 'back', + activityIds: '.main.MainTabActivity', + matches: '[text="新机礼包专享"][visibleToUser=true]', + exampleUrls: 'https://e.gkd.li/b9045305-ce34-43f7-ab86-b48a672281cb', + snapshotUrls: 'https://i.gkd.li/i/18843418', + }, ], }, ], diff --git a/src/apps/com.xunmeng.pinduoduo.ts b/src/apps/com.xunmeng.pinduoduo.ts index fa9f20ac..6928f596 100644 --- a/src/apps/com.xunmeng.pinduoduo.ts +++ b/src/apps/com.xunmeng.pinduoduo.ts @@ -32,7 +32,7 @@ export default defineGkdApp({ '.ui.activity.MainFrameActivity', ], matches: - '[text="开心收下" || text="去抢购" || text="立即抽免单" || text="去刮奖" || text="立即领取" || text="去领大额金币" || text="送你大额现金" || text*="红包助手" || text="刮刮卡发来的消息通知"][visibleToUser=true]', + '[text="开心收下" || text="去抢购" || text="立即抽免单" || text="去刮奖" || text="立即领取" || text="去领大额金币" || text="送你大额现金" || text*="红包助手" || text="刮刮卡发来的消息通知" || text="立即充值"][visibleToUser=true]', snapshotUrls: [ 'https://i.gkd.li/i/13625441', 'https://i.gkd.li/i/13761182', @@ -46,6 +46,7 @@ export default defineGkdApp({ 'https://i.gkd.li/i/17564786', 'https://i.gkd.li/i/17585645', 'https://i.gkd.li/i/17625608', + 'https://i.gkd.li/i/18481318', ], }, { @@ -69,12 +70,6 @@ export default defineGkdApp({ 'https://i.gkd.li/i/15211473', ], }, - { - key: 6, - activityIds: 'com.xunmeng.pinduoduo.ui.activity.HomeActivity', - matches: '[text="上滑看视频得现金"] - [text="webp"]', - snapshotUrls: 'https://i.gkd.li/i/13809053', - }, { key: 7, matchTime: 10000, diff --git a/src/apps/ctrip.android.view.ts b/src/apps/ctrip.android.view.ts index 62be05c5..4be2c97e 100644 --- a/src/apps/ctrip.android.view.ts +++ b/src/apps/ctrip.android.view.ts @@ -42,6 +42,7 @@ export default defineGkdApp({ desc: '点击关闭', rules: [ { + key: 0, fastQuery: true, matchTime: 10000, actionMaximum: 1, @@ -53,6 +54,17 @@ export default defineGkdApp({ exampleUrls: 'https://e.gkd.li/00628604-fab9-432c-a70b-343c8c889c23', snapshotUrls: 'https://i.gkd.li/i/16357287', }, + { + key: 1, + fastQuery: true, + matchTime: 10000, + actionMaximum: 1, + activityIds: 'ctrip.business.planthome.CtripPlantHomeActivity', + matches: + '@ImageView[clickable=true][childCount=0][visibleToUser=true] <4 FrameLayout[childCount=4] < FrameLayout < FrameLayout < [id="android:id/content"]', + exampleUrls: 'https://e.gkd.li/cdc28230-6ea7-4cf7-bef4-a31f7e36eed1', + snapshotUrls: 'https://i.gkd.li/i/19050401', + }, ], }, ], diff --git a/src/globalGroups.ts b/src/globalGroups.ts index a1d910ad..6bac4491 100644 --- a/src/globalGroups.ts +++ b/src/globalGroups.ts @@ -63,7 +63,7 @@ export default defineGkdGlobalGroups([ matches: [ '[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]', '[text*="更新" || text*="下载" || text*="安装" || text*="升级" || text*="查看" || text*="体验" || text*="确定" || text*="确认"][text.length<6][name!$=".CheckBox"][childCount=0][visibleToUser=true]', - '[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]', + '[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]', ], excludeSnapshotUrls: [ // 避免误触