diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOverlayManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOverlayManager.java index 5f6574b364..e12ebe6d6d 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOverlayManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOverlayManager.java @@ -3,7 +3,7 @@ package com.mogo.och.taxi; 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; diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index 76d8372832..12450552ac 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import com.mogo.cloud.commons.utils.CoordinateUtils; 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.map.overlay.MogoPolylineOptions; import com.mogo.module.common.MogoApisHandler; @@ -21,7 +21,6 @@ import com.mogo.och.taxi.IOperationChangedListener; import com.mogo.och.taxi.MogoOCHTaxiModel; import com.mogo.och.taxi.OCHOrderStatus; import com.mogo.och.taxi.OCHOrderStatusCallback; -import com.mogo.och.taxi.OCHTaxiOverlayManager; import com.mogo.och.taxi.R; import com.mogo.och.view.SlidePanelView; import com.mogo.service.adas.IMogoAdasOCHCallback; diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 6054712ee9..8c355bb789 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -19,7 +19,7 @@ import com.mogo.commons.network.Utils; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.map.MapApiPath; -import com.mogo.map.location.MogoLocation; +import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.module.carchatting.card.CallChatConstant; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index 4b277b1cc6..e9da0e571d 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -29,23 +29,18 @@ import com.amap.api.maps.model.MarkerOptions; import com.amap.api.maps.model.Polyline; import com.amap.api.maps.model.PolylineOptions; import com.mogo.cloud.commons.utils.CoordinateUtils; -import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.smp.utils.MapAssetStyleUtils; import com.mogo.eagle.core.function.smp.view.ISmallMapDirectionView; import com.mogo.eagle.core.widget.RoundLayout; -import com.mogo.map.location.MogoLocation; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.utils.DrivingDirectionUtils; -import com.mogo.module.common.utils.LocationUtils; import com.mogo.utils.logger.Logger; import java.util.ArrayList; import java.util.List; -import ch.hsr.geohash.GeoHash; - /** * 小地图的方向View * diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocation.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java similarity index 99% rename from libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocation.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java index 5309e18c91..9397785bb4 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/MogoLocation.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java @@ -1,4 +1,4 @@ -package com.mogo.map.location; +package com.mogo.eagle.core.data.map; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapLocationListener.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapLocationListener.java new file mode 100644 index 0000000000..e9da558b38 --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapLocationListener.java @@ -0,0 +1,18 @@ +package com.mogo.eagle.core.function.api.map.hd; + +import com.mogo.eagle.core.data.map.MogoLocation; + +/** + * @author xiaoyuzhou + * @date 2021/11/1 7:17 下午 + * 地图定位回调 + */ +public interface IMoGoMapLocationListener { + + /** + * 定位发生改变 + * + * @param location 新定位点 + */ + void onLocationChanged(MogoLocation location); +} diff --git a/foudations/mogo-aicloud-services-sdk/build.gradle b/foudations/mogo-aicloud-services-sdk/build.gradle index a19bd69b2c..d6edb2c1b7 100644 --- a/foudations/mogo-aicloud-services-sdk/build.gradle +++ b/foudations/mogo-aicloud-services-sdk/build.gradle @@ -43,9 +43,14 @@ dependencies { if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogoutils implementation rootProject.ext.dependencies.mogoserviceapi + + implementation rootProject.ext.dependencies.mogo_core_data + } else { implementation project(":foudations:mogo-utils") implementation project(":services:mogo-service-api") + + implementation project(':core:mogo-core-data') } annotationProcessor 'com.elegant.spi:compiler:1.0.3' diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java index 5c2e7682c4..cd1804d204 100644 --- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java +++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationInfoServices.java @@ -5,7 +5,7 @@ import android.content.Context; import androidx.annotation.Keep; import com.mogo.cloud.location.LocationManager; -import com.mogo.map.location.MogoLocation; +import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.service.cloud.location.IMogoLocationInfoService; import com.mogo.utils.logger.Logger; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java index fd3b96d834..91bb83acdb 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java @@ -6,7 +6,7 @@ import android.os.Trace; import com.mogo.map.impl.custom.utils.ObjectUtils; 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.map.location.MogoLocationListenerRegister; import com.mogo.utils.logger.Logger; import com.zhidaoauto.map.sdk.open.location.LocationClient; @@ -14,7 +14,6 @@ import com.zhidaoauto.map.sdk.open.location.LocationListener; import org.jetbrains.annotations.NotNull; -import java.util.HashSet; import java.util.Iterator; import java.util.Set; @@ -26,7 +25,7 @@ import java.util.Set; */ public class ALocationClient implements IMogoLocationClient { - private static final String TAG = "LocationClient"; + private static final String TAG = "ALocationClient"; private MogoLocation mLastLocation; private LocationListener mListener = new InternalLocationListener(); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java index 35cbc9819b..5de9c4a3cd 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java @@ -6,7 +6,7 @@ import android.text.TextUtils; import android.view.View; 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.MogoMarkerOptions; import com.mogo.map.overlay.MogoPolylineOptions; import com.mogo.map.search.geo.MogoGeocodeAddress; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java index f1ed4f645e..b17912e41d 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationClient.java @@ -1,5 +1,7 @@ package com.mogo.map.location; +import com.mogo.eagle.core.data.map.MogoLocation; + /** * @author congtaowang * @since 2019-12-19 diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java index adfa1bd924..6d6372fba4 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/location/IMogoLocationListener.java @@ -1,5 +1,7 @@ package com.mogo.map.location; +import com.mogo.eagle.core.data.map.MogoLocation; + /** * @author congtaowang * @since 2019-12-19 diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java index 4d48901067..22aeb196b6 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java @@ -7,7 +7,7 @@ import android.view.View; import androidx.annotation.RawRes; import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.map.location.MogoLocation; +import com.mogo.eagle.core.data.map.MogoLocation; import java.util.ArrayList; import java.util.Observable; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java index 1a9bd7074b..3c5283ebdd 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/MogoPolylineOptions.java @@ -5,7 +5,7 @@ import android.graphics.Color; import androidx.annotation.ColorInt; import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.map.location.MogoLocation; +import com.mogo.eagle.core.data.map.MogoLocation; import java.util.ArrayList; import java.util.Arrays; diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java index 19e67dab43..520b5ce157 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoLocationClient.java @@ -4,7 +4,7 @@ import android.content.Context; 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.map.location.MogoLocationListenerRegister; /** diff --git 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 index 7f9c4c80b9..e9dd2080b2 100644 --- 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; diff --git 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 index af70a606a9..a6603115d9 100644 --- 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; diff --git 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 index 8b84f3f488..1c4dedd9de 100644 --- 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; diff --git 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 index 806da640f9..35e8baecbb 100644 --- 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; /** diff --git 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 index 5033726c1d..b02a073a22 100644 --- 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; diff --git 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 index 6bded07cb5..ab013986de 100644 --- 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; diff --git 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 index e4a6823edc..d1f3cdb490 100644 --- 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; diff --git 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 index 280c7ced2a..25bc998797 100644 --- 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; diff --git 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 index d632fb182e..0e41660838 100644 --- 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; diff --git 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 index dfe873e36a..38b2acc9d9 100644 --- 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; diff --git 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 index 2c85cce12b..4a93c49bc0 100644 --- 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; diff --git 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 index abe0ef2372..3318d12521 100644 --- 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; diff --git 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 index 988afc1cc8..6bfefc5b52 100644 --- 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; diff --git 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 index 85a394305a..7ba6b29138 100644 --- 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; diff --git 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 index e64395e2c7..af70510f37 100644 --- 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; diff --git 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 index 64c05f8749..cf0cca44d5 100644 --- 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; diff --git 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 index f4f05d1ccc..cd1ca6dba0 100644 --- 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; diff --git 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 index c5f888c3df..4d119ae8c3 100644 --- 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; diff --git 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 index b5b1b2573d..ef9c7bac99 100644 --- 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; diff --git 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 index 1007178654..b52b43a23b 100644 --- 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; diff --git 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 index 55bbc3584a..c5e493152b 100644 --- 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; diff --git 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 index 9115ce1900..2f6c77703c 100644 --- 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; /** diff --git 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 index a48a47d484..1c7b07dd24 100644 --- 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; diff --git 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 index 5da390fd2b..8acfad1c63 100644 --- 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; diff --git 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 index 21ba9df67d..0ad140686d 100644 --- 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; diff --git 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 index ca613c8c6a..2d1d2b6384 100644 --- 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 diff --git 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 index 2b716061a0..5ea07b595e 100644 --- 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; diff --git 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 index 3ccac841d5..b99c6db976 100644 --- 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; diff --git 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 index 619735fd63..2205c04a8f 100644 --- 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; diff --git 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 index 273b3e0c69..ce07ef510a 100644 --- 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; diff --git 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 index e0e414b6dc..d1e2b01677 100644 --- 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 diff --git 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 index 262ea1a2ae..994c4c02c8 100644 --- 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; diff --git 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 index 2b6cac967b..f3001c2817 100644 --- 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; diff --git 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 index 83c2801d2b..9536405099 100644 --- 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; diff --git 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 index f07f3b5b4e..50c7c648b2 100644 --- 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; diff --git 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 index de29649495..b3e54be18c 100644 --- 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; diff --git 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 index 232b04dfef..2114e2d889 100644 --- 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; diff --git 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 index 91f56a635b..c19b3f396f 100644 --- 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; diff --git 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 index f51cb3eaa2..f23f519279 100644 --- 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; diff --git 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 index acffa65a47..1afbddaa44 100644 --- 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; diff --git a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/MogoTanluApiProvider.java b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/MogoTanluApiProvider.java index 66ea04be90..9212b2821c 100644 --- 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; diff --git a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/util/LocationUtil.kt index 6e05cc37d2..3e3313712c 100644 --- 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 diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/IMogoLocationInfoService.java b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/IMogoLocationInfoService.java index a70a9ba3a5..54ef67e8f1 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/IMogoLocationInfoService.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/location/IMogoLocationInfoService.java @@ -1,7 +1,7 @@ package com.mogo.service.cloud.location; import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.map.location.MogoLocation; +import com.mogo.eagle.core.data.map.MogoLocation; public /** diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java index 3c3470143f..6dc4174c2a 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/location/MogoLocationInfoService.java @@ -3,7 +3,7 @@ package com.mogo.service.impl.cloud.location; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.map.location.MogoLocation; +import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.cloud.location.IMogoLocationInfoService; import com.mogo.utils.logger.Logger;