From c18576649a5a7a7ca54af07e829bb7400c9486e9 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Wed, 10 Nov 2021 14:42:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=89=8D=E5=BC=95=E5=AF=BC=E7=BA=BF?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E5=92=8C=E5=88=B0=E7=AB=99?= =?UTF-8?q?=E6=83=85=E5=86=B5=20=E6=B8=85=E9=99=A4=E8=BD=A6=E5=89=8D?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../routeoverlay/MogoRouteOverlayManager.java | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 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 af70510f37..d8e75da75f 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 @@ -4,6 +4,7 @@ import android.content.Context; import android.location.Location; import android.util.Log; +import com.mogo.eagle.core.data.autopilot.AdasOCHData; import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.map.MogoLatLng; @@ -12,16 +13,21 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListen 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 com.mogo.service.adas.IMogoAdasRouteCallBack; +import com.mogo.service.adas.IMogoAdasTrajectoryDataCallBack; +import com.mogo.service.adas.entity.ADASTrajectoryInfo; import java.util.ArrayList; import java.util.List; -public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2, IMoGoAutopilotPlanningListener { +public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2, IMoGoAutopilotPlanningListener,IMogoAdasOCHCallback { private static volatile MogoRouteOverlayManager sInstance; private Context mContext; private String TAG = "MogoRouteOverlayManager"; + private int STATUS_AUTOPILOT=0; - private MogoRouteOverlayManager(Context context) { + private MogoRouteOverlayManager(Context context){ mContext = context; } @@ -31,7 +37,9 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2 .getRegisterCenterApi() .registerCarLocationChangedListener("MogoRouteOverlayManager", this); CallerAutopilotPlanningListenerManager.INSTANCE.addListener("MogoRouteOverlayManager", this); - } + MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasOCHCallback(this); + + } public static MogoRouteOverlayManager getInstance(Context context) { if (sInstance == null) { @@ -97,4 +105,17 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2 Log.e(TAG, "routeResult:" + latLngList.size()); RouteOverlayDrawer.getInstance(mContext).putRouteList(latLngList); } + + @Override + public void onArriveAt(AdasOCHData data) { + RouteOverlayDrawer.getInstance(mContext).clearMogoRouteOverlay(); + } + + @Override + public void onStateChanged(int state, String reason) { + this.STATUS_AUTOPILOT = state; + if (state != IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING){ + RouteOverlayDrawer.getInstance(mContext).clearMogoRouteOverlay(); + } + } }