From a7fcb0a8fca716edcd8959c813b26b147c5ace36 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 22 Jul 2024 16:59:31 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[ui]=20[ui=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt | 4 ++-- .../passenger/src/main/res/layout/taxi_p_base_fragment.xml | 1 + .../och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt | 4 ++-- .../src/main/res/layout/taxt_u_p_base_fragment.xml | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 3628846a00..a1751c1e0c 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -142,8 +142,8 @@ class TaxiPassengerBaseFragment() : romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rbv_setting_music.setShowOnlySetting(0) - lbv_go2_center.visibility = View.VISIBLE - lbv_go2_center.showOnlyCenter() + lbv_go2_center.visibility = View.GONE + //lbv_go2_center.showOnlyCenter() pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml index 7df67a0da3..559877c03a 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -152,6 +152,7 @@ android:layout_width="@dimen/dp_866" android:layout_height="@dimen/dp_467" android:visibility="gone" + android:layout_marginBottom="-28dp" app:layout_constraintBottom_toTopOf="@+id/bottom" app:layout_constraintStart_toStartOf="parent" /> diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt index e947b157c0..9fa29f07bb 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt @@ -161,8 +161,8 @@ class TaxiPassengerBaseFragment() : romaPView.updateVisible(false) romaDistanceView.visibility = View.GONE rbv_setting_music.setShowOnlySetting(0) - lbv_go2_center.visibility = View.VISIBLE - lbv_go2_center.showOnlyCenter() + lbv_go2_center.visibility = View.GONE + //lbv_go2_center.showOnlyCenter() pcnActionView.visibility = View.VISIBLE CallerHmiManager.showTrafficLightView() infoVideoView.visibility = View.GONE diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index 9051d1a9eb..0a80f8442f 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -197,6 +197,7 @@ android:layout_width="@dimen/dp_866" android:layout_height="@dimen/dp_467" android:visibility="gone" + android:layout_marginBottom="-28dp" app:layout_constraintBottom_toTopOf="@+id/bottom" app:layout_constraintStart_toStartOf="parent" /> @@ -241,7 +242,7 @@ android:id="@+id/aciv_xiaozhi_normal" android:layout_width="@dimen/dp_360" android:layout_height="@dimen/dp_360" - android:layout_marginEnd="@dimen/dp_60" + android:layout_marginBottom="@dimen/dp_m_30" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" />