From fe6278bfa417369f10e1769a57f69bafd339ee35 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Sun, 27 Apr 2025 17:00:24 +0800
Subject: [PATCH] =?UTF-8?q?[8.0.0]Taxi=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=BC=AB=E6=B8=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/TaxiPassengerBaseFragment.kt | 17 -------------
 .../res/layout/taxt_u_p_base_fragment.xml     | 25 -------------------
 2 files changed, 42 deletions(-)

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 19514d6100..1545626b05 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
@@ -42,8 +42,6 @@ import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.light_setting
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mHomeView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mv_music_info
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.overMapView
-import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.romaDistanceView
-import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.romaPView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.speedView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.voice_setting
 
@@ -144,13 +142,6 @@ class TaxiPassengerBaseFragment :
                         mHomeView.visibility = View.VISIBLE
                         presenter?.setItineraryVisibility()
                         speedView.visibility = View.VISIBLE
-                        if (DeviceUtils.isLeOrEb5Model()) {
-                            romaPView.updateVisible(true)
-                            romaDistanceView.visibility = View.VISIBLE
-                        } else {
-                            romaPView.updateVisible(false)
-                            romaDistanceView.visibility = View.GONE
-                        }
                         lbv_go2_center.visibility = View.VISIBLE
                         lbv_go2_center.showAngle()
                         CallerHmiManager.showTrafficLightView()
@@ -164,8 +155,6 @@ class TaxiPassengerBaseFragment :
                         mHomeView.visibility = View.GONE
                         presenter?.setItineraryVisibility()
                         speedView.visibility = View.VISIBLE
-                        romaPView.updateVisible(false)
-                        romaDistanceView.visibility = View.GONE
                         lbv_go2_center.visibility = View.GONE
                         //lbv_go2_center.showOnlyCenter()
                         CallerHmiManager.showTrafficLightView()
@@ -180,8 +169,6 @@ class TaxiPassengerBaseFragment :
                         presenter?.setItineraryVisibility()
                         speedView.visibility = View.GONE
                         lbv_go2_center.visibility = View.GONE
-                        romaPView.updateVisible(false)
-                        romaDistanceView.visibility = View.GONE
                         CallerHmiManager.hideTrafficLightView()
                         infoVideoView.visibility = View.VISIBLE
                         mv_music_info.visibility = View.GONE
@@ -194,8 +181,6 @@ class TaxiPassengerBaseFragment :
                         presenter?.setItineraryVisibility()
                         speedView.visibility = View.GONE
                         lbv_go2_center.visibility = View.GONE
-                        romaPView.updateVisible(false)
-                        romaDistanceView.visibility = View.GONE
                         CallerHmiManager.hideTrafficLightView()
                         infoVideoView.visibility = View.GONE
                         mv_music_info.visibility = View.VISIBLE
@@ -391,8 +376,6 @@ class TaxiPassengerBaseFragment :
         allAnimator.addAll(aniBottomBar(isShow))
 
         allAnimator.addAll(aniSpeedSettingRow(isShow,speedView))
-        allAnimator.addAll(aniSpeedSettingRow(isShow,romaPView))
-        allAnimator.addAll(aniSpeedSettingRow(isShow,romaDistanceView))
 
         allAnimator.addAll(aniOrderInfo(isShow))
         animatorSet.playTogether(allAnimator)
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 7e0045748a..7a1617e1a4 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
@@ -49,31 +49,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
-    <!--  漫游按钮  -->
-    <com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
-        android:id="@+id/romaPView"
-        android:layout_width="@dimen/dp_120"
-        android:layout_height="@dimen/dp_120"
-        android:layout_marginStart="@dimen/dp_60"
-        android:layout_marginTop="110dp"
-        android:background="@drawable/taxt_u_p_roma_bg_selector"
-        app:layout_constraintStart_toEndOf="@+id/speedView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roma_close="@drawable/taxt_u_p_roma_bg_selector"
-        app:roma_open="@drawable/taxt_u_p_roma_checked" />
-
-    <com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
-        android:id="@+id/romaDistanceView"
-        android:layout_width="@dimen/dp_334"
-        android:layout_height="@dimen/dp_120"
-        android:layout_marginStart="@dimen/dp_50"
-        android:layout_marginTop="110dp"
-        app:roma_distance_bg="@drawable/taxi_u_p_roma_distance_bg"
-        app:layout_constraintLeft_toRightOf="@+id/romaPView"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roma_change_dis_color="true" />
-
     <!--  红绿灯  -->
     <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
         android:id="@+id/traffic_light_view"