diff --git a/src/apps/com.baidu.tieba.ts b/src/apps/com.baidu.tieba.ts index 80669ffaf..dd2dfe79c 100644 --- a/src/apps/com.baidu.tieba.ts +++ b/src/apps/com.baidu.tieba.ts @@ -235,11 +235,12 @@ export default defineGkdApp({ key: 1, name: '关闭签到成功弹窗', activityIds: 'com.baidu.tbadk.browser.TBWebContainerActivity', - matches: - 'WebView[text="签到弹窗"] > View > View > TextView[text=""][index=2][visibleToUser=true]', + action: 'back', + matches: 'WebView[text="签到弹窗"]', snapshotUrls: [ 'https://i.gkd.li/import/13776424', 'https://i.gkd.li/i/15087327', + 'https://i.gkd.li/i/15881225', ], }, ], diff --git a/src/apps/com.cainiao.wireless.ts b/src/apps/com.cainiao.wireless.ts index 6bf98a3f6..018c85614 100644 --- a/src/apps/com.cainiao.wireless.ts +++ b/src/apps/com.cainiao.wireless.ts @@ -51,5 +51,32 @@ export default defineGkdApp({ rules: 'View[desc="立即查看"] +2 ImageView[id=null]', snapshotUrls: ['https://i.gkd.li/import/14162159'], }, + { + key: 3, + name: '局部广告-包裹页面-物流信息底部横条广告', + desc: '点击右上角关闭', + quickFind: true, + activityIds: 'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity', + rules: [ + { + matches: '[vid="iv_banner_close"]', + snapshotUrls: 'https://i.gkd.li/i/15879126', + }, + ], + }, + { + key: 10, + name: '功能类-包裹页面-自动展开更多物流信息', + desc: '点击[展开]', + quickFind: true, + activityIds: 'com.taobao.cainiao.logistic.ui.view.LogisticDetailActivity', + rules: [ + { + matches: + '@[clickable=true] > View[desc="展开"] < RelativeLayout > RelativeLayout > *[childCount=2] > ImageView[index=1][clickable=true]', + '[id="android:id/content"] > RelativeLayout > RelativeLayout > *[childCount=2] > ImageView[index=1][clickable=true][desc!="拍照购"]', snapshotUrls: [ 'https://i.gkd.li/import/13241883', 'https://i.gkd.li/import/13259029', @@ -123,13 +123,17 @@ export default defineGkdApp({ }, { key: 3, - activityIds: 'com.jingdong.app.mall.MainFrameActivity', + activityIds: [ + 'com.jingdong.app.mall.MainFrameActivity', + 'com.jd.lib.jshop.jshop.JshopMainShopActivity', + ], matches: 'RelativeLayout > ImageView[desc*="关闭"]', excludeMatches: 'ImageView[desc="关闭页面"] - [text="优惠券"]', snapshotUrls: [ 'https://i.gkd.li/import/13258996', 'https://i.gkd.li/import/13336847', // 增加excludeMatches: 'ImageView[desc="关闭页面"] - [text="优惠券"]', 避免在该快照误触 'https://i.gkd.li/i/15416926', + 'https://i.gkd.li/i/15862131', ], }, { diff --git a/src/apps/com.maxhom.weibu.ts b/src/apps/com.maxhom.weibu.ts index e6933d2ab..a6a62f848 100644 --- a/src/apps/com.maxhom.weibu.ts +++ b/src/apps/com.maxhom.weibu.ts @@ -36,7 +36,9 @@ export default defineGkdApp({ { key: 2, name: '类型2-点击右侧X', - matches: ['[id="com.maxhom.weibu:id/anythink_myoffer_banner_close"]'], + matches: [ + '[id="com.maxhom.weibu:id/anythink_myoffer_banner_close"][visibleToUser=true]', + ], snapshotUrls: [ 'https://i.gkd.li/import/13702305', 'https://i.gkd.li/import/13702339', diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts index 4872134c7..6e5526543 100644 --- a/src/apps/com.tencent.mobileqq.ts +++ b/src/apps/com.tencent.mobileqq.ts @@ -40,10 +40,9 @@ export default defineGkdApp({ key: 0, name: '顶部横幅', matches: - 'ImageView n TextView[clickable=false][text.length>0][text!~="(?is).*([01]?[0-9]|2[0-3])[:：][0-5][0-9].*"] < [name$="ImageView"||name$="Button"][desc="关闭"||(desc=null&&text=null)][childCount=0][visibleToUser=true][clickable=true][longClickable!=true]', + 'ImageView[longClickable!=true] n TextView[clickable=false][text.length>0][text!~="(?is).*([01]?[0-9]|2[0-3])[:：][0-5][0-9].*"] < [name$="ImageView"||name$="Button"][desc="关闭"||(desc=null&&text=null)][childCount=0][visibleToUser=true][clickable=true][longClickable!=true][left>0]', excludeMatches: [ '[id^="com.tencent.mobileqq.qzone"]', // QQ空间 - '[vid="chat_item_head_icon"]', // 聊天界面头像 ], snapshotUrls: [ 'https://i.gkd.li/import/13426912', @@ -69,6 +68,7 @@ export default defineGkdApp({ 'https://i.gkd.li/i/14414585', // 误触 'https://i.gkd.li/i/15075866', // 误触 'https://i.gkd.li/i/15782476', // 误触 + 'https://i.gkd.li/i/15883390', // 误触 ], }, ], @@ -280,8 +280,10 @@ export default defineGkdApp({ desc: '自动点击登录。包括 PC 登录确认、QQ 互联登录确认。', quickFind: true, activityIds: [ + 'com.tencent.mobileqq.activity.SplashActivity', 'com.tencent.biz.qrcode.activity.QRLoginAuthActivity', 'com.tencent.mobileqq.activity.DevlockQuickLoginActivity', + 'com.tencent.mobileqq.activity.DevLockQuickVerifyActivity', 'com.tencent.open.agent.PublicFragmentActivityForOpenSDK', ], rules: [ @@ -295,6 +297,8 @@ export default defineGkdApp({ 'https://i.gkd.li/import/12789287', 'https://i.gkd.li/import/13063027', 'https://i.gkd.li/import/13166314', + 'https://i.gkd.li/i/15884502', + 'https://i.gkd.li/i/15884520', ], }, { diff --git a/src/apps/com.tencent.qqmusic.ts b/src/apps/com.tencent.qqmusic.ts index 92f0b9eb3..d9a1a3770 100644 --- a/src/apps/com.tencent.qqmusic.ts +++ b/src/apps/com.tencent.qqmusic.ts @@ -44,9 +44,8 @@ export default defineGkdApp({ }, { key: 5, - quickFind: true, matches: - '@ViewGroup[childCount=1][clickable=true] <2 [text="最近播放"]', + 'RecyclerView > LinearLayout[childCount=3] >5 ViewGroup[childCount=3] > @ViewGroup[clickable=true] >2 ImageView[text=null][desc=null]', snapshotUrls: 'https://i.gkd.li/i/15756931', }, ], diff --git a/src/apps/com.zmzx.college.search.ts b/src/apps/com.zmzx.college.search.ts index dc6abaf0b..28ee5f528 100644 --- a/src/apps/com.zmzx.college.search.ts +++ b/src/apps/com.zmzx.college.search.ts @@ -96,6 +96,11 @@ export default defineGkdApp({ matches: '[vid="iv_native_close"]', snapshotUrls: 'https://i.gkd.li/i/15527866', }, + { + key: 3, + matches: '@Image < View + View > View >n [text="广告"]', + snapshotUrls: 'https://i.gkd.li/i/15885694', + }, ], }, {