From 671db3ad8e21f17571e947bb6c9b4d8a200dab67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 3 Feb 2020 17:46:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5V2X=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=86=E5=88=B7=E6=96=B0=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/service/MarkerServiceHandler.java     | 8 ++++++--
 .../java/com/mogo/module/service/MogoServiceProvider.java | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
index 5d23263783..a4737dd9b1 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
@@ -65,6 +65,9 @@ public class MarkerServiceHandler {
 
     private static Context mContext;
 
+    // 第一次请求到地图的Marker数据
+    private static boolean isFirstMarker;
+
     public static void init(final Context context) {
         mContext = context;
         mMapService = (IMogoMapService) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_MAP).navigation(context);
@@ -91,7 +94,8 @@ public class MarkerServiceHandler {
             @Override
             public void onMsgReceived(MarkerResponse response) {
                 Logger.e(TAG, "======MarkerResponse：" + response);
-                if (!getMogoStatusManager().isSearchUIShow()) {
+                if (!getMogoStatusManager().isSearchUIShow() && !getMogoStatusManager().isV2XShow()) {
+                    isFirstMarker=true;
                     drawMapMarker(response);
                 }
             }
@@ -279,7 +283,7 @@ public class MarkerServiceHandler {
                     markerCardResult.getDataType().contains(ServiceConst.CARD_TYPE_USER_DATA)) {
                 getMarkerManager().removeMarkers(ServiceConst.CARD_TYPE_USER_DATA);
                 getMogoCardManager().switch2(ServiceConst.CARD_TYPE_USER_DATA);
-                
+
             } else {
                 // 清空所有地图上绘制的Marker
                 getMarkerManager().removeMarkers();
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
index 4d4af9c687..877b30b30b 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
@@ -235,6 +235,7 @@ public class MogoServiceProvider implements IMogoModuleProvider,
         mStatusManager = ( IMogoStatusManager ) ARouter.getInstance().build( MogoServicePaths.PATH_STATUS_MANAGER ).navigation( context );
         mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.USER_INTERACTED, this );
         mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.SEARCH_UI, this );
+        mStatusManager.registerStatusChangedListener( ServiceConst.TYPE, StatusDescriptor.V2X_UI, this );
 
         //TODO 初始化地图地图绘制大而全的Marker
         MarkerServiceHandler.init( mContext );
@@ -521,6 +522,7 @@ public class MogoServiceProvider implements IMogoModuleProvider,
                 }
                 break;
             case SEARCH_UI:
+            case V2X_UI:
                 if ( isTrue ) {
                     // 搜索时，不在自动刷新打点策略
                     stopAutoRefreshStrategy();