From 4763764874de985cf4476519b0f06fae689a3c02 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 28 Mar 2023 17:34:19 +0800 Subject: [PATCH] [need change info] --- .../sweeper/presenter/SweeperPresenter.java | 5 ---- .../identify/IdentifyOriginDataDrawer.kt | 4 --- .../main/java/com/mogo/map/AMapWrapper.java | 28 +------------------ 3 files changed, 1 insertion(+), 36 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java index fd65e3a805..62f18ec6e3 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java @@ -120,11 +120,6 @@ public class SweeperPresenter extends Presenter } - @Override - public void onAutopilotRouteLineId(long lineId) { - - } - @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { if (autopilotStatusInfo == null) return; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt index 4845bb7573..ee7b05a06f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt @@ -134,8 +134,4 @@ class IdentifyOriginDataDrawer : Identify { WarningHelper.clear() } - override fun getIdentifyObj(uuid: String): TrackedObject? { - return mMarkersCaches[uuid] - } - } \ No newline at end of file diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index cbe73fe4b4..c9cd8b2ffb 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -6,7 +6,6 @@ import android.graphics.Point; import android.util.Pair; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.map.center.CenterLine; import com.mogo.map.marker.AMapInfoWindowAdapter; @@ -40,7 +39,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; import mogo.telematics.pad.MessagePad; import mogo.yycp.api.proto.SocketDownData; @@ -136,25 +134,7 @@ public class AMapWrapper implements IMogoMap { return; } long time = markerOptionsArrayList.get(0).getTime(); - MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 0); - } - - @SuppressLint("NewApi") - @Override - public void updateBatchAiMarkerPosition(HashMap optionsArrayList) { - if (!checkAMap()) { - return; - } - ArrayList markerOptionsArrayList = new ArrayList<>(); - optionsArrayList.forEach((s, trackedObject) -> { - MarkerSimpleData markerOptions = ObjectUtils.fromAiData(trackedObject); - if (markerOptions != null) { - markerOptionsArrayList.add(markerOptions); - } - }); - long time = markerOptionsArrayList.get(0).getTime(); - //todo 最后一个参数,是否管理锚点的删除 - MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 0); + MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1); } @SuppressLint("NewApi") @@ -352,12 +332,6 @@ public class AMapWrapper implements IMogoMap { return null; } - @Override - public MogoLatLng switchLonLat(double lon, double lat) { - LonLatPoint lonLatPoint = MapTools.INSTANCE.switchLonLat(new LonLatPoint(lon,lat)); - return new MogoLatLng(lonLatPoint.latitude,lonLatPoint.longitude); - } - private List> convert(List points) { if (points == null || points.isEmpty()) { return Collections.emptyList();