From 30edccf509ffc14dc174201902d9cc3185c688fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 21 Feb 2020 23:30:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86bug=20=E3=80=90?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86=E3=80=91=E6=AF=8F=E6=AC=A1?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=EF=BC=8C=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E9=83=BD=E4=BC=9A=E9=80=89=E6=8B=A9=E4=B8=80?=
 =?UTF-8?q?=E8=BE=86=E8=BD=A6=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BD=86=E6=98=AF?=
 =?UTF-8?q?=E8=BF=99=E8=BE=86=E8=BD=A6=E6=A0=B9=E6=9C=AC=E4=B8=8D=E5=9C=A8?=
 =?UTF-8?q?=E5=91=A8=E8=BE=B9=EF=BC=8CACCON=E5=90=8E=E5=BA=94=E5=BD=93?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=9F=90=E4=B8=80?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=9A=84=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=EF=BC=8C=E6=88=96=E8=80=85=E9=80=89=E5=8F=96?=
 =?UTF-8?q?=E6=9C=80=E8=BF=91=E8=BD=A6=E8=BE=86=E7=9A=84=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8D=A1=E7=89=87=E4=B9=9F=E8=A1=8C=20http:/?=
 =?UTF-8?q?/jira.zhidaohulian.com/browse/UI-372=3Fjql=3Dproject%20%3D%20UI?=
 =?UTF-8?q?%20AND%20assignee%20in%20(donghongyu)%20ORDER%20BY%20priority%2?=
 =?UTF-8?q?0DESC%2C%20updated%20DESC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/service/marker/MapMarkerManager.java   | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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 2dc8d3121c..ea942b3c3f 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
@@ -20,7 +20,6 @@ import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.marker.MogoMarkersHandler;
-import com.mogo.module.common.entity.MarkerCarChat;
 import com.mogo.module.common.entity.MarkerCardResult;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
@@ -58,7 +57,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
     private static final String TAG = "MapMarkerManager";
     // 第一次请求到地图的Marker数据
     private boolean isFirstMarker = true;
-    private boolean isOnLineCard = false;
     private static Context mContext;
     private static IMogoMarker lastMarker;
     private static MapMarkerManager mMarkerManager;
@@ -100,17 +98,15 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
             public void onSwitched(int position, String moduleName) {
                 Logger.e(TAG, "======moduleName：" + moduleName);
                 highlightedMarker(moduleName, false);
-
-                if (moduleName.equals(ServiceConst.CARD_TYPE_USER_DATA)) {
-                    isOnLineCard = true;
-                } else {
-                    isOnLineCard = false;
-                }
                 mLastHighLightModule = moduleName;
             }
         });
     }
 
+    // ACC ON 的时候重置为true
+    public void setFirstMarker(boolean firstMarker) {
+        isFirstMarker = firstMarker;
+    }
 
     /**
      * 地图上的Marker点击回调
@@ -375,7 +371,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
                 }
             }
 
-            List<MarkerCarChat> carChatList = markerCardResult.getCarChat();
             List<MarkerOnlineCar> onlineCarList = markerCardResult.getOnlineCar();
             List<MarkerExploreWay> exploreWayList = null;
             List<MarkerShareMusic> shareMusicList = null;
@@ -517,7 +512,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
 
             try {
                 // 在ACC on 之后第一次获取到了在线车辆数据，选中最近的一个Marker
-                if (isFirstMarker && isOnLineCard) {
+                if (isFirstMarker) {
                     if (nearlyMogoMarker != null) {
                         Logger.w(TAG, "ACC ON,或者语音搜索触发，默认选中最近的在线车辆nearlyMogoMarker：" + nearlyMogoMarker);
                         onMarkerClicked(nearlyMogoMarker);