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 carChatList = markerCardResult.getCarChat(); List onlineCarList = markerCardResult.getOnlineCar(); List exploreWayList = null; List 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);