From 4ff040f0a7f9240f9ff541c802c5fa2613fc1c78 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 11 Feb 2026 18:20:28 +0800 Subject: [PATCH] =?UTF-8?q?[8.4.0][=E4=B9=98=E5=AE=A2=E5=B1=8F]=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DB4=E5=88=86=E8=BE=A8=E7=8E=87=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=97=A5=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DB1=E5=BC=95=E7=94=A8=E4=BA=86B2=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/biz/login/LoginServiceManager.kt | 1 - .../main/res/b1/layout/shuttle_p_weak_jl_view_status_bar.xml | 2 +- .../passenger_weaknet/src/main/res/b1/values/colors.xml | 2 +- .../src/main/java/com/mogo/commons/screen/ScreenHelper.java | 5 +++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt index e3ade95a9e..f91f18d37b 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt @@ -474,7 +474,6 @@ object LoginServiceManager : IOchLanPassengerStatusListener { FunctionBuildConfig.appIdentityMode = "${product}_${identity}_${vehicle.code}" OchSPManager.putString(OCHVEHICLE,vehicle.code) ScreenHelper.setScreenConfig(AbsMogoApplication.getApp()) - //TODO 乘客屏竖屏未生效 if ((vehicle == Vehicle.B2 || vehicle == Vehicle.B4) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { BizLoopManager.runInMainThread{ val orientation = ActivityUtils.getTopActivity().resources.configuration.orientation diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_status_bar.xml index 86ff21ad38..224df17b4b 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_status_bar.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_status_bar.xml @@ -61,7 +61,7 @@ app:layout_constraintStart_toEndOf="@+id/scannerStateView" android:layout_marginStart="@dimen/dp_37" android:textSize="@dimen/dp_18" - android:textColor="@color/shuttle_p_m2_color_17417B" + android:textColor="@color/shuttle_p_jl_color_17417B" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/colors.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/colors.xml index 6620187e95..7d60e59614 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/colors.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/colors.xml @@ -20,5 +20,5 @@ #1F82FB #992D3E5F - + #17417B \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java index 94a773cf8d..9a7d9f63d1 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java @@ -25,8 +25,9 @@ public class ScreenHelper { ) { baseWidth = 1920; baseHeight = 1080; - } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && - AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))) { + } else if ((AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) + || AppIdentityModeUtils.isB4(FunctionBuildConfig.appIdentityMode)) + && AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))) { baseWidth = 1080; baseHeight = 1920; }