From 99f646a8e1a40090261f63fe018362ded4958c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 24 Sep 2020 11:19:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E9=97=B4=E7=9A=84=E4=BA=92=E6=96=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/module/v2x/V2XServiceManager.java  | 6 ++++++
 .../mogo/module/v2x/scenario/impl/V2XScenarioManager.java | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
index a8d0ffe1ac..f4723af8fb 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
@@ -30,6 +30,7 @@ import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.service.statusmanager.IMogoStatusManager;
+import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
 import com.mogo.service.share.IMogoTanluProvider;
 import com.mogo.service.windowview.IMogoTopViewManager;
@@ -76,6 +77,7 @@ public class V2XServiceManager {
     private static IMogoADASController mIMogoADASController;
     private static IMogoIntentManager mMogoIntentManager;
     private static IMogoEntranceButtonController mMogoEntranceButtonController;
+    private static IMogoOnlineCarListPanelProvider mMogoOnlineCarListPanelProvider;
 
     private static V2XRefreshModel mV2XRefreshModel;
     private static V2XMarkerService mV2XMarkerService;
@@ -113,6 +115,7 @@ public class V2XServiceManager {
             mIMogoMarkerService = mMogoServiceApis.getMarkerService();
             mIMogoShareManager = mMogoServiceApis.getShareManager();
             mIMogoTanluProvider = mMogoServiceApis.getTanluApi();
+            mMogoOnlineCarListPanelProvider = mMogoServiceApis.getOnlineCarPanelApi();
 
             mMarkerManager = mMapService.getMarkerManager(context);
             mNavi = mMapService.getNavi(context);
@@ -265,4 +268,7 @@ public class V2XServiceManager {
     }
 
 
+    public static IMogoOnlineCarListPanelProvider getMogoOnlineCarListPanelProvider() {
+        return mMogoOnlineCarListPanelProvider;
+    }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
index 029ffe5284..ff3371997a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
@@ -5,8 +5,6 @@ import android.content.Intent;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XRoadEventEntity;
-import com.mogo.module.service.carinfo.CarStateInfo;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.IV2XScenarioManager;
@@ -62,6 +60,12 @@ public class V2XScenarioManager implements IV2XScenarioManager {
             V2XUtils.runOnUiThread(() -> {
                 // 提取之前存储的场景
                 if (v2XMessageEntity != null) {
+                    try {
+                        // 与其它面板互斥
+                        V2XServiceManager.getMogoOnlineCarListPanelProvider().hidePanel();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
 
                     // 广播给应用内部其它模块
                     Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION);