下沉经纬度公用信息实体

Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-17 17:40:45 +08:00
parent b8b5cf29a7
commit 4556727d23
185 changed files with 241 additions and 270 deletions
--- a/OCH/mogo-och-bus/build.gradle
+++ b/OCH/mogo-och-bus/build.gradle
@@ -56,6 +56,8 @@ dependencies {
        implementation project(":foudations:mogo-utils")
        implementation project(":foudations:mogo-commons")
        implementation project(":modules:mogo-module-common")
+        implementation project(':core:mogo-core-data')
+
    }
 }

--- a/OCH/mogo-och-noop/build.gradle
+++ b/OCH/mogo-och-noop/build.gradle
@@ -48,6 +48,8 @@ dependencies {
        implementation project(":OCH:mogo-och")
        implementation project(":foudations:mogo-utils")
        implementation project(":foudations:mogo-commons")
+        implementation project(':core:mogo-core-data')
+
    }
 }

--- a/OCH/mogo-och-taxi/build.gradle
+++ b/OCH/mogo-och-taxi/build.gradle
@@ -52,6 +52,7 @@ dependencies {
        implementation project(":foudations:mogo-utils")
        implementation project(":foudations:mogo-commons")
        implementation project(":modules:mogo-module-common")
+        implementation project(':core:mogo-core-data')
    }
 }

--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -9,7 +9,7 @@ import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.data.BaseData;
 import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.constants.HostConst;
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOverlayManager.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOverlayManager.java
@@ -2,7 +2,7 @@ package com.mogo.och.taxi;

 import android.content.Context;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.overlay.IMogoOverlayManager;
 import com.mogo.map.overlay.IMogoPolyline;
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
@@ -8,7 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;

 import com.mogo.cloud.commons.utils.CoordinateUtils;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.map.overlay.MogoPolylineOptions;
--- a/OCH/mogo-och/build.gradle
+++ b/OCH/mogo-och/build.gradle
@@ -50,6 +50,8 @@ dependencies {
        implementation project(":foudations:mogo-utils")
        implementation project(":foudations:mogo-commons")
        implementation project(":modules:mogo-module-common")
+        implementation project(':core:mogo-core-data')
+
    }
 }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
@@ -12,7 +12,7 @@ import android.widget.FrameLayout
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.map.navi.IMogoCarLocationChangedListener2
 import com.mogo.module.common.MogoApisHandler
 import com.mogo.service.IMogoServiceApis
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java
@@ -1,4 +1,4 @@
-package com.mogo.map;
+package com.mogo.eagle.core.data.map;

 import android.os.Parcel;
 import android.os.Parcelable;
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/model/V2XThreatIndInfo.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/model/V2XThreatIndInfo.kt
@@ -34,11 +34,11 @@ class V2XThreatIndInfo {
 //    /**
 //     * Wgs84坐标系，线性经纬度轨迹列表
 //     */
-//    private val locus_list: List<com.mogo.map.MogoLatLng>? = null
+//    private val locus_list: List<com.mogo.eagle.core.data.map.MogoLatLng>? = null
 //
 //    /**
 //     * 高德坐标系Gcj，线性经纬度轨迹列表
 //     */
-//    private val gd_locus_list: List<com.mogo.map.MogoLatLng>? = null
+//    private val gd_locus_list: List<com.mogo.eagle.core.data.map.MogoLatLng>? = null

 }
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
@@ -34,7 +34,7 @@ import com.amap.api.navi.enums.AMapNaviViewShowMode;
 import com.amap.api.navi.model.NaviInfo;
 import com.mogo.map.IMogoMap;
 import com.mogo.map.IMogoMapView;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.hook.BnHooker;
 import com.mogo.map.impl.amap.marker.AMapMarkerWrapper;
 import com.mogo.map.impl.amap.message.AMapMessageListener;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java
@@ -29,7 +29,7 @@ import com.amap.api.maps.model.animation.TranslateAnimation;
 import com.amap.api.navi.model.NaviInfo;
 import com.mogo.map.IMogoMap;
 import com.mogo.map.IMogoMapView;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.hook.BnHooker;
 import com.mogo.map.impl.amap.marker.AMapMarkerWrapper;
 import com.mogo.map.impl.amap.message.AMapMessageListener;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java
@@ -18,7 +18,7 @@ import com.amap.api.maps.model.animation.TranslateAnimation;
 import com.amap.api.maps.utils.overlay.MovingPointOverlay;
 import com.autonavi.amap.mapcore.IPoint;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.AMapWrapper;
 import com.mogo.map.impl.amap.utils.ObjectUtils;
 import com.mogo.map.marker.IMogoInfoWindowAdapter;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AMapNaviListenerAdapter.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AMapNaviListenerAdapter.java
@@ -17,7 +17,7 @@ import com.amap.api.navi.model.NaviInfo;
 import com.autonavi.tbt.TrafficFacilityInfo;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.utils.logger.Logger;
 import java.util.List;

--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/CalculatePathItem.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/CalculatePathItem.java
@@ -7,7 +7,7 @@ import com.amap.api.maps.AMap;
 import com.amap.api.navi.model.AMapNaviPath;
 import com.amap.api.navi.model.AMapNaviStep;
 import com.amap.api.navi.model.NaviLatLng;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.overlay.RouteOverLayWrapper;

 import java.util.ArrayList;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
@@ -13,7 +13,7 @@ import com.amap.api.navi.model.AMapNaviPath;
 import com.amap.api.navi.model.NaviLatLng;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.AMapWrapper;
 import com.mogo.map.impl.amap.message.AMapMessageManager;
 import com.mogo.map.impl.amap.utils.ObjectUtils;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java
@@ -13,7 +13,7 @@ import com.amap.api.navi.model.AMapNaviCameraInfo;
 import com.amap.api.navi.model.AMapNaviLocation;
 import com.amap.api.navi.model.NaviInfo;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.AMapWrapper;
 import com.mogo.map.impl.amap.message.AMapMessageManager;
 import com.mogo.map.impl.amap.utils.ObjectUtils;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java
@@ -18,7 +18,7 @@ import com.amap.api.navi.model.AMapNaviLocation;
 import com.amap.api.navi.model.AMapNaviPath;
 import com.amap.api.navi.model.NaviInfo;
 import com.amap.api.navi.model.NaviLatLng;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.AMapWrapper;
 import com.mogo.map.impl.amap.R;
 import com.mogo.map.impl.amap.overlay.RouteOverLayWrapper;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/AMapPolylineWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/AMapPolylineWrapper.java
@@ -3,7 +3,7 @@ package com.mogo.map.impl.amap.overlay;
 import com.amap.api.maps.model.LatLng;
 import com.amap.api.maps.model.Polyline;
 import com.amap.api.maps.model.PolylineOptions;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.utils.ObjectUtils;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverlayHelper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverlayHelper.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import com.amap.api.services.core.LatLonPoint;
 import com.amap.api.services.route.DriveRouteResult;
 import com.amap.api.services.route.RouteSearch;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.AMapWrapper;
 import com.mogo.map.impl.amap.InterceptorHandler;
 import com.mogo.utils.logger.Logger;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java
@@ -10,7 +10,7 @@ import com.amap.api.services.route.DriveStep;
 import com.amap.api.services.route.RideRouteResult;
 import com.amap.api.services.route.RouteSearch;
 import com.amap.api.services.route.WalkRouteResult;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.amap.utils.ObjectUtils;
 import com.mogo.map.search.drive.IMogoRoadSearch;
 import com.mogo.map.search.drive.IMogoRoadSearchListener;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/TrafficSearchClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/TrafficSearchClient.java
@@ -8,7 +8,7 @@ import com.amap.api.services.traffic.TrafficStatusEvaluation;
 import com.amap.api.services.traffic.TrafficStatusInfo;
 import com.amap.api.services.traffic.TrafficStatusResult;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.search.traffic.IMogoTrafficSearch;
 import com.mogo.map.search.traffic.IMogoTrafficSearchListener;
 import com.mogo.map.search.traffic.MogoTrafficResult;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java
@@ -6,7 +6,7 @@ import android.location.Location;
 import android.view.View;
 import android.view.animation.Interpolator;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.uicontroller.CarCursorOption;
 import com.mogo.map.uicontroller.EnumMapUI;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/CoordinateConvertUtils.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/CoordinateConvertUtils.java
@@ -4,7 +4,7 @@ import android.content.Context;

 import com.amap.api.maps.CoordinateConverter;
 import com.amap.api.maps.model.LatLng;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.ArrayList;
 import java.util.List;
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MogoMapUtils.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MogoMapUtils.java
@@ -2,7 +2,7 @@ package com.mogo.map.impl.amap.utils;

 import com.amap.api.maps.model.LatLng;
 import com.amap.api.maps.model.LatLngBounds;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.exception.MogoMapException;
 import com.mogo.utils.logger.Logger;

--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java
@@ -38,7 +38,7 @@ import com.amap.api.services.poisearch.PoiResult;
 import com.amap.api.services.poisearch.PoiSearch;
 import com.amap.api.services.poisearch.SubPoiItem;
 import com.amap.api.services.road.Crossroad;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarkerIconViewCreator;
 import com.mogo.map.marker.MogoMarkerOptions;
--- a/libraries/map-autonavi/build.gradle
+++ b/libraries/map-autonavi/build.gradle
@@ -39,6 +39,7 @@ dependencies {
        implementation project(':foudations:mogo-commons')
        implementation project(':services:mogo-service-api')

+        implementation project(':core:mogo-core-data')
    }
 }

--- a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java
+++ b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java
@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.graphics.Rect;
 import android.location.Location;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.map.navi.MogoCalculatePath;
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -61,6 +61,7 @@ dependencies {
        implementation project(':foudations:mogo-utils')
        implementation project(':libraries:mogo-map-api')
        implementation project(':foudations:mogo-commons')
+        implementation project(':core:mogo-core-data')
    }
    implementation rootProject.ext.dependencies.mogocustommap
 }
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -25,7 +25,7 @@ import com.mogo.commons.constants.SharedPrefsConstants;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.map.IMogoMap;
 import com.mogo.map.IMogoMapView;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.custom.location.GpsTester;
 import com.mogo.map.impl.custom.navi.NaviClient;
 import com.mogo.map.impl.custom.utils.MogoMapUtils;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java
@@ -6,9 +6,8 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.animation.Interpolator;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.custom.utils.ObjectUtils;
-import com.mogo.map.impl.custom.utils.ResIdCache;
 import com.mogo.map.marker.IMogoInfoWindowAdapter;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/CalculatePathItem.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/CalculatePathItem.java
@@ -7,7 +7,7 @@
 //import com.amap.api.navi.model.AMapNaviPath;
 //import com.amap.api.navi.model.AMapNaviStep;
 //import com.amap.api.navi.model.NaviLatLng;
-//import com.mogo.map.MogoLatLng;
+//import com.mogo.eagle.core.data.map.MogoLatLng;
 //import com.mogo.map.impl.custom.overlay.RouteOverLayWrapper;
 //
 //import java.util.ArrayList;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviClient.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviClient.java
@@ -10,25 +10,19 @@ import android.location.Location;
 //import com.amap.api.navi.enums.AimLessMode;
 //import com.amap.api.navi.enums.NaviType;
 //import com.amap.api.navi.model.NaviLatLng;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.custom.AMapWrapper;
-import com.mogo.map.impl.custom.message.AMapMessageManager;
-import com.mogo.map.impl.custom.utils.ObjectUtils;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.map.navi.MogoCalculatePath;
 import com.mogo.map.navi.MogoCarLocationChangedListenerRegister;
 import com.mogo.map.navi.MogoNaviConfig;
-import com.mogo.map.navi.MogoNaviListenerHandler;
 import com.mogo.map.navi.OnCalculatePathItemClickInteraction;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.storage.SharedPrefsMgr;
 import com.zhidaoauto.map.sdk.open.poyline.Polyline;
 import com.zhidaoauto.map.sdk.open.view.MapAutoViewHelper;

-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;

 /**
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviListenerAdapter.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviListenerAdapter.java
@@ -14,7 +14,7 @@
 //import com.amap.api.navi.model.AMapNaviLocation;
 //import com.amap.api.navi.model.NaviInfo;
 //import com.mogo.commons.voice.AIAssist;
-//import com.mogo.map.MogoLatLng;
+//import com.mogo.eagle.core.data.map.MogoLatLng;
 //import com.mogo.map.impl.custom.message.AMapMessageManager;
 //import com.mogo.map.impl.custom.utils.ObjectUtils;
 //import com.mogo.map.navi.MogoCalculatePath;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviOverlayHelper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviOverlayHelper.java
@@ -19,7 +19,7 @@
 //import com.amap.api.navi.model.AMapNaviPath;
 //import com.amap.api.navi.model.NaviInfo;
 //import com.amap.api.navi.model.NaviLatLng;
-//import com.mogo.map.MogoLatLng;
+//import com.mogo.eagle.core.data.map.MogoLatLng;
 //import com.mogo.map.impl.custom.R;
 //import com.mogo.map.impl.custom.overlay.RouteOverLayWrapper;
 //import com.mogo.map.marker.MogoMarkersHandler;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/AMapPolylineWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/AMapPolylineWrapper.java
@@ -1,7 +1,7 @@
 package com.mogo.map.impl.custom.overlay;


-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.impl.custom.utils.ObjectUtils;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/RouteOverlayHelper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/RouteOverlayHelper.java
@@ -5,7 +5,7 @@
 //import com.amap.api.services.core.LatLonPoint;
 //import com.amap.api.services.route.DriveRouteResult;
 //import com.amap.api.services.route.RouteSearch;
-//import com.mogo.map.MogoLatLng;
+//import com.mogo.eagle.core.data.map.MogoLatLng;
 //import com.mogo.map.impl.custom.AMapWrapper;
 //import com.mogo.map.impl.custom.InterceptorHandler;
 //import com.mogo.utils.logger.Logger;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java
@@ -2,7 +2,7 @@ package com.mogo.map.impl.custom.search;

 import android.content.Context;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.search.drive.IMogoRoadSearch;
 import com.mogo.map.search.drive.IMogoRoadSearchListener;
 import com.mogo.map.search.drive.MogoRoadSearchQuery;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
@@ -6,7 +6,7 @@ import android.location.Location;
 import android.view.View;
 import android.view.animation.Interpolator;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.uicontroller.CarCursorOption;
 import com.mogo.map.uicontroller.EnumMapUI;
@@ -14,7 +14,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.MapCameraPosition;
 import com.mogo.map.uicontroller.MapControlResult;
 import com.mogo.map.uicontroller.VisualAngleMode;
-import com.mogo.utils.logger.Logger;
 import com.zhidaoauto.map.sdk.open.MapAutoApi;

 import org.json.JSONObject;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java
@@ -1,8 +1,6 @@
 package com.mogo.map.impl.custom.utils;

-import android.util.Log;
-
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.exception.MogoMapException;
 import com.zhidaoauto.map.sdk.open.camera.LatLngBounds;
 import com.zhidaoauto.map.sdk.open.query.LonLatPoint;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
@@ -5,8 +5,7 @@ import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.View;

-import com.mogo.cloud.commons.utils.CoordinateUtils;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.overlay.MogoPolylineOptions;
@@ -23,10 +22,7 @@ import com.mogo.map.search.poisearch.MogoPoiResult;
 import com.mogo.map.search.poisearch.MogoSearchBound;
 import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery;
 import com.mogo.map.uicontroller.MapCameraPosition;
-import com.mogo.utils.logger.Logger;
 import com.zhidaoauto.map.sdk.open.camera.CameraPosition;
-import com.zhidaoauto.map.sdk.open.data.MapDataApi;
-import com.zhidaoauto.map.sdk.open.data.SinglePointRoadInfo;
 import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptor;
 import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory;
 import com.zhidaoauto.map.sdk.open.marker.MarkerOptions;
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java
@@ -1,7 +1,7 @@
 package com.mogo.map.impl.custom.utils;

 import com.mogo.cloud.commons.utils.CoordinateUtils;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.utils.logger.Logger;
 import com.zhidaoauto.map.sdk.open.query.LonLatPoint;

--- a/libraries/mogo-map-api/build.gradle
+++ b/libraries/mogo-map-api/build.gradle
@@ -36,6 +36,7 @@ dependencies {
        implementation rootProject.ext.dependencies.mogoutils
    } else {
        implementation project(':foudations:mogo-utils')
+        implementation project(':core:mogo-core-data')
    }
 }

--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java
@@ -2,7 +2,7 @@ package com.mogo.map.listener;

 import android.view.MotionEvent;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.model.MogoPoi;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.VisualAngleMode;
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java
@@ -1,9 +1,8 @@
 package com.mogo.map.listener;

-import android.util.Log;
 import android.view.MotionEvent;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.model.MogoPoi;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.VisualAngleMode;
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java
@@ -1,6 +1,5 @@
 package com.mogo.map.marker;

-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.view.View;
@@ -8,7 +7,7 @@ import android.view.animation.Interpolator;

 import androidx.annotation.RawRes;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.anim.OnMarkerAnimationListener;

 import java.util.ArrayList;
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java
@@ -2,7 +2,7 @@ package com.mogo.map.marker;

 import android.content.Context;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.ArrayList;
 import java.util.List;
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java
@@ -6,7 +6,7 @@ import android.view.View;

 import androidx.annotation.RawRes;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;

 import java.util.ArrayList;
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/model/MogoPoi.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/model/MogoPoi.java
@@ -3,7 +3,7 @@ package com.mogo.map.model;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java
@@ -1,6 +1,7 @@
 package com.mogo.map.navi;

-import com.mogo.map.MogoLatLng;
+
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java
@@ -3,8 +3,7 @@ package com.mogo.map.navi;
 import android.graphics.Rect;
 import android.location.Location;

-import com.mogo.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.List;

--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java
@@ -1,7 +1,7 @@
 package com.mogo.map.navi;

 import android.text.TextUtils;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import java.util.List;

 /**
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionLink.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionLink.java
@@ -3,7 +3,7 @@ package com.mogo.map.navi;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.ArrayList;
 import java.util.List;
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoPolyline.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoPolyline.java
@@ -3,7 +3,7 @@ package com.mogo.map.overlay;
 import androidx.annotation.ColorInt;

 import com.mogo.map.IDestroyable;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.List;

--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java
@@ -4,7 +4,7 @@ import android.graphics.Color;

 import androidx.annotation.ColorInt;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;

 import java.util.ArrayList;
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearchListener.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearchListener.java
@@ -1,6 +1,6 @@
 package com.mogo.map.search.drive;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.List;

--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/MogoRoadSearchQuery.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/MogoRoadSearchQuery.java
@@ -1,6 +1,6 @@
 package com.mogo.map.search.drive;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.List;

--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoAoiItem.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoAoiItem.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.geo;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoBusinessArea.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoBusinessArea.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.geo;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoGeocodeAddress.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoGeocodeAddress.java
@@ -1,6 +1,6 @@
 package com.mogo.map.search.geo;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoPoiItem.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoPoiItem.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.geo;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.ArrayList;
 import java.util.List;
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoRegeocodeRoad.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoRegeocodeRoad.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.geo;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoStreetNumber.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoStreetNumber.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.geo;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoSubPoiItem.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoSubPoiItem.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.geo;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoRegeocodeQuery.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoRegeocodeQuery.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.geo.query;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/MogoTip.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/MogoTip.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.inputtips;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/query/MogoInputtipsQuery.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/query/MogoInputtipsQuery.java
@@ -1,6 +1,6 @@
 package com.mogo.map.search.inputtips.query;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/MogoSearchBound.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/MogoSearchBound.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.poisearch;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.List;

--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java
@@ -3,7 +3,7 @@ package com.mogo.map.search.poisearch.query;
 import android.os.Parcel;
 import android.os.Parcelable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/IMogoTrafficSearch.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/IMogoTrafficSearch.java
@@ -1,6 +1,6 @@
 package com.mogo.map.search.traffic;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 public interface IMogoTrafficSearch {

--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/MogoTrafficStatusInfo.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/MogoTrafficStatusInfo.java
@@ -1,6 +1,6 @@
 package com.mogo.map.search.traffic;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.List;

--- 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
@@ -8,7 +8,7 @@ import android.view.animation.Interpolator;

 import androidx.annotation.Nullable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.anim.OnMarkerAnimationListener;

--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/MapCameraPosition.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/MapCameraPosition.java
@@ -1,6 +1,6 @@
 package com.mogo.map.uicontroller;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author congtaowang
--- a/libraries/mogo-map/build.gradle
+++ b/libraries/mogo-map/build.gradle
@@ -36,6 +36,8 @@ dependencies {
        implementation project(':libraries:mogo-map-api')
        api project(':libraries:map-autonavi')
        implementation project(':foudations:mogo-commons')
+
+        implementation project(':core:mogo-core-data')
    }
 }

--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
@@ -6,6 +6,7 @@ import android.location.Location;
 import android.view.View;
 import android.view.animation.Interpolator;

+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.uicontroller.CarCursorOption;
 import com.mogo.map.uicontroller.EnumMapUI;
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java
@@ -2,6 +2,7 @@ package com.mogo.map;

 import android.content.Context;

+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.marker.MogoMarkerOptions;
@@ -105,7 +106,7 @@ public class MogoMarkerManager implements IMogoMarkerManager {
    }

    @Override
-    public void addRouteWay( Context context, MogoLatLng startPoint, MogoLatLng endPoint, List< MogoLatLng > wayPoints ) {
+    public void addRouteWay(Context context, MogoLatLng startPoint, MogoLatLng endPoint, List< MogoLatLng > wayPoints ) {
 //        RouteOverlayHelper.getInstance().addRouteWay( context, startPoint, endPoint, wayPoints );
    }

--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.graphics.Rect;
 import android.location.Location;

+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.map.navi.MogoCalculatePath;
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoTrafficSearch.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoTrafficSearch.java
@@ -1,5 +1,6 @@
 package com.mogo.map;

+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.search.traffic.IMogoTrafficSearch;
 import com.mogo.map.search.traffic.IMogoTrafficSearchListener;

--- a/modules/mogo-module-adas/build.gradle
+++ b/modules/mogo-module-adas/build.gradle
@@ -59,6 +59,7 @@ dependencies {
        api project(":foudations:mogo-commons")
        api project(':services:mogo-service-api')
        implementation project(':modules:mogo-module-common')
+        implementation project(':core:mogo-core-data')
    }
 }
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java
@@ -12,7 +12,7 @@ import android.location.Location;
 import android.os.Handler;
 import android.os.Message;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.adas.entity.DispatchAdasAutoPilotLocReceiverBean;
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/overlay/LineOverlayManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/overlay/LineOverlayManager.java
@@ -2,13 +2,12 @@ package com.mogo.module.adas.overlay;

 import android.content.Context;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.overlay.IMogoOverlayManager;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.utils.LocationUtils;
 import com.mogo.utils.ColorUtils;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/receiver/TestAdasFuncManager.java
@@ -1,7 +1,7 @@
 package com.mogo.module.adas.receiver;

 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.adas.overlay.LineOverlayManager;
 import com.mogo.module.common.MogoApisHandler;
--- a/modules/mogo-module-common/build.gradle
+++ b/modules/mogo-module-common/build.gradle
@@ -68,6 +68,8 @@ dependencies {
        api project(":foudations:mogo-utils")
        api project(":foudations:mogo-commons")
        api project(':services:mogo-service-api')
+
+        implementation project(':core:mogo-core-data')
    }

    annotationProcessor 'com.elegant.spi:compiler:1.0.3'
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/adapter/MogoMapListenerAdapter.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/adapter/MogoMapListenerAdapter.java
@@ -2,7 +2,7 @@ package com.mogo.module.common.adapter;

 import android.view.MotionEvent;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.model.MogoPoi;
 import com.mogo.map.uicontroller.EnumMapUI;
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
@@ -1,18 +1,16 @@
 package com.mogo.module.common.drawer;

 import android.os.Build;
-import android.os.Message;
 import android.text.TextUtils;
 import android.util.Log;

 import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.constants.DataTypes;
-import com.mogo.module.common.drawer.bean.SpeedData;
 import com.mogo.module.common.utils.Trigonometric;
 import com.mogo.service.adas.entity.ADASRecognizedResult;

--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java
@@ -4,7 +4,7 @@ import android.text.TextUtils;

 import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.MogoMarkerOptions;
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/OnlineCarDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/OnlineCarDrawer.java
@@ -3,12 +3,11 @@ package com.mogo.module.common.drawer;
 import android.graphics.Rect;

 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.module.common.ModuleNames;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.R;
 import com.mogo.module.common.entity.MarkerCarPois;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.MarkerOnlineCar;
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
@@ -13,7 +13,7 @@ import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.cloud.socket.entity.SocketDownDataHelper;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.MogoMarkerOptions;
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.os.Handler
 import android.os.Message
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.map.marker.IMogoMarker
 import com.mogo.map.marker.MogoMarkerOptions
 import com.mogo.module.common.MogoApisHandler
@@ -163,7 +163,7 @@ object TrafficMarkerDrawer {
                .icon3DRes(resId)
                .rotate(trafficData.heading.toFloat())
                .position(
-                    MogoLatLng(
+                    com.mogo.eagle.core.data.map.MogoLatLng(
                        trafficData.lat,
                        trafficData.lon
                    )
@@ -230,7 +230,7 @@ object TrafficMarkerDrawer {

        try {
            marker.addDynamicAnchorPosition(
-                MogoLatLng(
+                com.mogo.eagle.core.data.map.MogoLatLng(
                    trafficData.lat,
                    trafficData.lon
                ),
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
@@ -1,9 +1,6 @@
 package com.mogo.module.common.drawer;

-import android.util.Log;
-import android.widget.LinearLayout;
-
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.module.common.MogoApisHandler;
@@ -22,9 +19,6 @@ import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.ViewUtils;
 import com.mogo.utils.logger.Logger;

-import java.util.ArrayList;
-import java.util.List;
-
 import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA;
 import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA;

--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/RoadTrafficSegment.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/RoadTrafficSegment.java
@@ -1,6 +1,6 @@
 package com.mogo.module.common.entity;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.List;

--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/RoadTrafficStatus.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/RoadTrafficStatus.java
@@ -1,6 +1,6 @@
 package com.mogo.module.common.entity;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.util.List;

--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWarningEntity.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWarningEntity.java
@@ -1,6 +1,6 @@
 package com.mogo.module.common.entity;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 import java.io.Serializable;
 import java.util.List;
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/LocationUtils.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/LocationUtils.java
@@ -1,9 +1,8 @@
 package com.mogo.module.common.utils;

-import android.location.Location;
 import android.util.Log;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;


--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Trigonometric.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/Trigonometric.java
@@ -1,6 +1,6 @@
 package com.mogo.module.common.utils;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;

 /**
 * @author liujing
--- a/modules/mogo-module-extensions/build.gradle
+++ b/modules/mogo-module-extensions/build.gradle
@@ -67,6 +67,8 @@ dependencies {
        implementation project(':modules:mogo-module-common')
        implementation project(':modules:mogo-module-share')
        implementation project(':modules:mogo-module-service')
+        implementation project(':core:mogo-core-data')
+
    }
 }

--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -34,7 +34,7 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.check.IMogoCheckListener;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationClient;
@@ -95,8 +95,6 @@ import com.mogo.utils.logger.Logger;
 import com.mogo.utils.storage.SharedPrefsMgr;
 import com.zhidao.manager.ts.TsThreshold;

-import org.w3c.dom.Text;
-
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
--- a/modules/mogo-module-main/build.gradle
+++ b/modules/mogo-module-main/build.gradle
@@ -57,6 +57,8 @@ dependencies {
        api project(':services:mogo-service-api')
        api project(':services:mogo-service')
        compileOnly project(':skin:mogo-skin-support')
+
+        implementation project(':core:mogo-core-data')
    }
 }

--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
@@ -1,10 +1,9 @@
 package com.mogo.module.main;

 import android.location.Location;
-import android.util.Log;
 import android.view.MotionEvent;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.location.MogoLocation;
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java
@@ -6,8 +6,7 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;

-import com.mogo.map.MogoLatLng;
-import com.mogo.module.common.MogoApisHandler;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
--- a/Show More
+++ b/Show More