From 170ab7a0de280bdb8e518b47019938ac987c6568 Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Tue, 14 Dec 2021 14:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=82=B9marker=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4marker=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../routeoverlay/MogoRouteOverlayManager.java     |  5 -----
 .../service/routeoverlay/RouteOverlayDrawer.java  | 15 ++++++++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
index c5d43623e5..789355d013 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
@@ -1,7 +1,6 @@
 package com.mogo.module.service.routeoverlay;
 
 import android.content.Context;
-import android.location.Location;
 import android.util.Log;
 
 import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
@@ -14,10 +13,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
-import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.adas.IMogoAdasOCHCallback;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -80,7 +76,6 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener,
         for (AutopilotRouteInfo.RouteModels routeModel : routeList.getModels()) {
             latLngList.add(new MogoLatLng(routeModel.getLat(), routeModel.getLon()));
         }
-        Log.d(TAG2, "routeResult:" + latLngList.size());
         int listSize = latLngList.size();
         RouteOverlayDrawer.getInstance(mContext).addEndingMarker(latLngList.get(listSize - 1).lat,latLngList.get(listSize - 1).lon);
     }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
index 810bd3029d..6dfa56a8c2 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
@@ -5,15 +5,15 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.util.Log;
 
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.overlay.IMogoOverlayManager;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.utils.LocationUtils;
 import com.mogo.module.service.R;
 import com.mogo.utils.ColorUtils;
 
@@ -73,19 +73,22 @@ public class RouteOverlayDrawer {
 
     public void addEndingMarker(double lat,double lon){
         if (markderOptions == null){
-            markderOptions = new MogoMarkerOptions().
-                    set3DMode(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode())
+            markderOptions = new MogoMarkerOptions()
                     .matchOnRoadSide(true)
                     .gps(true)
                     .icon(endingBitmap)
                     .owner(markerType)
                     .anchor(0.5f, 0.5f)
+                    .scale(0.5f)
                     .zIndex(30001);
 //                .object(markerShowEntity)
         }
         markderOptions.latitude(lat).longitude(lon);
         Log.d("lianglihui","addEndingMarker-"+lat+":"+lon);
         endMarker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerType, markderOptions);
+        if (DebugConfig.isDebug()){
+            ToastUtils.showLong("绘制终点marker,"+lat+":"+lon);
+        }
     }
 
     public  void clearMogoRouteOverlay(){
@@ -98,9 +101,7 @@ public class RouteOverlayDrawer {
     }
 
     public void clearEndingMarker(){
-        if (endMarker != null){
-            endMarker.setVisible(false);
-        }
+        MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).removeMarkers(markerType);
     }