From 3d8a90417341289ca5b828d770b39721a789680b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 18 Apr 2024 15:23:26 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[=E5=AD=97=E4=BD=93=E8=B0=83=E6=95=B4?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/biz_login_passenger_view_1080x1920.xml | 4 ++-- .../main/res/layout/biz_login_passenger_view_1920x1080.xml | 4 ++-- .../main/res/layout/biz_login_passenger_view_2560x1600.xml | 4 ++-- .../src/main/java/com/mogo/och/facade/route/FacadeProvider.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml index 597527d807..9d1b213918 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml @@ -15,7 +15,7 @@ android:text="当前状态:连接司机屏中" android:textColor="@color/white" android:gravity="center" - android:textSize="@dimen/dp_36" + android:textSize="@dimen/dp_28" app:layout_constraintBottom_toTopOf="@+id/actv_app_version" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -28,7 +28,7 @@ android:gravity="center" android:text="版本号:6.4.0" android:textColor="@color/white" - android:textSize="@dimen/dp_36" + android:textSize="@dimen/dp_28" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml index 9059c48dfa..8659d2b5bf 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml @@ -15,7 +15,7 @@ app:layout_constraintBottom_toTopOf="@+id/actv_app_version" android:text="当前状态:连接司机屏中" android:textColor="@color/white" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/dp_24" android:gravity="end" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -29,7 +29,7 @@ android:layout_marginBottom="@dimen/dp_41" android:text="版本号:6.4.0" android:textColor="@color/white" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/dp_24" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml index 545a80ddc4..5d58ae60f1 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:text="当前状态:连接司机屏中" android:textColor="@color/white" - android:textSize="@dimen/dp_44" + android:textSize="@dimen/dp_26" app:layout_constraintBottom_toTopOf="@+id/actv_app_version" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_chainStyle="packed" @@ -27,7 +27,7 @@ android:layout_marginBottom="@dimen/dp_70" android:text="版本号:6.4.0" android:textColor="@color/white" - android:textSize="@dimen/dp_44" + android:textSize="@dimen/dp_26" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt index ee8d4acdf9..53f3a9b663 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt @@ -163,7 +163,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { onBusinessChange(businessEnum) val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager val fragment = getFragment() - + injectStatusBar() d(TAG, "切换 fragment:${fragment}") if (supportFragmentManager != null) {