Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu

2021-09-17 17:41:02 +08:00
parent 0558d54494 4556727d23
commit 3d6470e140
185 changed files with 241 additions and 270 deletions
--- 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/modules/mogo-module-map/build.gradle
+++ b/modules/mogo-module-map/build.gradle
@@ -54,6 +54,9 @@ dependencies {
        api project(":foudations:mogo-commons")
        api project(':services:mogo-service-api')
        implementation project(':modules:mogo-module-common')
+
+        implementation project(':core:mogo-core-data')
+
    }
 }

--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
@@ -13,7 +13,7 @@ import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.commons.voice.VoicePreemptType;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.map.navi.IMogoNaviListener2;
 import com.mogo.map.navi.MogoNaviConfig;
--- a/modules/mogo-module-search/build.gradle
+++ b/modules/mogo-module-search/build.gradle
@@ -62,6 +62,8 @@ dependencies {
        implementation project(":foudations:mogo-commons")
        implementation project(':services:mogo-service-api')
        implementation project(':modules:mogo-module-common')
+        implementation project(':core:mogo-core-data')
+
    }
    implementation 'com.zhidaoauto.voice.controller:api:1.0.2'

--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/bean/EntityConvertUtils.java
@@ -1,6 +1,6 @@
 package com.mogo.module.navi.bean;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.search.inputtips.MogoTip;
 import com.mogo.module.navi.constants.DataConstants;

--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java
@@ -3,7 +3,7 @@ package com.mogo.module.navi.manager;
 import android.content.Context;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.module.IMogoAddressManager;
 import com.mogo.service.module.IMogoSearchManager;
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSearchManager.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSearchManager.java
@@ -1,12 +1,9 @@
 package com.mogo.module.navi.manager;

 import android.content.Context;
-import android.content.Intent;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
-import com.mogo.module.common.map.CustomNaviInterrupter;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.navi.constants.SearchApisHolder;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.module.IMogoSearchManager;
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSearchManagerImpl.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoSearchManagerImpl.kt
@@ -1,7 +1,7 @@
 package com.mogo.module.navi.manager

 import androidx.fragment.app.Fragment
-import com.mogo.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.module.common.map.MapCenterPointStrategy
 import com.mogo.module.common.map.Scene
 import com.mogo.module.navi.bean.EntityConvertUtils
@@ -64,7 +64,7 @@ object MogoSearchManagerImpl {
    /**
     * 路径规划
     */
-    fun calculatePath(destination: MogoLatLng?) {
+    fun calculatePath(destination: com.mogo.eagle.core.data.map.MogoLatLng?) {
        destination?.let {
            beforePushFragment()
            MapCenterPointStrategy.setMapCenterPointByScene(SearchApisHolder.getUiControllerApis(), Scene.CALCULATE_PATH)
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategoryPresenter.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategoryPresenter.java
@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.LifecycleOwner;

 import com.mogo.commons.mvp.Presenter;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.search.geo.MogoPoiItem;
 import com.mogo.map.search.poisearch.IMogoPoiSearch;
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt
@@ -7,10 +7,9 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.voice.AIAssist
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack
-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
@@ -44,7 +43,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa

    private var addMarkers: ArrayList<IMogoMarker> = ArrayList()
    private var arrayList = ArrayList<MogoMarkerOptions>()
-    private var locationList = ArrayList<MogoLatLng>()
+    private var locationList = ArrayList<com.mogo.eagle.core.data.map.MogoLatLng>()

    private lateinit var cmds: ArrayList<String>

--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
@@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mogo.commons.voice.AIAssist
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack
-import com.mogo.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.map.navi.IMogoNaviListener
 import com.mogo.map.navi.MogoCalculatePath
 import com.mogo.module.navi.R
@@ -143,7 +143,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
        return R.layout.fragment_search_category
    }

-    private var mogoTip: MogoLatLng? = null
+    private var mogoTip: com.mogo.eagle.core.data.map.MogoLatLng? = null
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        mogoTip = arguments?.getParcelable(AMapConstants.KEY_PARCELABLE)
@@ -289,7 +289,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB

        const val TAG: String = "ChoosePathFragment"

-        fun newInstance(searchPoi: MogoLatLng): Fragment {
+        fun newInstance(searchPoi: com.mogo.eagle.core.data.map.MogoLatLng): Fragment {
            val bundle = Bundle()
            bundle.putParcelable(AMapConstants.KEY_PARCELABLE, searchPoi)
            val choosePathFragment = ChoosePathFragment()
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt
@@ -5,7 +5,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import androidx.fragment.app.Fragment
-import com.mogo.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.map.listener.IMogoMapListener
 import com.mogo.map.marker.IMogoMarker
 import com.mogo.map.marker.MogoMarkerOptions
@@ -61,10 +61,10 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener {
    private var selectPoi: SearchPoi? = null
    private var mapListener: IMogoMapListener = object : MogoMapListenerAdapter() {
        override fun onMapChanged(
-                latLng: MogoLatLng?,
-                zoom: Float,
-                tilt: Float,
-                bearing: Float) {
+            latLng: com.mogo.eagle.core.data.map.MogoLatLng?,
+            zoom: Float,
+            tilt: Float,
+            bearing: Float) {
            super.onMapChanged(latLng, zoom, tilt, bearing)
            selectPoi = EntityConvertUtils.geoToPoi(latLng?.lat ?: 0.0, latLng?.lon ?: 0.0, type)
            val mogoRegeocodeQuery = MogoRegeocodeQuery()
--- a/modules/mogo-module-service/build.gradle
+++ b/modules/mogo-module-service/build.gradle
@@ -58,6 +58,8 @@ dependencies {
        implementation project(":foudations:mogo-commons")
        implementation project(':services:mogo-service-api')
        implementation project(':modules:mogo-module-common')
+
+        implementation project(':core:mogo-core-data')
    }
 }

--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -13,13 +13,12 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;

-import com.mogo.commons.FunctionBuildConfig;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.storage.SpStorage;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.map.IDestroyable;
-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-service/src/main/java/com/mogo/module/service/Utils.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/Utils.java
@@ -1,6 +1,6 @@
 package com.mogo.module.service;

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

 /**
 * @author congtaowang
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
@@ -10,7 +10,7 @@ import android.os.Handler;
 import android.os.Message;

 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.module.common.MogoApisHandler;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/bean/DispatchAdasAutoPilotLocReceiverBean.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/bean/DispatchAdasAutoPilotLocReceiverBean.java
@@ -1,6 +1,6 @@
 package com.mogo.module.service.dispatch.bean;

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

 import java.util.List;

--- 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
@@ -18,7 +18,7 @@ import com.mogo.cloud.socket.entity.SocketDownDataHelper;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
-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.map.navi.IMogoNaviListener;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/OnlineCarSearchIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/OnlineCarSearchIntentHandler.java
@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.text.TextUtils;

 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearch;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java
@@ -12,7 +12,7 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.ParamsProvider;
 import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.service.MarkerServiceHandler;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -8,7 +8,7 @@ import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.FunctionBuildConfig;
 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.IMogoMarkerClickListener;
 import com.mogo.map.marker.IMogoMarkerManager;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
@@ -2,25 +2,18 @@ package com.mogo.module.service.network;

 import android.content.Context;

-import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.data.BaseData;
-import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.ParamsProvider;
 import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.network.Utils;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.constants.HostConst;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.service.ServiceConst;
-import com.mogo.service.MogoServicePaths;
-import com.mogo.service.network.IMogoNetwork;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.RequestOptions;
 import com.mogo.utils.network.utils.GsonUtil;

-import java.util.List;
 import java.util.Map;

 import io.reactivex.android.schedulers.AndroidSchedulers;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/ZhidaoRefreshModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/ZhidaoRefreshModel.java
@@ -3,25 +3,10 @@ package com.mogo.module.service.network;
 import android.content.Context;

 import com.alibaba.android.arouter.launcher.ARouter;
-import com.mogo.commons.data.BaseData;
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.network.ParamsProvider;
-import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.network.Utils;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.constants.HostConst;
-import com.mogo.module.common.entity.MarkerResponse;
-import com.mogo.module.service.ServiceConst;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.network.IMogoNetwork;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
-
-import java.util.Map;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;


 /**
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigBody.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigBody.java
@@ -3,7 +3,7 @@ package com.mogo.module.service.network.bean;
 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/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java
@@ -8,7 +8,7 @@ import androidx.lifecycle.LifecycleOwner;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.storage.SpStorage;
 import com.mogo.map.IDestroyable;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.navi.IMogoNaviListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.MarkerResponse;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/polyline/LimberCollisionPolyline.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/polyline/LimberCollisionPolyline.java
@@ -1,6 +1,6 @@
 package com.mogo.module.service.polyline;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.service.MarkerServiceHandler;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/refresh/RefreshObject.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/refresh/RefreshObject.java
@@ -1,6 +1,6 @@
 package com.mogo.module.service.refresh;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.service.network.RefreshCallback;

 /**
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java
@@ -2,7 +2,7 @@ package com.mogo.module.service.utils;

 import android.location.Location;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.service.cloud.location.CloudLocationInfo;

 /**
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/SimpleLocationCorrectStrategy.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/SimpleLocationCorrectStrategy.java
@@ -2,7 +2,7 @@ package com.mogo.module.service.utils;

 import android.os.SystemClock;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.cloud.location.CloudLocationInfo;
 import com.mogo.utils.logger.Logger;
--- a/modules/mogo-module-share/build.gradle
+++ b/modules/mogo-module-share/build.gradle
@@ -60,6 +60,8 @@ dependencies {
        implementation project(':modules:mogo-module-common')
        implementation project(':modules:mogo-module-authorize')
        implementation project(':modules:mogo-module-service')
+
+        implementation project(':core:mogo-core-data')
    }

 }
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluCardViewProvider.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluCardViewProvider.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.share.bean.event.MarkerInfo;
 import com.mogo.module.share.constant.ShareConstants;
 import com.mogo.service.share.IMogoTanluUiProvider;
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
@@ -15,7 +15,7 @@ import android.view.animation.LinearInterpolator;
 import com.mogo.cloud.tanlu.bean.MarkerExploreWayCloud;
 import com.mogo.cloud.tanlu.bean.MarkerExploreWayItemCloud;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/TrafficUploadManager.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/TrafficUploadManager.kt
@@ -1,6 +1,6 @@
 package com.mogo.module.share.manager

-import com.mogo.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.map.search.traffic.IMogoTrafficSearchListener
 import com.mogo.map.search.traffic.MogoTrafficResult
 import com.mogo.module.common.MogoApisHandler
@@ -32,7 +32,11 @@ class TrafficUploadManager : IMogoTrafficSearchListener {
        val location = TanluServiceManager.getLocationClient().lastKnowLocation
        trafficSearchApi.registerTrafficSearchListener(this)
        Logger.d(TAG, "verityTrafficStatus searchTrafficByCircleArea")
-        trafficSearchApi.searchTrafficByCircleArea(MogoLatLng(location.latitude, location.longitude), TRAFFIC_SEARCH_AREA)
+        trafficSearchApi.searchTrafficByCircleArea(
+            MogoLatLng(
+                location.latitude,
+                location.longitude
+            ), TRAFFIC_SEARCH_AREA)
    }

    override fun onTrafficSearchError(errorMsg: String?) {
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
@@ -3,7 +3,7 @@ package com.mogo.module.share.manager
 import android.content.Context
 import android.util.Log
 import com.mogo.commons.voice.AIAssist
-import com.mogo.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.module.common.enums.EventTypeEnum
 import com.mogo.module.share.R
 import com.mogo.module.share.constant.ShareConstants.*
@@ -50,7 +50,10 @@ object UploadHelper {
 //                TanluManager.getInstance(context).shareSuccess(type.eventType, type.location)
                ServiceApisManager.serviceApis.tanluUiApi.shareSuccess(type.eventType, type.location)
                val location = ServiceApisManager.serviceApis.mapServiceApi.getSingletonLocationClient(context).lastKnowLocation
-                val latLon = MogoLatLng(location.latitude, location.longitude)
+                val latLon = com.mogo.eagle.core.data.map.MogoLatLng(
+                    location.latitude,
+                    location.longitude
+                )
                type.location = latLon
                Logger.d("UploadHelper", "upload type----> $type")
                ServiceApisManager.serviceApis.tanluApi.uploadRoadCondition(type)
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt
@@ -1,6 +1,6 @@
 package com.mogo.module.share.strategyreceiver

-import com.mogo.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.module.share.constant.S_TAG
 import com.mogo.module.share.strategyreceiver.AccidentStrategyPushWrapper.Companion.TYPE_ACCIDENT
 import com.mogo.module.share.strategyreceiver.AccidentStrategyPushWrapper.Companion.TYPE_BLOCK
@@ -23,11 +23,15 @@ class AccidentStrategyReceiver(private val apis: IMogoServiceApis) : IMogoOnMess
            when (obj.type) {
                TYPE_ACCIDENT -> {
                    // 收集事故视频
-                    apis.tanluApi.uploadRoadCondition(TanluUploadParams(IMogoTanluProvider.TYPE_ACCIDENT, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO, it.id, MogoLatLng(it.lat, it.lon)))
+                    apis.tanluApi.uploadRoadCondition(TanluUploadParams(IMogoTanluProvider.TYPE_ACCIDENT, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO, it.id,
+                        com.mogo.eagle.core.data.map.MogoLatLng(it.lat, it.lon)
+                    ))
                }
                TYPE_BLOCK -> {
                    // 收集拥堵视频
-                    apis.tanluApi.uploadRoadCondition(TanluUploadParams(IMogoTanluProvider.TYPE_BLOCK, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_CLOUD_CHECK, it.id, MogoLatLng(it.lat, it.lon)))
+                    apis.tanluApi.uploadRoadCondition(TanluUploadParams(IMogoTanluProvider.TYPE_BLOCK, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_CLOUD_CHECK, it.id,
+                        com.mogo.eagle.core.data.map.MogoLatLng(it.lat, it.lon)
+                    ))
                }
            }
        }
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
@@ -3,7 +3,7 @@ package com.mogo.module.share.strategyreceiver
 import android.content.Context
 import android.os.Handler
 import android.os.SystemClock
-import com.mogo.map.MogoLatLng
+import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.module.share.manager.ServiceApisManager
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.share.IMogoTanluProvider
@@ -132,8 +132,8 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService
            var blockFromSpeed = false
            var blockFromDistance = false

-            var latLonFromSpeed: MogoLatLng? = null
-            var latLonFromDistance: MogoLatLng? = null
+            var latLonFromSpeed: com.mogo.eagle.core.data.map.MogoLatLng? = null
+            var latLonFromDistance: com.mogo.eagle.core.data.map.MogoLatLng? = null

            val p = TanluUploadParams(IMogoTanluProvider.TYPE_BLOCK, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_BLOCK_AUTO)
            // 到达时间限制，上报速度，数据清空
@@ -148,7 +148,10 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService
                blockFromSpeed = ave in 1..10
                // 上报平均速度
                val location = ServiceApisManager.serviceApis.mapServiceApi.getSingletonLocationClient(context).lastKnowLocation
-                latLonFromSpeed = MogoLatLng(location.latitude, location.longitude)
+                latLonFromSpeed = com.mogo.eagle.core.data.map.MogoLatLng(
+                    location.latitude,
+                    location.longitude
+                )
            } else {
                Logger.d(TAG, "判定为停车，不进行上报")
            }
@@ -156,7 +159,8 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService
            // 超过阈值，准备判断是否拥堵
            if (tripDistance in 100..1000 && isClose() && currentSpeed < 40) {
                Logger.d(TAG, "根据距离，判定为拥堵，准备上报, tripDistance: $tripDistance, frontDistance: $frontDistance, currentSpeed: $currentSpeed")
-                latLonFromDistance = MogoLatLng(lat, lon)
+                latLonFromDistance =
+                    com.mogo.eagle.core.data.map.MogoLatLng(lat, lon)
                blockFromDistance = true
            } else {
                Logger.d(TAG, "根据距离，没有判定为拥堵, tripDistance: $tripDistance, frontDistance: $frontDistance, currentSpeed: $currentSpeed")
--- a/modules/mogo-module-smp/build.gradle
+++ b/modules/mogo-module-smp/build.gradle
@@ -51,6 +51,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')
    }
 }

--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -23,7 +23,7 @@ import com.amap.api.navi.AMapNaviView;
 import com.amap.api.navi.AMapNaviViewOptions;
 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.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.view.RoundLayout;
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapFragment.java
@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;

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

 import java.util.List;

--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
@@ -6,7 +6,7 @@ import android.util.Log;
 import androidx.fragment.app.FragmentActivity;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoAdasRouteCallBack;
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/view/ISmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/view/ISmallMapDirectionView.java
@@ -1,6 +1,6 @@
 package com.mogo.module.small.map.view;

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

 import java.util.List;

--- a/modules/mogo-module-v2x/build.gradle
+++ b/modules/mogo-module-v2x/build.gradle
@@ -84,6 +84,8 @@ dependencies {
        implementation project(':modules:mogo-module-common')
        implementation project(':modules:mogo-module-service')
        implementation project(':modules:mogo-module-obu')
+
+        implementation project(':core:mogo-core-data')
    }

    annotationProcessor rootProject.ext.dependencies.aroutercompiler
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XMarkerService.java
@@ -3,7 +3,7 @@ package com.mogo.module.v2x;
 import android.content.Context;
 import android.os.Handler;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.v2x.listener.V2XLocationListener;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
@@ -15,8 +15,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;

 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.network.Utils;
-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.marker.IMogoMarker;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java
@@ -1,9 +1,8 @@
 package com.mogo.module.v2x;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
-import com.mogo.utils.logger.Logger;

 /**
 * author : donghongyu
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
@@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView;

 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.navi.MogoTraffic;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
@@ -9,7 +9,7 @@ import android.widget.TextView;

 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java
@@ -7,14 +7,13 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.service.Utils;
 import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
 import com.mogo.module.v2x.utils.LocationUtils;
 import com.mogo.module.v2x.utils.SpanUtils;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java
@@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView;

 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.navi.MogoTraffic;
@@ -17,7 +17,6 @@ import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.V2XEventZanData;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.scenario.view.IV2XWindow;
 import com.mogo.module.v2x.utils.ChartingUtil;
 import com.mogo.module.v2x.utils.RoadConditionUtils;
 import com.mogo.module.v2x.utils.TimeUtils;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
@@ -2,7 +2,7 @@ package com.mogo.module.v2x.alarm;

 import android.text.TextUtils;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoGeocodeResult;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/model/CloundWarningInfo.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/model/CloundWarningInfo.java
@@ -1,7 +1,7 @@
 package com.mogo.module.v2x.entity.model;


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

 /**
 * @author lixiaopeng
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/model/DrawLineInfo.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/model/DrawLineInfo.java
@@ -1,6 +1,6 @@
 package com.mogo.module.v2x.entity.model;

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

 import java.util.List;

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

-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-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
@@ -27,7 +27,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
 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.marker.IMogoMarker;
 import com.mogo.map.marker.anim.OnMarkerAnimationListener;
 import com.mogo.module.common.entity.MarkerExploreWay;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.location.Location;

 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
@@ -4,7 +4,7 @@ import android.content.Intent;

 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.entity.MarkerCardResult;
 import com.mogo.module.common.entity.MarkerExploreWay;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoPersonWarnPolylineManager.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.util.Log;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.v2x.MoGoV2XServicePaths;
@@ -14,7 +14,6 @@ import com.mogo.module.v2x.entity.model.DrawLineInfo;
 import com.mogo.module.v2x.manager.IMoGoPersonWarnPolylineManager;

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

 /**
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoStopPolylineManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoStopPolylineManager.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.util.Log;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.v2x.MoGoV2XServicePaths;
@@ -12,7 +12,6 @@ import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.model.DrawLineInfo;
 import com.mogo.module.v2x.manager.IMoGoStopPolylineManager;
-import com.mogo.module.v2x.manager.IMoGoWarnPolylineManager;

 import java.util.ArrayList;
 import java.util.List;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
@@ -6,7 +6,7 @@ import android.graphics.BitmapFactory;

 import com.alibaba.android.arouter.facade.annotation.Route;
 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.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
@@ -3,7 +3,7 @@ package com.mogo.module.v2x.manager.impl;
 import android.content.Context;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.util.Log;

 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.v2x.MoGoV2XServicePaths;
@@ -16,8 +16,6 @@ import com.mogo.module.v2x.manager.IMoGoWarnPolylineManager;
 import java.util.ArrayList;
 import java.util.List;

-import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_TOP;
-
 /**
 * 当前车辆与道路事件的连接线
 */
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
@@ -12,7 +12,7 @@ import com.mogo.commons.data.BaseData;
 import com.mogo.commons.network.ParamsProvider;
 import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoRegeocodeResult;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/V2XOptimalRouteObserver.java
@@ -1,6 +1,6 @@
 package com.mogo.module.v2x.observer;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.v2x.overlay.V2XOptimalRouteOverlay;

--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/overlay/V2XOptimalRouteOverlay.java
@@ -1,6 +1,6 @@
 package com.mogo.module.v2x.overlay;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/receiver/TestPanelBroadcastReceiver.java
@@ -6,7 +6,7 @@ import android.content.Intent;

 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
@@ -5,7 +5,7 @@ import android.view.ViewGroup;

 import androidx.annotation.Nullable;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/OptimalSpeedMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/OptimalSpeedMarker.java
@@ -1,6 +1,6 @@
 package com.mogo.module.v2x.scenario.scene.obu;

-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.drawer.MarkerDrawer;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventScenario.java
@@ -5,11 +5,10 @@ import android.graphics.Color;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.util.Log;

 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
@@ -21,7 +20,6 @@ import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.listener.V2XWindowStatusListener;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
 import com.mogo.module.v2x.utils.DrivingDirectionUtils;
-import com.mogo.module.v2x.utils.ToastUtils;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.mogo.module.obu.ObuConstant;
 import com.zhidao.mogo.module.obu.obu.bean.MogoObuEventInfo;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java
@@ -7,7 +7,7 @@ import android.view.ViewGroup;

 import androidx.annotation.Nullable;

-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.entity.V2XMessageEntity;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
@@ -1,19 +1,13 @@
 package com.mogo.module.v2x.scenario.scene.warning;

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

 import com.mogo.cloud.commons.utils.CoordinateUtils;
-import com.mogo.map.MogoLatLng;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.drawer.MarkerDrawer;
 import com.mogo.module.common.drawer.V2XWarnDataDrawer;
-import com.mogo.module.common.drawer.marker.EmptyMarkerView;
-import com.mogo.module.common.drawer.marker.SimpleWindow3DAdapter;
 import com.mogo.module.common.entity.V2XWarningEntity;
 import com.mogo.module.common.utils.Trigonometric;
 import com.mogo.module.service.MarkerServiceHandler;
@@ -22,12 +16,9 @@ import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.model.DrawLineInfo;
 import com.mogo.module.v2x.listener.V2XLocationListener;
-import com.mogo.module.v2x.marker.V2XFrontTargetMarkerView;
 import com.mogo.module.v2x.scenario.view.IV2XMarker;
 import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.ViewUtils;
 import com.mogo.utils.WorkThreadHandler;
-import com.mogo.utils.network.utils.Util;

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,7 +26,6 @@ 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;
-import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_TOP;
 import static com.mogo.module.v2x.V2XConst.V2X_FRONT_WARNING_MARKER;
 import static com.mogo.module.v2x.V2XServiceManager.getContext;

--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java
@@ -1,21 +1,15 @@
 package com.mogo.module.v2x.scenario.scene.warning;

 import android.content.Context;
-import android.location.Location;
 import android.os.Handler;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

 import com.mogo.commons.voice.AIAssist;
-import com.mogo.commons.voice.VoicePreemptType;
-import com.mogo.map.MogoLatLng;
-import com.mogo.map.navi.IMogoCarLocationChangedListener;
-import com.mogo.map.navi.IMogoCarLocationChangedListener2;
-import com.mogo.module.common.MogoApisHandler;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.entity.V2XWarningEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
@@ -23,7 +17,6 @@ import com.mogo.module.v2x.listener.V2XWindowStatusListener;
 import com.mogo.module.v2x.scenario.scene.V2XBasWindow;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
 import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.utils.logger.Logger;

 /**
 * @author liujing
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
@@ -3,7 +3,7 @@ package com.mogo.module.v2x.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;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoPoiItem;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java
@@ -3,7 +3,7 @@ package com.mogo.module.v2x.utils;
 import android.content.Context;
 import android.graphics.Rect;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.MarkerShowEntity;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
@@ -1,6 +1,6 @@
 package com.mogo.module.v2x.utils;

-import com.mogo.map.MogoLatLng;
+import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.common.entity.V2XMessageEntity;
--- a/modules/tanlulib/build.gradle
+++ b/modules/tanlulib/build.gradle
@@ -78,6 +78,8 @@ dependencies {
        implementation project(':modules:mogo-module-common')
        implementation project(':libraries:mogo-map')
        implementation project(':services:mogo-service-api')
+        implementation project(':core:mogo-core-data')
+
    }
 }

--- a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/LocationInfo.kt
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/LocationInfo.kt
@@ -1,9 +1,9 @@
 package com.zhidao.roadcondition.model

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

-fun LocationInfo.toLatLngPoint():MogoLatLng{
-    return MogoLatLng(latitude,longitude)
+fun LocationInfo.toLatLngPoint(): com.mogo.eagle.core.data.map.MogoLatLng {
+    return com.mogo.eagle.core.data.map.MogoLatLng(latitude, longitude)
 }

 class LocationInfo {
--- a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt
@@ -2,7 +2,7 @@ package com.zhidao.roadcondition.util

 import android.util.Log
 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.map.search.geo.IMogoGeoSearchListener
 import com.mogo.map.search.geo.MogoRegeocodeAddress
@@ -13,7 +13,7 @@ import com.zhidao.roadcondition.model.LocationInfo

 private fun toLocInfo(
        address: MogoRegeocodeAddress,
-        latlngPoint: MogoLatLng
+        latlngPoint: com.mogo.eagle.core.data.map.MogoLatLng
 ): LocationInfo {
    return LocationInfo(
            address.province,
@@ -110,7 +110,7 @@ class LocationUtil private constructor() {

    //如果获取到的location address为空可以通过高德逆地理编码获得
    fun geoCodeLocation(
-        latlngPoint: MogoLatLng,
+        latlngPoint: com.mogo.eagle.core.data.map.MogoLatLng,
        locGeoCode: (((locInfo: LocationInfo) -> Unit)),
        onError: ((msg: String) -> Unit)
    ) {