From 8baf40b070db55882e298fa222dba9583355930e Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 6 Sep 2023 17:45:59 +0800
Subject: [PATCH] [6.0.0] fix roma distance ui

---
 .../mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt   | 4 ++++
 .../passenger/src/main/res/layout/taxi_p_base_fragment.xml    | 1 +
 .../mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt   | 4 ++++
 .../src/main/res/layout/taxi_p_base_fragment.xml              | 1 +
 4 files changed, 10 insertions(+)

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 314f7ecf5c..132dabc09a 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
@@ -97,8 +97,10 @@ class TaxiPassengerBaseFragment() :
                         ck_setting.visibility = View.VISIBLE
                         if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
                             romaPView.visibility = View.VISIBLE
+                            romaDistanceView.visibility = View.VISIBLE
                         } else {
                             romaPView.visibility = View.GONE
+                            romaDistanceView.visibility = View.GONE
                         }
                         rv_location_center.visibility = View.VISIBLE
                         pcnActionView.visibility = View.VISIBLE
@@ -112,6 +114,7 @@ class TaxiPassengerBaseFragment() :
                         presenter?.setItineraryVisibility()
                         ck_setting.visibility = View.VISIBLE
                         romaPView.visibility = View.GONE
+                        romaDistanceView.visibility = View.GONE
                         rv_location_center.visibility = View.VISIBLE
                         pcnActionView.visibility = View.VISIBLE
                         CallerHmiManager.showTrafficLightView()
@@ -125,6 +128,7 @@ class TaxiPassengerBaseFragment() :
                         ck_setting.visibility = View.GONE
                         ck_setting.isChecked = false
                         romaPView.visibility = View.GONE
+                        romaDistanceView.visibility = View.GONE
                         rv_location_center.visibility = View.GONE
                         pcnActionView.visibility = View.GONE
                         CallerHmiManager.hideTrafficLightView()
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 ca0b168ed1..130c9703b4 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
@@ -85,6 +85,7 @@
         app:roma_open="@drawable/taxi_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"
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index e87c375d9b..71c42538b5 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -95,8 +95,10 @@ class TaxiPassengerBaseFragment() :
                         ck_setting.visibility = View.VISIBLE
                         if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
                             romaPView.visibility = View.VISIBLE
+                            romaDistanceView.visibility = View.VISIBLE
                         } else {
                             romaPView.visibility = View.GONE
+                            romaDistanceView.visibility = View.GONE
                         }
                         rv_location_center.visibility = View.VISIBLE
                         pcnActionView.visibility = View.VISIBLE
@@ -110,6 +112,7 @@ class TaxiPassengerBaseFragment() :
                         presenter?.setItineraryVisibility()
                         ck_setting.visibility = View.VISIBLE
                         romaPView.visibility = View.GONE
+                        romaDistanceView.visibility = View.GONE
                         rv_location_center.visibility = View.VISIBLE
                         pcnActionView.visibility = View.VISIBLE
                         CallerHmiManager.showTrafficLightView()
@@ -123,6 +126,7 @@ class TaxiPassengerBaseFragment() :
                         ck_setting.visibility = View.GONE
                         ck_setting.isChecked = false
                         romaPView.visibility = View.GONE
+                        romaDistanceView.visibility = View.GONE
                         rv_location_center.visibility = View.GONE
                         pcnActionView.visibility = View.GONE
                         CallerHmiManager.hideTrafficLightView()
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 4d18993fe7..7054f8eeb8 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -80,6 +80,7 @@
         app:roma_open="@drawable/taxi_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"