From c622482ec890ecab8b3078dd3b5139c82ce0d2ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 11 Feb 2020 14:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86BUG=20http://jira.zh?=
 =?UTF-8?q?idaohulian.com/projects/UI/issues/UI-181=3Ffilter=3Dmyopenissue?=
 =?UTF-8?q?s=20=E3=80=90=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86=E3=80=91ACCON?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=BD=93=E5=89=8D=E5=A4=84=E4=BA=8E=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=8D=A1=E7=89=87=E9=A1=B5=EF=BC=8C=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=E5=90=8E=EF=BC=8C=E5=8D=A1=E7=89=87=E9=83=BD?=
 =?UTF-8?q?=E4=BC=9A=E8=A2=AB=E9=80=89=E6=8B=A9=E4=B8=BA=E4=B8=80=E8=BE=86?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86=E7=9A=84=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E7=BC=A9=E6=94=BE=E5=9C=B0=E5=9B=BE=E4=B8=8D?=
 =?UTF-8?q?=E5=BA=94=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8D=A1=E7=89=87=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/service/marker/MapMarkerManager.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index 5bd0b5af82..98c8e1d520 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -46,6 +46,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
     private static final String TAG = "MarkerManager";
     // 第一次请求到地图的Marker数据
     private boolean isFirstMarker = true;
+    private boolean isOnLineCard = false;
     private Context mContext;
     private static IMogoMarker lastMarker;
     private static MapMarkerManager mMarkerManager;
@@ -81,6 +82,12 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
             public void onSwitched(int position, String moduleName) {
                 Logger.e(TAG, "======moduleName：" + moduleName);
                 highlightedMarker(moduleName);
+
+                if (moduleName.equals(ServiceConst.CARD_TYPE_USER_DATA)) {
+                    isOnLineCard = true;
+                } else {
+                    isOnLineCard = false;
+                }
             }
         });
     }
@@ -303,7 +310,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
 
                 try {
                     // 在ACC on 之后第一次获取到了在线车辆数据，选中最近的一个Marker
-                    if (isFirstMarker) {
+                    if (isFirstMarker && isOnLineCard) {
                         if (nearlyMogoMarker != null) {
 //                            getMogoCardManager().switch2(ServiceConst.CARD_TYPE_USER_DATA);
 //                            MarkerShowEntity markerShowEntity = (MarkerShowEntity) nearlyMogoMarker.getObject();