[Change]

删除锁车相关废弃逻辑 Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-04-12 10:36:11 +08:00
parent 1ad955ae36
commit b3ad5f39ae
8 changed files with 1 additions and 109 deletions
--- 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();
    }

--- 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) {
--- 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();
        // 绘制上次的数据
--- 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();
-

    /**
     * 获取比例尺数据
--- 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);
--- 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() {
--- 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) {
--- 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) {