diff --git a/src/appDeprecatedKeys.ts b/src/appDeprecatedKeys.ts index 3a3d72f8..c7ced161 100644 --- a/src/appDeprecatedKeys.ts +++ b/src/appDeprecatedKeys.ts @@ -544,4 +544,9 @@ const appDeprecatedKeys: RawDeprecatedKeysSetting[] = [ name: '微博', deprecatedKeys: [10], }, + { + id: 'com.jingyao.easybike', + name: '哈啰', + deprecatedKeys: [11, 13, 14], + }, ]; diff --git a/src/apps/com.jingyao.easybike.ts b/src/apps/com.jingyao.easybike.ts index a980d141..861f1b73 100644 --- a/src/apps/com.jingyao.easybike.ts +++ b/src/apps/com.jingyao.easybike.ts @@ -5,6 +5,21 @@ export default defineGkdApp({ name: '哈啰', groups: [ // 预留 key 0-8 + { + key: 1, + name: '更新提示', + desc: '点击关闭', + quickFind: true, + actionMaximum: 1, + resetMatch: 'app', + rules: [ + { + activityIds: 'com.hellobike.atlas.business.portal.PortalActivity', + matches: '@ImageView + [vid="contentContainer"] >2 [text*="新版本"]', + snapshotUrls: 'https://i.gkd.li/i/16108173', + }, + ], + }, { key: 8, name: '权限提示-通知权限', @@ -15,7 +30,7 @@ export default defineGkdApp({ rules: '[text*="开启通知"] < FrameLayout + FrameLayout >2 [text="取消"]', snapshotUrls: [ 'https://i.gkd.li/i/13228735', - 'https://i.gkd.li/i/13402675', // activityIds: com.hellobike.atlas.business.portal.PortalActivity + 'https://i.gkd.li/i/13402675', ], }, { @@ -31,29 +46,46 @@ export default defineGkdApp({ }, { key: 10, - name: '全屏广告-应用内活动、弹窗广告(大部分)', - activityIds: [ - 'com.hellobike.ads.widget.insert.dialog.HBAdvertDialog', - 'com.hellobike.atlas.business.portal.PortalActivity', + name: '全屏广告-弹窗广告', + rules: [ + { + key: 0, + activityIds: [ + 'com.hellobike.ads.widget.insert.dialog.HBAdvertDialog', + 'com.hellobike.atlas.business.portal.PortalActivity', + ], + matches: + 'FrameLayout[id="com.jingyao.easybike:id/hbDialogLayout"] + ImageView[id="com.jingyao.easybike:id/actionDialogClose"][clickable=true]', + snapshotUrls: [ + 'https://i.gkd.li/i/12650028', + 'https://i.gkd.li/i/12650090', + 'https://i.gkd.li/i/13331231', + ], + }, + { + key: 1, + quickFind: true, + activityIds: + 'com.hellobike.evehicle.business.main.EVehicleHomeManagerActivity', + matches: + '[id="com.jingyao.easybike:id/lottie_view"] < ViewGroup + [id="com.jingyao.easybike:id/btn_close"]', + snapshotUrls: 'https://i.gkd.li/i/12650163', + }, + { + key: 2, + activityIds: 'com.alipay.mobile.nebulacore.ui.H5Activity', + matches: + '[text="订单完成"] >(2) View[childCount=2] > Image[id=null][clickable=true]', + snapshotUrls: 'https://i.gkd.li/i/12684673', + }, + { + key: 3, + name: '全屏广告-骑行卡-优惠券弹窗', + activityIds: 'com.hellobike.atlas.business.portal.PortalActivity', + matches: '[desc="去使用"] + Button[text=null][visibleToUser=true]', + snapshotUrls: 'https://i.gkd.li/i/12739316', + }, ], - rules: - 'FrameLayout[id="com.jingyao.easybike:id/hbDialogLayout"] + ImageView[id="com.jingyao.easybike:id/actionDialogClose"][clickable=true]', - snapshotUrls: [ - 'https://i.gkd.li/i/12650028', // 哈啰出行保弹窗 - 'https://i.gkd.li/i/12650090', // 账单查看弹窗 - 'https://i.gkd.li/i/13331231', // 骑行卡 atlas.business.portal.PortalActivity - ], - }, - { - key: 11, - name: '全屏广告-哈啰智能电动车-弹窗广告', - quickFind: true, - activityIds: [ - 'com.hellobike.evehicle.business.main.EVehicleHomeManagerActivity', - ], - rules: - '[id="com.jingyao.easybike:id/lottie_view"] < ViewGroup + [id="com.jingyao.easybike:id/btn_close"]', - snapshotUrls: 'https://i.gkd.li/i/12650163', }, { key: 12, @@ -64,21 +96,6 @@ export default defineGkdApp({ '@[id="com.jingyao.easybike:id/closeFloatArea"] + [id="com.jingyao.easybike:id/floatADContainer"]', snapshotUrls: 'https://i.gkd.li/i/12650071', }, - { - key: 13, - name: '全屏广告-骑行订单完成-弹窗广告', - activityIds: 'com.alipay.mobile.nebulacore.ui.H5Activity', - rules: - '[text="订单完成"] >(2) View[childCount=2] > Image[id=null][clickable=true]', - snapshotUrls: 'https://i.gkd.li/i/12684673', - }, - { - key: 14, - name: '全屏广告-骑行卡-优惠券弹窗', - activityIds: 'com.hellobike.atlas.business.portal.PortalActivity', - rules: '[desc="去使用"] + Button[text=null][visibleToUser=true]', - snapshotUrls: 'https://i.gkd.li/i/12739316', - }, { key: 15, quickFind: true,