[dev_arch_opt_3.0]

[Change] [ 1、彻底解决地图跳变问题，原因是因为位置转变GCJ02时候将经纬度设置回去了，从而引起位置异常 ] Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 20:57:49 +08:00
parent daf51c78ce
commit d8e2029fa5
32 changed files with 106 additions and 92 deletions
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java
@@ -5,7 +5,7 @@ import androidx.annotation.Nullable;
 import com.mogo.eagle.core.data.enums.DataSourceType;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -65,7 +65,7 @@ public class SpeedLimitDataManager implements IMoGoChassisLocationGCJ02Listener
    }

    public void start() {
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, this);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG, this);
        Timer mTimer = new Timer();
        mTimer.schedule(new SpeedTimerTask(), 3000, 1000);
    }
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt
@@ -13,7 +13,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.api.map.collect.IMoGoMapDataCollectProvider
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
 import com.zhidaoauto.map.operational.open.GatherApi
@@ -52,7 +52,7 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,

    override fun init(context: Context?) {

-        CallerChassisLocationGCJ20ListenerManager.addListener(TAG, this)
+        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
        CallerAutopilotRecordListenerManager.addListener(TAG, this)

        executor.set(context?.let {
@@ -77,7 +77,7 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,

    override fun onDestroy() {
        CallerLogger.d("$M_MAP$TAG", "--------- onDestroy --------")
-        CallerChassisLocationGCJ20ListenerManager.removeListener(TAG)
+        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
        CallerAutopilotRecordListenerManager.removeListener(TAG)
        executor.get()?.setOnTaskListener(null)
        listeners.clear()
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java
@@ -10,7 +10,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningTrajectoryListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningTrajectoryListenerManager;

 import org.jetbrains.annotations.NotNull;
@@ -43,7 +43,7 @@ public class MogoRouteOverlayManager implements
    public void init() {
        CallerPlanningTrajectoryListenerManager.INSTANCE.addListener(TAG, this);
        CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this);
-        CallerChassisLocationGCJ20ListenerManager.INSTANCE.addListener(TAG, this);
+        CallerChassisLocationGCJ02ListenerManager.INSTANCE.addListener(TAG, this);
    }

    public static MogoRouteOverlayManager getInstance() {
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
@@ -20,7 +20,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.getGlobalPath
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.view.R
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
@@ -44,7 +44,7 @@ class SmallMapView @JvmOverloads constructor(
    private var mCarMarker: Marker? = null
    private var mStartMarker: Marker? = null
    private var mEndMarker: Marker? = null
-    private val zoomLevel = 15
+    private val zoomLevel = 16
    private val mCoordinatesLatLng: MutableList<LatLng> = ArrayList()
    private var mPolyline: Polyline? = null
    private var mCameraUpdate: CameraUpdate? = null
@@ -155,7 +155,7 @@ class SmallMapView @JvmOverloads constructor(
        initAMapView()

        // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.addListener(TAG, 10,this)
+        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 10, this)
        CallerPlanningRottingListenerManager.addListener(TAG, this)
        CallerAutoPilotStatusListenerManager.addListener(TAG, this)
    }
@@ -343,7 +343,7 @@ class SmallMapView @JvmOverloads constructor(
    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
        // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.removeListener(TAG)
+        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
        CallerPlanningRottingListenerManager.removeListener(TAG)
        CallerAutoPilotStatusListenerManager.removeListener(TAG)
    }
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
@@ -24,7 +24,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
 import com.mogo.eagle.core.function.api.v2x.IFuncBizProvider
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.getGlobalPath
-import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.call.biz.CallerFuncBizListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showVideoDialog
@@ -146,7 +146,7 @@ class OverMapView @JvmOverloads constructor(
        CallerPlanningRottingListenerManager.addListener(TAG, moGoAutopilotPlanningListener)
        initAMapView(context)
        // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.addListener(TAG, this)
+        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
        //设置全览模式
        overLayerView?.setOnClickListener { displayCustomOverView() }
    }
@@ -372,7 +372,7 @@ class OverMapView @JvmOverloads constructor(
    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
        // 注册定位监听
-        CallerChassisLocationGCJ20ListenerManager.removeListener(TAG)
+        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
        CallerPlanningRottingListenerManager.removeListener(TAG)
    }