diff --git a/src/apps/com.alicloud.databox.ts b/src/apps/com.alicloud.databox.ts index 8d3ee36f8..44b843326 100644 --- a/src/apps/com.alicloud.databox.ts +++ b/src/apps/com.alicloud.databox.ts @@ -113,6 +113,7 @@ export default defineGkdApp({ { key: 5, name: '功能类-自动授权', + enable: false, desc: '包括扫码登录', actionMaximum: 1, resetMatch: 'app', @@ -129,6 +130,7 @@ export default defineGkdApp({ key: 6, name: '全屏广告-[容量使用超限]提示', desc: '点击关闭', + enable: false, quickFind: true, activityIds: 'com.alicloud.databox.MainActivity', rules: [ @@ -138,5 +140,21 @@ export default defineGkdApp({ }, ], }, + { + key: 7, + name: '局部广告-卡片广告', + quickFind: true, + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + activityIds: 'com.alicloud.databox.transferpage.TransferListActivity', + rules: [ + { + key: 0, + matches: '[vid="close"]', + snapshotUrls: 'https://i.gkd.li/i/15433289', + }, + ], + }, ], }); diff --git a/src/apps/com.jingdong.app.mall.ts b/src/apps/com.jingdong.app.mall.ts index 66aecf1d8..de059f5ef 100644 --- a/src/apps/com.jingdong.app.mall.ts +++ b/src/apps/com.jingdong.app.mall.ts @@ -102,13 +102,16 @@ export default defineGkdApp({ rules: [ { key: 0, - matches: 'FrameLayout > [desc="关闭"]', - snapshotUrls: 'https://i.gkd.li/import/13165721', + matches: '@FrameLayout[clickable=true] > [desc="关闭"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13165721', + 'https://i.gkd.li/i/15364514', + ], }, { key: 1, quickFind: true, - matches: '[vid="webview"] + [vid="close"][desc="关闭页面"]', + matches: '[vid="close"][desc="关闭页面"]', snapshotUrls: [ 'https://i.gkd.li/import/13218034', 'https://i.gkd.li/i/14927060', @@ -126,13 +129,13 @@ export default defineGkdApp({ }, { key: 3, - quickFind: true, activityIds: 'com.jingdong.app.mall.MainFrameActivity', - matches: 'RelativeLayout > ImageView[desc="关闭页面"]', + 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', ], }, { diff --git a/src/apps/com.tencent.mobileqq.ts b/src/apps/com.tencent.mobileqq.ts index 1b3a315c0..f4dcc33c1 100644 --- a/src/apps/com.tencent.mobileqq.ts +++ b/src/apps/com.tencent.mobileqq.ts @@ -14,20 +14,21 @@ export default defineGkdApp({ excludeActivityIds: [ 'com.tencent.mobileqq.activity.ChatActivity', // 在聊天界面禁用 'com.tencent.mobileqq.search.activity.UniteSearchActivity', // 在搜索页面禁用 - 'com.tencent.mobileqq.activity.SplashActivity', // 在聊天界面禁用 ], - rules: { - excludeMatches: '[vid="chat_item_content_layout"]', // 在聊天界面禁用 - matches: 'TextView[text^="跳过"][text.length<=10][vid!="title"]', - }, - snapshotUrls: [ - 'https://i.gkd.li/import/13062244', - 'https://i.gkd.li/import/13093155', - 'https://i.gkd.li/import/13207731', - 'https://i.gkd.li/import/13217807', // 避免在聊天界面误触 - 'https://i.gkd.li/import/13856647', // 误触 - 'https://i.gkd.li/import/13868177', // 误触 - 'https://i.gkd.li/import/14341023', // 误触 + rules: [ + { + excludeMatches: '[vid="root"]', // 在聊天界面禁用，若排除EditText[vid="input"]则滑动消息时会造成误触 + matches: 'TextView[text^="跳过"][text.length<=10][vid!="title"]', + snapshotUrls: [ + 'https://i.gkd.li/i/13093155', + 'https://i.gkd.li/i/13207731', + 'https://i.gkd.li/i/13217807', // 避免在聊天界面误触 + 'https://i.gkd.li/i/13856647', // 误触 + 'https://i.gkd.li/i/13868177', // 误触 + 'https://i.gkd.li/i/14341023', // 误触 + 'https://i.gkd.li/i/15334565', // 误触 + ], + }, ], }, { @@ -103,8 +104,14 @@ export default defineGkdApp({ ], }, { - preKeys: 0, key: 2, + matches: + 'FrameLayout[clickable=false] >2 @ImageView[text=null][visibleToUser=true] - FrameLayout[clickable=false][childCount=0]', + snapshotUrls: ['https://i.gkd.li/i/15388608'], + }, + { + preKeys: 0, + key: 10, quickFind: true, matches: '@[clickable=true] > * > ImageView + [text="隐藏此条动态"]', snapshotUrls: [ diff --git a/src/apps/com.tencent.qqmusic.ts b/src/apps/com.tencent.qqmusic.ts index b1b79a71e..8cece42ca 100644 --- a/src/apps/com.tencent.qqmusic.ts +++ b/src/apps/com.tencent.qqmusic.ts @@ -50,9 +50,9 @@ export default defineGkdApp({ { key: 0, name: '弹窗广告', + forcedTime: 5000, activityIds: 'com.tencent.qqmusic.activity.TranslucentWebViewActivity', - forcedTime: 5000, matches: 'View[id="js_close_btn"][desc="关闭"]', snapshotUrls: [ 'https://i.gkd.li/i/13115121', @@ -73,6 +73,17 @@ export default defineGkdApp({ 'https://i.gkd.li/i/15285647', ], }, + { + key: 2, + name: '签到弹窗', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', + activityIds: 'com.tencent.qqmusic.activity.AppStarterActivity', + matches: + '[id="android:id/content"] > FrameLayout > FrameLayout > ViewGroup[childCount=2] > ViewGroup > ViewGroup[clickable=true][childCount=0]', + snapshotUrls: 'https://i.gkd.li/i/15443191', + }, ], }, { diff --git a/src/apps/com.zmzx.college.search.ts b/src/apps/com.zmzx.college.search.ts index 0b7ed9828..3e2e35f8e 100644 --- a/src/apps/com.zmzx.college.search.ts +++ b/src/apps/com.zmzx.college.search.ts @@ -17,6 +17,7 @@ export default defineGkdApp({ 'com.bytedance.sdk.openadsdk.stub.activity.Stub_Standard_Portrait_Activity', 'com.bytedance.sdk.openadsdk.core.component.reward.activity.TTFullScreenVideoActivity', 'com.zmzx.college.search.activity.common.DialogWebActivity', + 'com.mercury.sdk.activity.InterstitialPortraitActivity', ], rules: [ { @@ -32,25 +33,47 @@ export default defineGkdApp({ }, { key: 1, - name: '字节广告-2', + name: '广告-2', quickFind: true, + matches: '[vid="iv_itr_close"]', + snapshotUrls: 'https://i.gkd.li/i/15360368', + }, + { + key: 2, + name: '广告-3', + matches: + 'ImageView - FrameLayout >3 FrameLayout[childCount=1] > ImageView', + snapshotUrls: 'https://i.gkd.li/i/15372979', + }, + { + key: 3, + name: '字节广告', matches: '@Image[text.length=0] < View +(3,5) View > View > TextView[text$="广告"]', snapshotUrls: [ 'https://i.gkd.li/import/13523288', 'https://i.gkd.li/i/14965922', 'https://i.gkd.li/i/15316457', + 'https://i.gkd.li/i/15442099', ], }, { - key: 2, - preKeys: [0, 1], + key: 4, + preKeys: [0, 1, 2, 3], name: '关闭开通会员免广告打扰弹窗', matches: '@TextView[text.length=0] [text*="免广告"]', snapshotUrls: ['https://i.gkd.li/i/15316467'], }, ], }, + { + key: 10, + name: '局部广告-信息流广告', + activityIds: + 'com.zmzx.college.search.activity.main.activity.MainActivity', + rules: 'ImageView < FrameLayout > FrameLayout[childCount=1] > ImageView', + snapshotUrls: 'https://i.gkd.li/i/15373051', + }, { key: 11, name: '局部广告-首页底部广告',