diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts index facdc8f1..0c6f8565 100644 --- a/src/appDeprecatedKeys.ts +++ b/src/appDeprecatedKeys.ts @@ -717,6 +717,11 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ name: '哔哩哔哩HD', deprecatedKeys: [1], }, + { + id: 'com.umetrip.android.msky.app', + name: '航旅纵横', + deprecatedKeys: [8], + }, ]; const map: Map = new Map(); diff --git a/src/apps/com.bankcomm.Bankcomm.ts b/src/apps/com.bankcomm.Bankcomm.ts index 76264149..0245d5e8 100644 --- a/src/apps/com.bankcomm.Bankcomm.ts +++ b/src/apps/com.bankcomm.Bankcomm.ts @@ -8,19 +8,15 @@ export default defineGkdApp({ key: 0, name: '全屏广告-弹窗广告', desc: '点击关闭', + matchTime: 10000, + actionMaximum: 1, + resetMatch: 'app', rules: [ { fastQuery: true, - activityIds: [ - 'com.bankcomm.module.biz.home.MainActivity', - 'com.hihonor.android.launcher.unihome.UniHomeLauncher', - ], - matches: '[vid="popup_ad_image"] [vid="popup_close"]', - snapshotUrls: [ - 'https://i.gkd.li/i/12671987', - 'https://i.gkd.li/i/12745293', - 'https://i.gkd.li/i/15046998', - ], + activityIds: 'com.bankcomm.module.biz.home.MainActivity', + matches: '[vid="popup_close"]', + snapshotUrls: 'https://i.gkd.li/i/15046998', }, ], }, diff --git a/src/apps/com.coolapk.market.ts b/src/apps/com.coolapk.market.ts index e757c414..60b3676f 100644 --- a/src/apps/com.coolapk.market.ts +++ b/src/apps/com.coolapk.market.ts @@ -90,7 +90,7 @@ export default defineGkdApp({ preKeys: [1], key: 2, name: '点击[不感兴趣]/[关闭]', - matches: '@[text="不感兴趣" || text="关闭"] [text*="广告"]', + matches: '[text="不感兴趣" || text="关闭"]', snapshotUrls: [ 'https://i.gkd.li/i/14959519', 'https://i.gkd.li/i/14964859', diff --git a/src/apps/com.ct.client.ts b/src/apps/com.ct.client.ts index fafeda2e..fa26ec47 100644 --- a/src/apps/com.ct.client.ts +++ b/src/apps/com.ct.client.ts @@ -91,7 +91,7 @@ export default defineGkdApp({ key: 1, fastQuery: true, activityIds: 'com.ct.client.activity.MainActivity', - matches: '[text^="开启消息通知"] [vid="ivClose"]', + matches: '[text^="开启消息通知"] - [vid="ivClose"]', snapshotUrls: 'https://i.gkd.li/i/15209597', }, ], diff --git a/src/apps/com.cyl.musiccy.ou.ts b/src/apps/com.cyl.musiccy.ou.ts index 56b283da..03362b96 100644 --- a/src/apps/com.cyl.musiccy.ou.ts +++ b/src/apps/com.cyl.musiccy.ou.ts @@ -53,6 +53,7 @@ export default defineGkdApp({ rules: [ { key: 0, + fastQuery: true, activityIds: [ 'com.cyl.musiccy.ou.MainActivity', 'com.ksf.yyx.MainActivity', @@ -68,12 +69,13 @@ export default defineGkdApp({ { key: 1, name: '快手广告-2', + fastQuery: true, activityIds: [ 'com.ksf.yyx.MainActivity', 'com.cyl.musiccy.ou.MainActivity', ], matches: - '[text="广告"] <2 ViewGroup -2 ViewGroup > @ViewGroup[clickable=true] > ImageView', + 'ImageView[childCount=0][text=null] < @ViewGroup[childCount=1][clickable=true][visibleToUser=true] < ViewGroup +n ViewGroup[childCount=2] > [text="广告"]', snapshotUrls: [ 'https://i.gkd.li/i/12775923', 'https://i.gkd.li/i/13800051', @@ -96,34 +98,29 @@ export default defineGkdApp({ { key: 3, name: '腾讯广告-1', + fastQuery: true, activityIds: [ 'com.ksf.yyx.MainActivity', 'com.android.internal.app.ResolverActivity', ], matches: - 'ImageView FrameLayout[index=1] > FrameLayout[index=2] > ImageView', + '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null][parent.childCount>3] +n FrameLayout >(1,2) [text^="立即" || text="查看详情" || text="了解更多" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', snapshotUrls: [ 'https://i.gkd.li/i/12775921', 'https://i.gkd.li/i/12776903', 'https://i.gkd.li/i/12789928', 'https://i.gkd.li/i/13215476', 'https://i.gkd.li/i/13071595', + 'https://i.gkd.li/i/13063249', ], }, - { - key: 4, - name: '腾讯广告-2', - activityIds: 'com.cyl.musiccy.ou.MainActivity', - matches: - 'ImageView FrameLayout[index=1] > ImageView', - snapshotUrls: 'https://i.gkd.li/i/13063249', - }, { key: 5, - name: '腾讯广告-3', + name: '腾讯广告-2', + fastQuery: true, activityIds: 'com.cyl.musiccy.ou.MainActivity', matches: - 'ImageView FrameLayout[index=0] > FrameLayout FrameLayout > ImageView', + '@ImageView[childCount=0][text=null][desc=null][id=null][visibleToUser=true][width<90 && height<90] < FrameLayout[childCount=1][text=null][desc=null][id=null] <2 FrameLayout[childCount=5] + FrameLayout[childCount=2] > [text^="立即" || text="查看详情" || text="了解更多" || text="去逛逛" || text="去微信看看" || text$="应用" || text="进入小程序" || text="领取优惠" || text="跳转微信"]', snapshotUrls: 'https://i.gkd.li/i/13422363', }, ], diff --git a/src/apps/com.dragon.read.ts b/src/apps/com.dragon.read.ts index 15fb141b..8cec5240 100644 --- a/src/apps/com.dragon.read.ts +++ b/src/apps/com.dragon.read.ts @@ -214,7 +214,7 @@ export default defineGkdApp({ fastQuery: true, activityIds: 'com.dragon.read.reader.ui.ReaderActivity', matches: - '@ImageView[clickable=true][visibleToUser=true] [text="领取限时福利"]', + '@ImageView[clickable=true][visibleToUser=true] +5 [text="领取限时福利"]', snapshotUrls: [ 'https://i.gkd.li/i/14430326', 'https://i.gkd.li/i/14969861', diff --git a/src/apps/com.eg.android.AlipayGphone.ts b/src/apps/com.eg.android.AlipayGphone.ts index 8c78f025..23258b7e 100644 --- a/src/apps/com.eg.android.AlipayGphone.ts +++ b/src/apps/com.eg.android.AlipayGphone.ts @@ -100,7 +100,10 @@ export default defineGkdApp({ rules: [ { key: 0, - matches: '[text="立即更新" || text="马上体验"] [text*="稍后"]', + matches: [ + '[text="立即更新" || text="马上体验"]', + '[text^="稍后"][text.length=4]', + ], snapshotUrls: [ 'https://i.gkd.li/i/13327095', 'https://i.gkd.li/i/15010554', diff --git a/src/apps/com.jingdong.app.mall.ts b/src/apps/com.jingdong.app.mall.ts index 7677e7a6..04dfce83 100644 --- a/src/apps/com.jingdong.app.mall.ts +++ b/src/apps/com.jingdong.app.mall.ts @@ -82,14 +82,18 @@ export default defineGkdApp({ name: '权限提示-通知权限', desc: '点击关闭', fastQuery: true, - //matchTime: 10000, 该弹窗可能在多个页面出现 + matchTime: 10000, actionMaximum: 1, resetMatch: 'app', rules: [ { key: 0, + activityIds: [ + '.MainFrameActivity', + 'com.jd.lib.message.messagecenter.view.activity.MessageCenterMainActivityNew', + ], matches: - '@ImageView[clickable=true][visibleToUser=true] [text="开启消息通知"]', + '@ImageView[clickable=true][visibleToUser=true] -(9,12) [text="开启消息通知"]', snapshotUrls: [ 'https://i.gkd.li/i/13917163', 'https://i.gkd.li/i/13463618', @@ -98,6 +102,8 @@ export default defineGkdApp({ }, { key: 1, + activityIds: + 'com.jd.lib.message.messagecenter.view.activity.MessageCenterMainActivityNew', matches: '@[clickable=true] + [text^="打开系统通知"]', snapshotUrls: 'https://i.gkd.li/i/12839865', }, diff --git a/src/apps/com.kuaishou.nebula.ts b/src/apps/com.kuaishou.nebula.ts index 160b11a4..0801ff2c 100644 --- a/src/apps/com.kuaishou.nebula.ts +++ b/src/apps/com.kuaishou.nebula.ts @@ -28,7 +28,8 @@ export default defineGkdApp({ key: 0, fastQuery: true, activityIds: 'com.yxcorp.gifshow.HomeActivity', - matches: '@[vid="close_btn"] [text="朋友推荐"]', + matches: + '[vid="popup_view" || vid="content_wrapper"] > [vid="close_btn"][visibleToUser=true]', snapshotUrls: [ 'https://i.gkd.li/i/14310639', 'https://i.gkd.li/i/15061832', @@ -45,7 +46,7 @@ export default defineGkdApp({ fastQuery: true, activityIds: 'com.yxcorp.gifshow.HomeActivity', matches: - '@ImageView[clickable=true] - ViewGroup[childCount=3] n [text*="红包"]', + '@ImageView[clickable=true] <(2,3) ViewGroup >(1,4) [text*="红包"]', exampleUrls: 'https://m.gkd.li/101449500/f7bbd1db-f519-4ff9-96cb-4cb5b2f483a2', snapshotUrls: [ diff --git a/src/apps/com.kugou.android.ts b/src/apps/com.kugou.android.ts index a05a0420..47e7511c 100644 --- a/src/apps/com.kugou.android.ts +++ b/src/apps/com.kugou.android.ts @@ -54,13 +54,12 @@ export default defineGkdApp({ fastQuery: true, activityIds: 'com.kugou.android.app.MediaActivity', matches: - 'TextView[text!=null] @ImageView[desc="关闭"][visibleToUser=true][clickable=true] < [text="广告"]', + matches: '@ImageView[clickable=true] - [text="广告"]', snapshotUrls: 'https://i.gkd.li/i/15520336', }, { diff --git a/src/apps/com.maxhom.weibu.ts b/src/apps/com.maxhom.weibu.ts index 63e42133..dbb14f84 100644 --- a/src/apps/com.maxhom.weibu.ts +++ b/src/apps/com.maxhom.weibu.ts @@ -6,7 +6,7 @@ export default defineGkdApp({ groups: [ { key: 3, - name: '分段广告-交友页面底部广告', + name: '局部广告-交友页面底部广告', activityIds: [ 'com.maxhom.weibu.tool.home.activity.NewMainActivity', 'com.maxhom.weibu.WelcomeActivity', @@ -14,9 +14,13 @@ export default defineGkdApp({ rules: [ { key: 0, - name: '类型1-点击右侧X', + fastQuery: true, + activityIds: [ + '.tool.home.activity.NewMainActivity', + '.WelcomeActivity', + ], matches: [ - 'TextView[text.length>0] < FrameLayout + FrameLayout > ImageView', + '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] <3 FrameLayout < FrameLayout < FrameLayout < FrameLayout < FrameLayout < FrameLayout < FrameLayout < [id="com.maxhom.weibu:id/flAd"][visibleToUser=true]', ], snapshotUrls: [ 'https://i.gkd.li/i/13377607', @@ -24,18 +28,11 @@ export default defineGkdApp({ 'https://i.gkd.li/i/13728552', ], }, - { - preKeys: 0, - key: 1, - name: '类型1-点击弹出窗口的X', - matches: - '[text.length>=2&&text.length<=6] ImageView', - snapshotUrls: ['https://i.gkd.li/i/13377611'], - }, { key: 2, - name: '类型2-点击右侧X', - matches: ['[id="com.maxhom.weibu:id/anythink_myoffer_banner_close"]'], + fastQuery: true, + activityIds: '.tool.home.activity.NewMainActivity', + matches: '[id="com.maxhom.weibu:id/anythink_myoffer_banner_close"]', snapshotUrls: [ 'https://i.gkd.li/i/13702305', 'https://i.gkd.li/i/13702339', @@ -47,19 +44,28 @@ export default defineGkdApp({ { key: 4, name: '全屏广告-漂流瓶页面提示弹窗', - fastQuery: true, - activityIds: [ - 'com.maxhom.weibu.tool.home.activity.ToolBottleActivity', - 'com.maxhom.weibu.tool.home.activity.NewMainActivity', - ], rules: [ { + key: 0, + fastQuery: true, + activityIds: [ + '.tool.home.activity.ToolBottleActivity', + '.tool.home.activity.NewMainActivity', + ], matches: '[id="com.maxhom.weibu:id/ivClose"]', snapshotUrls: [ 'https://i.gkd.li/i/13377649', 'https://i.gkd.li/i/13457015', ], }, + { + key: 1, + fastQuery: true, + activityIds: '.tool.home.activity.NewMainActivity', + matches: + '@ImageView[childCount=0][visibleToUser=true] < FrameLayout[childCount=1] + FrameLayout >2 [text="立即下载"]', + snapshotUrls: 'https://i.gkd.li/i/13377611', + }, ], }, { diff --git a/src/apps/com.mfcloudcalculate.networkdisk.ts b/src/apps/com.mfcloudcalculate.networkdisk.ts index d0ed20a2..d754882f 100644 --- a/src/apps/com.mfcloudcalculate.networkdisk.ts +++ b/src/apps/com.mfcloudcalculate.networkdisk.ts @@ -58,7 +58,7 @@ export default defineGkdApp({ activityIds: 'com.mfcloudcalculate.networkdisk.activity.EmptyActivity', matches: - 'ImageView < @ViewGroup[clickable=true] < ViewGroup [text="查看我的勋章"]', + matches: '@ImageView[clickable=true] +7 [text="查看我的勋章"]', exampleUrls: 'https://m.gkd.li/57941037/39e34e7d-eae3-4a54-9794-97c2528d13fb', snapshotUrls: 'https://i.gkd.li/i/14926750', diff --git a/src/apps/com.sankuai.meituan.ts b/src/apps/com.sankuai.meituan.ts index 053c3c26..60d626f7 100644 --- a/src/apps/com.sankuai.meituan.ts +++ b/src/apps/com.sankuai.meituan.ts @@ -189,7 +189,7 @@ export default defineGkdApp({ resetMatch: 'app', rules: [ { - matches: '@[vid="iv_close" || text="跳过"] [text^="开启通知"]', + matches: '@[vid="iv_close" || text="跳过"] -(1,2) [text^="开启通知"]', snapshotUrls: [ 'https://i.gkd.li/i/13439134', 'https://i.gkd.li/i/15047918', diff --git a/src/apps/com.tencent.qqmusic.ts b/src/apps/com.tencent.qqmusic.ts index d1c602c8..eec59dda 100644 --- a/src/apps/com.tencent.qqmusic.ts +++ b/src/apps/com.tencent.qqmusic.ts @@ -160,8 +160,10 @@ export default defineGkdApp({ desc: '点击X', rules: [ { + fastQuery: true, activityIds: 'com.tencent.qqmusiccommon.hybrid.HybridViewActivity', - matches: '@[desc="关闭按钮"] [desc^="看广告"]', + matches: + '@ViewGroup[desc="关闭按钮"] - [desc^="看广告"] <2 ViewGroup < ViewGroup < FrameLayout < FrameLayout < FrameLayout < [id="android:id/content"]', snapshotUrls: 'https://i.gkd.li/i/13806773', }, ], diff --git a/src/apps/com.umetrip.android.msky.app.ts b/src/apps/com.umetrip.android.msky.app.ts index 573e4f0d..179d8a31 100644 --- a/src/apps/com.umetrip.android.msky.app.ts +++ b/src/apps/com.umetrip.android.msky.app.ts @@ -4,15 +4,6 @@ export default defineGkdApp({ id: 'com.umetrip.android.msky.app', name: '航旅纵横', groups: [ - { - key: 8, - name: '全屏广告-弹窗广告', - fastQuery: true, - activityIds: 'com.ume.lib_weex.view.WeexActivity', - rules: - 'View[desc="立即预订"] ImageView[id=null]', - snapshotUrls: 'https://i.gkd.li/i/12909632', - }, { key: 9, name: '更新提示', diff --git a/src/apps/com.xunlei.downloadprovider.ts b/src/apps/com.xunlei.downloadprovider.ts index e8275a17..154a3673 100644 --- a/src/apps/com.xunlei.downloadprovider.ts +++ b/src/apps/com.xunlei.downloadprovider.ts @@ -328,7 +328,7 @@ export default defineGkdApp({ fastQuery: true, activityIds: 'com.xunlei.downloadprovider.frame.MainTabActivity', matches: - '[((text$="领取" || text^="立即") && text.length<5) || text^="此云盘为您的私人云盘"] [vid="close"]', + '[text="立即领取" || text="点击领取" || text^="此云盘为您的私人云盘"] + [vid="close"]', snapshotUrls: [ 'https://i.gkd.li/i/12882939', 'https://i.gkd.li/i/15048352', diff --git a/src/apps/com.zbx.ct.tvzhibo.ts b/src/apps/com.zbx.ct.tvzhibo.ts index 9a4da2e3..e5024178 100644 --- a/src/apps/com.zbx.ct.tvzhibo.ts +++ b/src/apps/com.zbx.ct.tvzhibo.ts @@ -19,8 +19,10 @@ export default defineGkdApp({ { key: 1, name: '腾讯SDK', + fastQuery: true, activityIds: 'com.tvmain.mvp.view.activity.TvMainActivity', - matches: '@ImageView < FrameLayout