From 3eeb66bf91eac0811ba72b6cc0cf6cb624d199c3 Mon Sep 17 00:00:00 2001 From: yakunyang Date: Fri, 7 Jun 2024 17:41:30 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.4]=20[bugfix]=20=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E5=B1=8F=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/login/ui/LoginPassengerFragment.kt | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt index a6d8462e5a..7fff757cc9 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt @@ -38,30 +38,13 @@ class LoginPassengerFragment : MvpFragment() override fun getLayoutId(): Int { - if(DeviceUtils.isLenovoModel()){ - if (ScreenUtils.getScreenWidth()==2560) { - return R.layout.biz_login_passenger_view_2560x1600 - }else{ - if(ScreenUtils.getScreenWidth()==1920||ScreenUtils.getScreenHeight()==1920){ - if(ScreenUtils.isLandscape()){// 横屏 - return R.layout.biz_login_passenger_view_1920x1080 - } - if(ScreenUtils.isPortrait()){// 竖屏 - return R.layout.biz_login_passenger_view_1080x1920 - } - }else{ - return R.layout.biz_login_passenger_view_2560x1600 - } - } - }else if(DeviceUtils.isEB5Model()){ - if(ScreenUtils.isLandscape()){// 横屏 - return R.layout.biz_login_passenger_view_1920x1080 - } - if(ScreenUtils.isPortrait()){// 竖屏 - return R.layout.biz_login_passenger_view_1080x1920 - } - }else if(DeviceUtils.isEmulator()){ - return R.layout.biz_login_passenger_view_2560x1600 + + if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))) { + return R.layout.biz_login_passenger_view_1920x1080 + } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))) { + return R.layout.biz_login_passenger_view_1080x1920 } return R.layout.biz_login_passenger_view_2560x1600