From d171b1b3340a0bba25a8d733faee96c19c35c05f Mon Sep 17 00:00:00 2001
From: EmArrow <zhongchao@zhidaoauto.com>
Date: Thu, 11 Jul 2024 17:27:21 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=20=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=97=B6=E4=B8=BB=E5=8A=A8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/eagle/core/function/view/RoadCrossRoamView.kt    | 5 +++++
 .../call/hmi/CallerHmiViewControlListenerManager.kt       | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
index 20dd985f2d..68fcbc5caf 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
@@ -18,6 +18,7 @@ import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener
+import com.mogo.eagle.core.function.call.autopilot.CallerV2nNioEventListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager
 import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager
@@ -134,6 +135,10 @@ class RoadCrossRoamView @JvmOverloads constructor(
             }
             return
         }
+        if(CallerHmiViewControlListenerManager.getMainPageVisible()){
+            CallerLogger.d("$M_MAP$TAG", "attachView return , mainPageVisible is false")
+            return
+        }
         bringToFront()
         CallerMapIdentifyManager.roam = Pair(TAG, true)
         this.visibility = View.VISIBLE
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiViewControlListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiViewControlListenerManager.kt
index b7c75a371b..3066041cc2 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiViewControlListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiViewControlListenerManager.kt
@@ -1,5 +1,6 @@
 package com.mogo.eagle.core.function.call.hmi
 
+import android.view.View
 import android.view.ViewGroup
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotActionsListenerManager
@@ -12,6 +13,8 @@ import com.mogo.eagle.core.function.call.base.CallerBase
  */
 object CallerHmiViewControlListenerManager : CallerBase<IViewControlListener>() {
 
+    private var mainPageVisible = true
+
     /**
      * 触发 view 显示隐藏
      * @param v 显示/隐藏状态
@@ -21,12 +24,17 @@ object CallerHmiViewControlListenerManager : CallerBase<IViewControlListener>()
     }
 
     fun invokeMainPageViewVisible(v: Int) {
+        mainPageVisible = (v == View.VISIBLE)
         M_LISTENERS.forEach {
             val listener = it.value
             listener.mainPageViewVisible(v)
         }
     }
 
+    fun getMainPageVisible(): Boolean {
+        return mainPageVisible
+    }
+
     fun setStatusBarDarkOrLight(tag: String, light: Boolean) {
         M_LISTENERS[tag]?.setStatusBarDarkOrLight(light)
     }