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; }