From 64a2f4d7220e6db0c18206b8e230f68a604c6959 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 30 Nov 2023 16:04:57 +0800
Subject: [PATCH] [6.2.0] fix bug of ui roma passenger view

---
 .../taxi/passenger/ui/TaxiPassengerBaseFragment.kt  |  8 ++++----
 .../function/hmi/ui/widget/RomaPassengerView.kt     | 13 +++++++++++++
 .../core/function/call/map/CallerMapRomaListener.kt |  4 ++++
 3 files changed, 21 insertions(+), 4 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 a56f90b4ab..c4c8e3cb1c 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
@@ -84,10 +84,10 @@ class TaxiPassengerBaseFragment() :
                         presenter?.setItineraryVisibility()
                         ck_setting.visibility = View.VISIBLE
                         if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
-                            romaPView.visibility = View.VISIBLE
+                            romaPView.updateVisible(true)
                             romaDistanceView.visibility = View.VISIBLE
                         } else {
-                            romaPView.visibility = View.GONE
+                            romaPView.updateVisible(false)
                             romaDistanceView.visibility = View.GONE
                         }
                         rv_location_center.visibility = View.VISIBLE
@@ -101,7 +101,7 @@ class TaxiPassengerBaseFragment() :
                         mapBizView.visibility = View.GONE
                         presenter?.setItineraryVisibility()
                         ck_setting.visibility = View.VISIBLE
-                        romaPView.visibility = View.GONE
+                        romaPView.updateVisible(false)
                         romaDistanceView.visibility = View.GONE
                         rv_location_center.visibility = View.VISIBLE
                         pcnActionView.visibility = View.VISIBLE
@@ -115,7 +115,7 @@ class TaxiPassengerBaseFragment() :
                         presenter?.setItineraryVisibility()
                         ck_setting.visibility = View.GONE
                         ck_setting.isChecked = false
-                        romaPView.visibility = View.GONE
+                        romaPView.updateVisible(false)
                         romaDistanceView.visibility = View.GONE
                         rv_location_center.visibility = View.GONE
                         pcnActionView.visibility = View.GONE
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt
index 5b2c84060c..bcf61a42a9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt
@@ -78,6 +78,19 @@ class RomaPassengerView @JvmOverloads constructor(
         }
     }
 
+    /**
+     * 外部调用visible时进行判断
+     */
+    fun updateVisible(visible: Boolean){
+        if(visible){
+            if(CallerMapRomaListener.isRange()){
+                this.visibility = View.VISIBLE
+            }
+        }else{
+            this.visibility = View.GONE
+        }
+    }
+
     override fun romaStatus(status: Boolean) {
         ThreadUtils.runOnUiThread {
             click = true
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRomaListener.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRomaListener.kt
index 2907c5190d..981f15440b 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRomaListener.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRomaListener.kt
@@ -59,4 +59,8 @@ object CallerMapRomaListener : CallerBase<IMoGoRomaListener>() {
         }
     }
 
+    fun isRange():Boolean{
+        return romaRange
+    }
+
 }
\ No newline at end of file