diff --git a/gradle.properties b/gradle.properties index efc972d020..92b74cb437 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本, true - 依赖 maven 版本 -USE_MAVEN_PACKAGE=true +USE_MAVEN_PACKAGE=false ##plugin 插件 #android.enableR8.libraries=false #android.enableR8=false 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 145f531aa1..af70510f37 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 @@ -6,23 +6,20 @@ import android.util.Log; import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener; 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 java.util.ArrayList; import java.util.List; -public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2, IMoGoAutopilotPlanningListener, IMogoAdasOCHCallback { +public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2, IMoGoAutopilotPlanningListener { private static volatile MogoRouteOverlayManager sInstance; private Context mContext; private String TAG = "MogoRouteOverlayManager"; - private int STATUS_AUTOPILOT = 0; private MogoRouteOverlayManager(Context context) { mContext = context; @@ -34,7 +31,6 @@ 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) { @@ -101,17 +97,4 @@ public class MogoRouteOverlayManager implements IMogoCarLocationChangedListener2 Log.e(TAG, "routeResult:" + latLngList.size()); RouteOverlayDrawer.getInstance(mContext).putRouteList(latLngList); } - - @Override - public void onArriveAt(AutopilotStationInfo 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(); - } - } }