迁移 MogoLocation 位置，准备修复RTK位置回调未更新问题

Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-11-01 21:08:13 +08:00
parent d504ca1642
commit 6eee4b7678
59 changed files with 81 additions and 68 deletions
--- 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
@@ -15,7 +15,7 @@ import android.os.Message;
 import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.adas.entity.DispatchAdasAutoPilotLocReceiverBean;
 import com.mogo.module.adas.entity.DispatchData;
--- 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
@@ -3,7 +3,7 @@ package com.mogo.module.adas.overlay;
 import android.content.Context;

 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.overlay.IMogoOverlayManager;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
--- 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
@@ -2,7 +2,7 @@ package com.mogo.module.adas.receiver;

 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.adas.overlay.LineOverlayManager;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.utils.logger.Logger;
--- 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
@@ -3,7 +3,7 @@ package com.mogo.module.common.utils;
 import android.util.Log;

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


 /**
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java
@@ -9,7 +9,7 @@ import android.os.Message;

 import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.map.location.IMogoLocationListener;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.extensions.navi.VrModeNavInfoView;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
--- 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
@@ -6,7 +6,7 @@ import android.view.MotionEvent;
 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;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.model.MogoPoi;
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -20,7 +20,7 @@ import com.mogo.commons.context.ContextHolderUtil;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.MvpActivity;
 import com.mogo.map.location.IMogoLocationListener;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.api.CallChatApi;
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java
@@ -8,7 +8,7 @@ import android.os.SystemClock;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.eagle.core.data.BaseData;
 import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.utils.NetworkUtils;
 import com.mogo.utils.logger.Logger;
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java
@@ -10,7 +10,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.map.location.IMogoLocationClient;
 import com.mogo.map.location.IMogoLocationListener;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.main.EventDispatchCenter;
 import com.mogo.module.main.cards.MogoModulesManager;
--- 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
@@ -21,7 +21,7 @@ import com.mogo.map.IDestroyable;
 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;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.navi.IMogoAimlessModeListener;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.map.navi.IMogoNavi;
--- 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
@@ -15,7 +15,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.service.dispatch.bean.DispatchAdasAutoPilotLocReceiverBean;
--- 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
@@ -6,7 +6,7 @@ import android.text.TextUtils;

 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearch;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoGeocodeAddress;
--- 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
@@ -13,7 +13,7 @@ import com.mogo.commons.network.ParamsProvider;
 import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.service.MarkerServiceHandler;
 import com.mogo.module.service.R;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java
@@ -9,9 +9,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

-import com.alibaba.android.arouter.launcher.ARouter;
 import com.bumptech.glide.request.RequestOptions;
-import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.api.CallChatApi;
 import com.mogo.module.common.entity.MarkerLocation;
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.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/routeoverlay/RouteOverlayDrawer.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
@@ -1,15 +1,13 @@
 package com.mogo.module.service.routeoverlay;

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

 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.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.drawer.MarkerDrawer;
 import com.mogo.module.common.utils.LocationUtils;
 import com.mogo.utils.ColorUtils;

--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
@@ -41,7 +41,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.constants.HostConst;
 import com.mogo.module.common.dialog.BaseFloatDialog;
 import com.mogo.module.common.utils.CloudPoiManager;
--- 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
@@ -16,7 +16,7 @@ import com.mogo.cloud.tanlu.bean.MarkerExploreWayCloud;
 import com.mogo.cloud.tanlu.bean.MarkerExploreWayItemCloud;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.IMogoMarkerManager;
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TanluModelData.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TanluModelData.java
@@ -7,7 +7,7 @@ import com.mogo.cloud.network.BaseData;
 import com.mogo.cloud.tanlu.api.IRoadInfoSearchCallback;
 import com.mogo.cloud.tanlu.api.MogoRoadSearchManager;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.constants.HostConst;
 import com.mogo.module.share.TanluServiceManager;
 import com.mogo.module.share.bean.VoiceCmdData;
--- 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
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.os.Handler;

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

 import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XObuEventEntity;
--- 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,7 +1,7 @@
 package com.mogo.module.v2x;

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

 /**
--- 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
@@ -5,7 +5,7 @@ import android.text.TextUtils;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.utilcode.constant.TimeConstants;
 import com.mogo.eagle.core.utilcode.util.TimeUtils;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoGeocodeResult;
 import com.mogo.map.search.geo.MogoPoiItem;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XCalculateServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XCalculateServer.java
@@ -3,9 +3,8 @@ package com.mogo.module.v2x.alarm;

 import android.os.Handler;

-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.v2x.V2XConst;
-import com.mogo.module.v2x.V2XStatusManager;
 import com.mogo.module.v2x.listener.CarStatusListener;
 import com.mogo.utils.logger.Logger;

--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
@@ -5,7 +5,7 @@ import android.content.Intent;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

 import com.mogo.eagle.core.utilcode.util.Utils;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/CarStatusListener.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/CarStatusListener.java
@@ -1,6 +1,6 @@
 package com.mogo.module.v2x.listener;

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

 /**
 * @author : donghongyu
--- 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
@@ -6,7 +6,7 @@ import android.location.Location;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.map.location.IMogoLocationListener;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
--- 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
@@ -9,7 +9,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.utilcode.constant.TimeConstants;
 import com.mogo.eagle.core.utilcode.util.TimeUtils;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.entity.MarkerCardResult;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
--- 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
@@ -7,7 +7,7 @@ import android.graphics.BitmapFactory;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.MogoMarkerOptions;
--- 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
@@ -14,7 +14,7 @@ import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.utilcode.util.Utils;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoRegeocodeResult;
 import com.mogo.module.common.entity.MarkerResponse;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationObserver.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationObserver.java
@@ -1,6 +1,6 @@
 package com.mogo.module.v2x.observer;

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

 /**
 * @author donghongyu
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationSubject.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/observer/CarLocationSubject.java
@@ -1,6 +1,6 @@
 package com.mogo.module.v2x.observer;

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

 import java.util.HashMap;
 import java.util.Set;
--- 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,7 +1,7 @@
 package com.mogo.module.v2x.observer;

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

 import java.util.List;
--- 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,7 +1,7 @@
 package com.mogo.module.v2x.overlay;

 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.v2x.V2XServiceManager;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
@@ -10,7 +10,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.v2x.entity.panel.Center;
 import com.mogo.module.v2x.entity.panel.SurroundingRequest;
 import com.mogo.module.v2x.entity.panel.SurroundingResponse;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
@@ -11,7 +11,7 @@ import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.uicontroller.VisualAngleMode;
--- 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
@@ -9,7 +9,7 @@ import android.os.Message;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
 import com.mogo.module.common.entity.V2XMessageEntity;
--- 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
@@ -5,10 +5,9 @@ import android.util.Log;

 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.utilcode.util.Utils;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoPoiItem;
-import com.mogo.map.search.geo.query.MogoRegeocodeQuery;
 import com.mogo.map.search.poisearch.IMogoPoiSearch;
 import com.mogo.map.search.poisearch.IMogoPoiSearchListener;
 import com.mogo.map.search.poisearch.MogoPoiResult;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java
@@ -19,7 +19,7 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.eagle.core.widget.RoundLayout;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCrossRoadVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCrossRoadVideoView.java
@@ -18,7 +18,7 @@ import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.eagle.core.widget.RoundLayout;
 import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.entity.MarkerCarInfo;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
--- a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/MogoTanluApiProvider.java
+++ b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/MogoTanluApiProvider.java
@@ -5,7 +5,7 @@ import android.util.ArrayMap;

 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.commons.analytics.AnalyticsUtils;
-import com.mogo.map.location.MogoLocation;
+import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.share.IMogoTanluProvider;
 import com.mogo.service.share.TanluUploadParams;
--- 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,8 +2,7 @@ package com.zhidao.roadcondition.util

 import android.util.Log
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.eagle.core.data.map.MogoLatLng
-import com.mogo.map.location.MogoLocation
+import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.map.search.geo.IMogoGeoSearchListener
 import com.mogo.map.search.geo.MogoRegeocodeAddress
 import com.mogo.map.search.geo.MogoRegeocodeResult