[dev_arch_opt_3.0]

[Change]
[
1、完成工控机数据和高德GPS地图数据的数据中心，以及工控机数据超时后的自动切换为高德地图GPS数据
定位监听已重构，CallerChassisLocationGCJ20ListenerManager---高的坐标系，CallerChassisLocationWGS84ListenerManager--高精坐标系，之前代码已修改，大家后续项目中根据需要进行订阅，如需控制频率可在订阅时
// 设置数据回调频率，单位HZ，1HZ的周期是1秒；50HZ的周期是1/50=0.02秒；10HZ的周期是1/10=0.1秒。
CallerChassisLocationWGS84ListenerManager.setListenerHz(Companion.functionName, 20)
CallerChassisLocationGCJ20ListenerManagersetListenerHz(Companion.functionName, 20)
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java

@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.business;
 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.map.CallerMapUIServiceManager;
@@ -13,8 +14,6 @@ import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import mogo.telematics.pad.MessagePad;
-
 /**
  * 限速
  *
@@ -24,7 +23,7 @@ public class SpeedLimitDataManager implements IMoGoChassisLocationGCJ02Listener
 
     private final static String TAG = "SpeedLimitDataManager";
     private static volatile SpeedLimitDataManager instance;
-    private MessagePad.GnssInfo mLocation;
+    private MogoLocation mLocation;
 
     private SpeedLimitDataManager() {
     }
@@ -41,7 +40,7 @@ public class SpeedLimitDataManager implements IMoGoChassisLocationGCJ02Listener
     }
 
     @Override
-    public void onChassisLocationGCJ02(@Nullable MessagePad.GnssInfo gnssInfo) {
+    public void onChassisLocationGCJ02(@Nullable MogoLocation gnssInfo) {
         mLocation = gnssInfo;
     }
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt

@@ -8,16 +8,18 @@ import com.mogo.cloud.passport.MoGoAiCloudClient
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
-import com.mogo.eagle.core.function.api.autopilot.*
+import com.mogo.eagle.core.data.map.MogoLocation
+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.*
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+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.map.CallerMapLocationListenerManager
+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
 import com.zhidaoauto.map.operational.open.GatherParams
 import com.zhidaoauto.map.operational.open.abs.OnTaskListener
-import mogo.telematics.pad.MessagePad.GnssInfo
 import record_cache.RecordPanelOuterClass
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
@@ -168,14 +170,14 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,
         }
     }
 
-    override fun onChassisLocationGCJ02(gnssInfo: GnssInfo?) {
+    override fun onChassisLocationGCJ02(gnssInfo: MogoLocation?) {
         val location = CallerMapLocationListenerManager.getCurrentLocation() ?: return
         executor.get()?.updateLocation(
             location.longitude,
             location.latitude,
             location.altitude,
-            location.bearing,
-            location.speed,
+            location.heading.toFloat(),
+            location.gnssSpeed,
             false)
     }
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java

@@ -5,6 +5,7 @@ import androidx.annotation.Nullable;
 
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
+import com.mogo.eagle.core.data.map.MogoLocation;
 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;
@@ -65,7 +66,7 @@ public class MogoRouteOverlayManager implements
     }
 
     @Override
-    public void onChassisLocationGCJ02(@Nullable MessagePad.GnssInfo gnssInfo) {
+    public void onChassisLocationGCJ02(@Nullable MogoLocation gnssInfo) {
         if (gnssInfo == null) {
             return;
         }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.kt

@@ -8,9 +8,10 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
-import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.map.CenterLine
+import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLamplightListener
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
 import com.mogo.eagle.core.function.api.map.hd.IMoGoMapFragmentProvider
 import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener
@@ -19,13 +20,12 @@ import com.mogo.eagle.core.function.business.SpeedLimitDataManager
 import com.mogo.eagle.core.function.business.identify.MapIdentifySubscriber
 import com.mogo.eagle.core.function.business.routeoverlay.MogoRouteOverlayManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showBrakeLight
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showTurnLight
 import com.mogo.eagle.core.function.call.map.CallerHDMapManager
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
-import com.mogo.eagle.core.function.datacenter.location.IMoGoLocationListener
-import com.mogo.eagle.core.function.datacenter.location.MoGoLocationManager
 import com.mogo.eagle.core.function.overview.InfStructureManager
 import com.mogo.eagle.core.function.overview.InfStructureManager.savePlanningData
 import com.mogo.eagle.core.function.overview.obtainViewModel
@@ -54,7 +54,7 @@ class MapFragment : MvpFragment<MapView?, MapPresenter?>(),
         MapView,
         IMoGoMapFragmentProvider,
         IMoGoSkinModeChangeListener,
-        IMoGoLocationListener,
+        IMoGoChassisLocationWGS84Listener,
         IMoGoPlanningRottingListener,
         IMoGoChassisLamplightListener {
 
@@ -114,7 +114,7 @@ class MapFragment : MvpFragment<MapView?, MapPresenter?>(),
         // 添加换肤监听
         CallerSkinModeListenerManager.addListener(Companion.functionName, this)
         CallerPlanningRottingListenerManager.addListener(Companion.functionName, this)
-        MoGoLocationManager.addListener(Companion.functionName, this)
+        CallerChassisLocationWGS84ListenerManager.addListener(Companion.functionName, this)
         CallerChassisLamplightListenerManager.addListener(Companion.functionName, this)
     }
 
@@ -218,7 +218,7 @@ class MapFragment : MvpFragment<MapView?, MapPresenter?>(),
     override fun onDestroyView() {
         CallerSkinModeListenerManager.removeListener(Companion.functionName)
         CallerPlanningRottingListenerManager.removeListener(Companion.functionName)
-        MoGoLocationManager.removeListener(Companion.functionName)
+        CallerChassisLocationWGS84ListenerManager.removeListener(Companion.functionName)
         CallerChassisLamplightListenerManager.removeListener(Companion.functionName)
 
         if (mMogoMapView != null) {
@@ -346,8 +346,8 @@ class MapFragment : MvpFragment<MapView?, MapPresenter?>(),
     private var isShowTurnLight = false
     private var brakeLight = -1
 
-    override fun onLocationChanged(gnssInfo: MessagePad.GnssInfo,sourceType: DataSourceType) {
-        // 跟新地图控件
+    override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
+        // 更新地图控件
         mMogoMapView?.setExtraGPSData(gnssInfo)
 
         if (gnssInfo != null) {
@@ -364,6 +364,7 @@ class MapFragment : MvpFragment<MapView?, MapPresenter?>(),
         }
     }
 
+
     override fun onAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch?) {
         //can数据转发  转向灯状态 0是正常 1是左转 2是右转
         if (lightSwitch != null) {

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/view/OverMapView.kt

@@ -19,9 +19,10 @@ import com.amap.api.maps.model.*
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.map.Infrastructure
+import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager.getGlobalPath
+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.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showVideoDialog
@@ -83,7 +84,7 @@ class OverMapView @JvmOverloads constructor(
     // 绘制轨迹线的集合
     private val textureList: MutableList<BitmapDescriptor?> = ArrayList()
     private val texIndexList: MutableList<Int> = ArrayList()
-    private var mLocation: MessagePad.GnssInfo? = null
+    private var mLocation: MogoLocation? = null
     private var isFirstLocation = true
     var mCustomMapStyleOptions: CustomMapStyleOptions? = null
     var currMarkerList: ArrayList<Marker>? = null
@@ -493,7 +494,7 @@ class OverMapView @JvmOverloads constructor(
      *
      * @param location
      */
-    private fun drawCarMarker(location: MessagePad.GnssInfo?) {
+    private fun drawCarMarker(location: MogoLocation?) {
         if (location == null) return
         if (mCarMarker != null) {
             val currentLatLng = LatLng(location.latitude, location.longitude)
@@ -568,7 +569,7 @@ class OverMapView @JvmOverloads constructor(
         }
     }
 
-    override fun onChassisLocationGCJ02(gnssInfo: MessagePad.GnssInfo?) {
+    override fun onChassisLocationGCJ02(gnssInfo: MogoLocation?) {
         mLocation = gnssInfo
         lonLat = Pair(gnssInfo!!.longitude, gnssInfo.latitude)
         drawCarMarker(gnssInfo)

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java

@@ -31,6 +31,7 @@ import com.amap.api.maps.model.Polyline;
 import com.amap.api.maps.model.PolylineOptions;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.Infrastructure;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
@@ -92,7 +93,7 @@ public class AMapCustomView
     private List<BitmapDescriptor> textureList = new ArrayList<>();
     private List<Integer> texIndexList = new ArrayList<>();
 
-    private MessagePad.GnssInfo mLocation;
+    private MogoLocation mLocation;
     private boolean isFirstLocation = true;
     CustomMapStyleOptions mCustomMapStyleOptions;
 
@@ -456,7 +457,7 @@ public class AMapCustomView
      *
      * @param location
      */
-    private void drawCarMarker(MessagePad.GnssInfo location) {
+    private void drawCarMarker(MogoLocation location) {
         if (location == null) return;
         if (mCarMarker != null) {
             LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude());
@@ -534,7 +535,7 @@ public class AMapCustomView
     }
 
     @Override
-    public void onChassisLocationGCJ02(@Nullable MessagePad.GnssInfo gnssInfo) {
+    public void onChassisLocationGCJ02(@Nullable MogoLocation gnssInfo) {
         mLocation = gnssInfo;
         MarkerDrawerManager.INSTANCE.setLonLat(new Pair(gnssInfo.getLongitude(), gnssInfo.getLatitude()));
         drawCarMarker(gnssInfo);

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/OverviewMapFragment.java

@@ -13,7 +13,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.function.overview.InfStructureManager;
@@ -117,7 +117,7 @@ public class OverviewMapFragment extends BaseFragment
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         // 主动查一次全局路径规划的数据
-        CallerAutoPilotManager.INSTANCE.getGlobalPath();
+        CallerAutoPilotControlManager.INSTANCE.getGlobalPath();
         queryV2XEvents();
     }
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java

@@ -32,6 +32,7 @@ import com.amap.api.maps.model.PolylineOptions;
 import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+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.map.R;
@@ -47,8 +48,6 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import mogo.telematics.pad.MessagePad;
-
 /**
  * 小地图的方向View
  *
@@ -75,7 +74,7 @@ public class SmallMapDirectionView
     private Polyline mPolyline;
     private CameraUpdate mCameraUpdate;
     private Context mContext;
-    private MessagePad.GnssInfo mLocation;
+    private MogoLocation mLocation;
 
     public SmallMapDirectionView(Context context) {
         this(context, null);
@@ -179,7 +178,7 @@ public class SmallMapDirectionView
     }
 
     @Override
-    public void onChassisLocationGCJ02(@Nullable MessagePad.GnssInfo gnssInfo) {
+    public void onChassisLocationGCJ02(@Nullable MogoLocation gnssInfo) {
         if (gnssInfo == null) {
             return;
         }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java

@@ -17,7 +17,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener;
 import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
 import com.mogo.eagle.core.function.map.R;
@@ -143,7 +143,7 @@ public class SmallMapFragment extends BaseFragment
             clearPolyline();
         }else if (tempStatus  == 1 && autoPilotStatus == 0){
             CallerLogger.INSTANCE.i(M_MAP + TAG, "onAutopilotStatusResponse:getGlobalPath");
-            CallerAutoPilotManager.INSTANCE.getGlobalPath();
+            CallerAutoPilotControlManager.INSTANCE.getGlobalPath();
         }
         autoPilotStatus = tempStatus;
     }