From 7027c1c5d020a8441a9ae9b4f591df186b08ccf7 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, 10 Jan 2020 12:05:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E7=82=B9=E5=87=BBMa?=
 =?UTF-8?q?rker=E5=88=87=E6=8D=A2=E6=A0=B7=E5=BC=8F=E7=9A=84=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/service/MarkerServiceHandler.java  | 31 +++++--------------
 1 file changed, 7 insertions(+), 24 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 87bd704ff0..c9805ebbef 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
@@ -24,7 +24,6 @@ import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.service.connection.IMogoSocketManager;
 import com.mogo.service.imageloader.IMogoImageloader;
 import com.mogo.service.map.IMogoMapService;
-import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 
 import java.util.List;
@@ -115,7 +114,7 @@ public class MarkerServiceHandler {
 
         @Override
         public boolean onMarkerClicked(IMogoMarker marker) {
-            TipToast.shortTip("点击了大而全中的Marker");
+            Logger.e(TAG, "点击了大而全中的Marker");
             if (lastMarker != null) {
                 MapMarkerView mapMarkerView = new MapMarkerView(mContext);
 
@@ -129,12 +128,13 @@ public class MarkerServiceHandler {
                 newMarker.setInfoWindowAdapter(markerInfoWindowAdapter);
                 newMarker.setOnMarkerClickListener(mogoMarkerClickListener);
                 newMarker.setObject(lastMarker.getObject());
+
+                lastMarker.destroy();
             }
 
-            lastMarker = marker;
 
+            //
             MapMarkerInfoView mapMarkerInfoView = new MapMarkerInfoView(mContext);
-
             MogoMarkerOptions options = new MogoMarkerOptions()
                     .icon(mapMarkerInfoView)
                     .owner(marker.getOwner())
@@ -146,6 +146,8 @@ public class MarkerServiceHandler {
             newMarker.setOnMarkerClickListener(mogoMarkerClickListener);
             newMarker.setObject(marker.getObject());
 
+            lastMarker = newMarker;
+            marker.destroy();
             return false;
         }
     }
@@ -222,32 +224,13 @@ public class MarkerServiceHandler {
                                      Object bindObject,
                                      MarkerLocation markerLocation) {
         Logger.e(TAG, "绘制Marker====markerTag：" + markerTag);
-
         MapMarkerView mapMarkerView = new MapMarkerView(mContext);
-        MapMarkerInfoView mapMarkerInfoView = new MapMarkerInfoView(mContext);
 
         MogoMarkerOptions options = new MogoMarkerOptions()
                 .owner(markerTag)
                 .latitude(markerLocation.getLat())
                 .longitude(markerLocation.getLon());
-
-        switch (markerTag) {
-            case ServiceConst.CARD_TYPE_CARS_CHATTING:
-                options.icon(mapMarkerView);
-                break;
-            case ServiceConst.CARD_TYPE_ROAD_CODITION:
-                options.icon(mapMarkerView);
-                break;
-            case ServiceConst.CARD_TYPE_SHARE_MUSIC:
-                options.icon(mapMarkerView);
-                break;
-            case ServiceConst.CARD_TYPE_USER_DATA:
-                options.icon(mapMarkerInfoView);
-                break;
-            default:
-                options.icon(mapMarkerView);
-                break;
-        }
+        options.icon(mapMarkerView);
 
         IMogoMarker marker = getMarkerManager().addMarker(markerTag, options);
         marker.setInfoWindowAdapter(markerInfoWindowAdapter);