From b3ad5f39ae4926ce063399b1179cb9f6236d9ad1 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 12 Apr 2022 10:36:11 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20=E5=88=A0=E9=99=A4=E9=94=81=E8=BD=A6?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=BA=9F=E5=BC=83=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../manager/impl/MoGoV2XMarkerManager.java    |  7 -----
 .../scene/road/V2XRoadEventMarker.java        |  7 -----
 .../route/V2XOptimalRouteVREventMarker.java   |  9 +-----
 .../uicontroller/IMogoMapUIController.java    | 14 ---------
 .../java/com/mogo/map/AMapViewWrapper.java    | 29 -------------------
 .../com/mogo/map/MogoMapUIController.java     | 22 --------------
 .../map/uicontroller/AMapUIController.java    | 18 ------------
 .../service/intent/MockIntentHandler.java     |  4 ---
 8 files changed, 1 insertion(+), 109 deletions(-)

diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java
index 186c522574..e96c9191e7 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java
@@ -22,13 +22,11 @@ import com.mogo.eagle.core.function.v2x.events.utils.EntityUtilsKt;
 import com.mogo.eagle.core.function.v2x.events.utils.MapUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ViewUtils;
-import com.mogo.map.MogoMapUIController;
 import com.mogo.map.MogoMarkerManager;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.drawer.MarkerDrawer;
 import com.mogo.module.common.drawer.marker.IMarkerView;
 import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
@@ -75,11 +73,6 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
             polylineManager.clearLine();
         }
         clearAlarmPOI();
-        // 锁车
-        IMogoMapUIController mapUiController = MogoMapUIController.getInstance();
-        if (mapUiController != null) {
-            mapUiController.recoverLockMode();
-        }
         V2XManager.INSTANCE.forceRefresh();
     }
 
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java
index 5a91d5d3a4..0b8fcd17fb 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java
@@ -4,8 +4,6 @@ import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi;
 import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XMarkerManager;
 import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XPolylineManager;
 import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
-import com.mogo.map.MogoMapUIController;
-import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
 
 /**
@@ -31,11 +29,6 @@ public class V2XRoadEventMarker implements IV2XMarker<V2XRoadEventEntity> {
 
     @Override
     public void clearPOI() {
-        // 锁车就是将地图视图移植中心点，因为行驶中的车和地图要相对的跟随
-        IMogoMapUIController mapUiController = MogoMapUIController.getInstance();
-        if (mapUiController != null) {
-            mapUiController.loseLockMode();
-        }
         // 移除线
         IMoGoV2XPolylineManager polyLineManager = BridgeApi.INSTANCE.v2xPolyline();
         if (polyLineManager != null) {
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/route/V2XOptimalRouteVREventMarker.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/route/V2XOptimalRouteVREventMarker.java
index dd668f95a9..3ca5bb86e1 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/route/V2XOptimalRouteVREventMarker.java
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/route/V2XOptimalRouteVREventMarker.java
@@ -2,14 +2,12 @@ package com.mogo.eagle.core.function.v2x.events.scenario.scene.route;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
 
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi;
 import com.mogo.eagle.core.function.v2x.events.entity.net.V2XOptimalRouteDataRes;
 import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XMarkerManager;
 import com.mogo.eagle.core.function.v2x.events.observer.V2XOptimalRouteObserver;
 import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
-import com.mogo.map.MogoMapUIController;
-import com.mogo.map.uicontroller.IMogoMapUIController;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 
 /**
  * author : donghongyu
@@ -41,11 +39,6 @@ public class V2XOptimalRouteVREventMarker implements IV2XMarker<V2XOptimalRouteD
 
     @Override
     public void clearPOI() {
-        // 锁车就是将地图视图移植中心点，因为行驶中的车和地图要相对的跟随
-        IMogoMapUIController mapUiController = MogoMapUIController.getInstance();
-        if (mapUiController != null) {
-            mapUiController.loseLockMode();
-        }
         // 移除线
         clearLine();
         // 绘制上次的数据
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
index e516559838..bd70815898 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
@@ -91,10 +91,6 @@ public interface IMogoMapUIController {
      */
     void showMyLocation(View view);
 
-    /**
-     * 强调自车位置，加个动画突显一下自车位置
-     */
-    void emphasizeMyLocation();
 
     /**
      * 以外部定位的方式改变当前位置
@@ -103,16 +99,6 @@ public interface IMogoMapUIController {
      */
     void changeMyLocation(Location location);
 
-    /**
-     * 锁车
-     */
-    void recoverLockMode();
-
-    /**
-     * 解锁锁车
-     */
-    void loseLockMode();
-
 
     /**
      * 获取比例尺数据
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
index 040e5a4f0d..b206f598ce 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
@@ -386,7 +386,6 @@ public class AMapViewWrapper implements IMogoMapView,
         if (DebugConfig.isDebug()) {
             CallerLogger.INSTANCE.d(TAG, Log.getStackTraceString(new Throwable()));
         }
-        loseLockMode();
         mMapView.getMapAutoViewHelper().animateCamera(new LonLatPoint(latLng.lon, latLng.lat));
     }
 
@@ -437,26 +436,6 @@ public class AMapViewWrapper implements IMogoMapView,
         }
     }
 
-    @Override
-    public void recoverLockMode() {
-        if (checkAMapView()) {
-            if (isVrMold()) {
-                return;
-            }
-            CallerLogger.INSTANCE.d(TAG, "锁车");
-            mMapView.getMapAutoViewHelper().setLockMode(true);
-        }
-    }
-
-    @Override
-    public void loseLockMode() {
-        if (isVrMold()) {
-            return;
-        }
-        CallerLogger.INSTANCE.d(TAG, "解锁锁车");
-        mMapView.getMapAutoViewHelper().setLockMode(false);
-    }
-
 
     @Override
     public float getScalePerPixel() {
@@ -558,9 +537,6 @@ public class AMapViewWrapper implements IMogoMapView,
         CallerLogger.INSTANCE.i(TAG, "showBounds : " + tag + " , " + carPosition.toString() + " , " + bound.toShortString() + " , " + lockCarPosition);
         try {
             LatLngBounds latLngBounds = MogoMapUtils.getLatLngBounds(carPosition, lonLats, lockCarPosition);
-            if (!lockCarPosition) {
-                loseLockMode();
-            }
             mMapView.getMapAutoViewHelper().setCenter(ObjectUtils.fromMogo(carPosition));
             mMapView.getMapAutoViewHelper().moveCamera(CameraUpdateFactory.INSTANCE.newLatLngBounds(latLngBounds, bound.left, bound.right, bound.top, bound.bottom));
         } catch (Exception e) {
@@ -852,11 +828,6 @@ public class AMapViewWrapper implements IMogoMapView,
         }
     }
 
-    @Override
-    public void emphasizeMyLocation() {
-
-    }
-
     @Override
     public void onChangeMapStyle(int styleId) {
         CallerLogger.INSTANCE.d(TAG, "currentMapStyle = " + styleId);
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
index fea8af115d..102a44b513 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
@@ -110,13 +110,6 @@ public class MogoMapUIController implements IMogoMapUIController {
         }
     }
 
-    @Override
-    public void emphasizeMyLocation() {
-        initDelegate();
-        if (mDelegate != null) {
-            mDelegate.emphasizeMyLocation();
-        }
-    }
 
     @Override
     public void showMyLocation(View view) {
@@ -126,21 +119,6 @@ public class MogoMapUIController implements IMogoMapUIController {
         }
     }
 
-    @Override
-    public void recoverLockMode() {
-        initDelegate();
-        if (mDelegate != null) {
-            mDelegate.recoverLockMode();
-        }
-    }
-
-    @Override
-    public void loseLockMode() {
-        initDelegate();
-        if (mDelegate != null) {
-            mDelegate.loseLockMode();
-        }
-    }
 
     @Override
     public float getScalePerPixel() {
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
index 20a9310941..1efbcc391d 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
@@ -103,20 +103,6 @@ public class AMapUIController implements IMogoMapUIController {
         }
     }
 
-    @Override
-    public void recoverLockMode() {
-        if (mClient != null) {
-            mClient.recoverLockMode();
-        }
-    }
-
-    @Override
-    public void loseLockMode() {
-        if (mClient != null) {
-            mClient.loseLockMode();
-        }
-    }
-
 
     @Override
     public float getScalePerPixel() {
@@ -285,10 +271,6 @@ public class AMapUIController implements IMogoMapUIController {
         return mClient.getCenterLineInfo(lon, lat, angle);
     }
 
-    @Override
-    public void emphasizeMyLocation() {
-
-    }
 
     @Override
     public void rtkEnable(boolean enable) {
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
index 93458d842d..6d9564632a 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
@@ -77,10 +77,6 @@ public class MockIntentHandler implements IntentHandler {
                     TipToast.shortTip(msg);
                 }
                 break;
-            case 8:// 测试修改车头角度
-                float bearing = intent.getFloatExtra("bearing", 0);
-                MogoMapUIController.getInstance().changeBearing(bearing);
-                break;
             case 9:// 测试弹窗
                 Activity activity = AppStateManager.INSTANCE.currentActivity();
                 if (activity != null) {