From 4556727d23ce08f02d4d3c8b204ddc0bc53481db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 17:40:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=B2=89=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E5=85=AC=E7=94=A8=E4=BF=A1=E6=81=AF=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- OCH/mogo-och-bus/build.gradle | 2 ++ OCH/mogo-och-noop/build.gradle | 2 ++ OCH/mogo-och-taxi/build.gradle | 1 + .../com/mogo/och/taxi/MogoOCHTaxiModel.java | 2 +- .../mogo/och/taxi/OCHTaxiOverlayManager.java | 2 +- .../com/mogo/och/taxi/ui/OCHTaxiFragment.java | 2 +- OCH/mogo-och/build.gradle | 2 ++ .../function/hmi/ui/widget/SpeedPanelView.kt | 2 +- .../mogo/eagle/core/data}/map/MogoLatLng.java | 2 +- .../eagle/core/data/model/V2XThreatIndInfo.kt | 4 ++-- .../mogo/map/impl/amap/AMapNaviViewWrapper.java | 2 +- .../com/mogo/map/impl/amap/AMapViewWrapper.java | 2 +- .../map/impl/amap/marker/AMapMarkerWrapper.java | 2 +- .../impl/amap/navi/AMapNaviListenerAdapter.java | 2 +- .../map/impl/amap/navi/CalculatePathItem.java | 2 +- .../com/mogo/map/impl/amap/navi/NaviClient.java | 2 +- .../map/impl/amap/navi/NaviListenerAdapter.java | 2 +- .../map/impl/amap/navi/NaviOverlayHelper.java | 2 +- .../impl/amap/overlay/AMapPolylineWrapper.java | 2 +- .../impl/amap/overlay/RouteOverlayHelper.java | 2 +- .../map/impl/amap/search/RoadSearchClient.java | 2 +- .../impl/amap/search/TrafficSearchClient.java | 2 +- .../amap/uicontroller/AMapUIController.java | 2 +- .../impl/amap/utils/CoordinateConvertUtils.java | 2 +- .../mogo/map/impl/amap/utils/MogoMapUtils.java | 2 +- .../mogo/map/impl/amap/utils/ObjectUtils.java | 2 +- libraries/map-autonavi/build.gradle | 1 + .../map/impl/automap/navi/AutoNaviClient.java | 2 +- libraries/map-custom/build.gradle | 1 + .../mogo/map/impl/custom/AMapViewWrapper.java | 2 +- .../impl/custom/marker/AMapMarkerWrapper.java | 3 +-- .../map/impl/custom/navi/CalculatePathItem.java | 2 +- .../mogo/map/impl/custom/navi/NaviClient.java | 8 +------- .../impl/custom/navi/NaviListenerAdapter.java | 2 +- .../map/impl/custom/navi/NaviOverlayHelper.java | 2 +- .../custom/overlay/AMapPolylineWrapper.java | 2 +- .../impl/custom/overlay/RouteOverlayHelper.java | 2 +- .../impl/custom/search/RoadSearchClient.java | 2 +- .../custom/uicontroller/AMapUIController.java | 3 +-- .../map/impl/custom/utils/MogoMapUtils.java | 4 +--- .../mogo/map/impl/custom/utils/ObjectUtils.java | 6 +----- .../custom/utils/PointInterpolatorUtil.java | 2 +- libraries/mogo-map-api/build.gradle | 1 + .../com/mogo/map/listener/IMogoMapListener.java | 2 +- .../map/listener/MogoMapListenerHandler.java | 3 +-- .../java/com/mogo/map/marker/IMogoMarker.java | 3 +-- .../com/mogo/map/marker/IMogoMarkerManager.java | 2 +- .../com/mogo/map/marker/MogoMarkerOptions.java | 2 +- .../main/java/com/mogo/map/model/MogoPoi.java | 2 +- .../navi/IMogoCarLocationChangedListener.java | 3 ++- .../main/java/com/mogo/map/navi/IMogoNavi.java | 3 +-- .../com/mogo/map/navi/MogoCalculatePath.java | 2 +- .../com/mogo/map/navi/MogoCongestionLink.java | 2 +- .../com/mogo/map/overlay/IMogoPolyline.java | 2 +- .../mogo/map/overlay/MogoPolylineOptions.java | 2 +- .../search/drive/IMogoRoadSearchListener.java | 2 +- .../map/search/drive/MogoRoadSearchQuery.java | 2 +- .../com/mogo/map/search/geo/MogoAoiItem.java | 2 +- .../mogo/map/search/geo/MogoBusinessArea.java | 2 +- .../mogo/map/search/geo/MogoGeocodeAddress.java | 2 +- .../com/mogo/map/search/geo/MogoPoiItem.java | 2 +- .../mogo/map/search/geo/MogoRegeocodeRoad.java | 2 +- .../mogo/map/search/geo/MogoStreetNumber.java | 2 +- .../com/mogo/map/search/geo/MogoSubPoiItem.java | 2 +- .../search/geo/query/MogoRegeocodeQuery.java | 2 +- .../com/mogo/map/search/inputtips/MogoTip.java | 2 +- .../inputtips/query/MogoInputtipsQuery.java | 2 +- .../map/search/poisearch/MogoSearchBound.java | 2 +- .../poisearch/query/MogoPoiSearchQuery.java | 2 +- .../map/search/traffic/IMogoTrafficSearch.java | 2 +- .../search/traffic/MogoTrafficStatusInfo.java | 2 +- .../map/uicontroller/IMogoMapUIController.java | 2 +- .../map/uicontroller/MapCameraPosition.java | 2 +- libraries/mogo-map/build.gradle | 2 ++ .../java/com/mogo/map/MogoMapUIController.java | 1 + .../java/com/mogo/map/MogoMarkerManager.java | 3 ++- .../src/main/java/com/mogo/map/MogoNavi.java | 1 + .../java/com/mogo/map/MogoTrafficSearch.java | 1 + modules/mogo-module-adas/build.gradle | 1 + .../mogo/module/adas/AdasAutoPilotManager.java | 2 +- .../module/adas/overlay/LineOverlayManager.java | 3 +-- .../adas/receiver/TestAdasFuncManager.java | 2 +- modules/mogo-module-common/build.gradle | 2 ++ .../common/adapter/MogoMapListenerAdapter.java | 2 +- .../drawer/AdasRecognizedResultDrawer.java | 4 +--- .../mogo/module/common/drawer/MarkerDrawer.java | 2 +- .../module/common/drawer/OnlineCarDrawer.java | 3 +-- .../common/drawer/SnapshotSetDataDrawer.java | 2 +- .../module/common/drawer/TrafficMarkerDrawer.kt | 6 +++--- .../module/common/drawer/V2XWarnDataDrawer.java | 8 +------- .../common/entity/RoadTrafficSegment.java | 2 +- .../module/common/entity/RoadTrafficStatus.java | 2 +- .../module/common/entity/V2XWarningEntity.java | 2 +- .../mogo/module/common/utils/LocationUtils.java | 3 +-- .../mogo/module/common/utils/Trigonometric.java | 2 +- modules/mogo-module-extensions/build.gradle | 2 ++ .../extensions/entrance/EntranceFragment.java | 4 +--- modules/mogo-module-main/build.gradle | 2 ++ .../mogo/module/main/EventDispatchCenter.java | 3 +-- .../java/com/mogo/module/main/SchemeIntent.java | 3 +-- modules/mogo-module-map/build.gradle | 3 +++ .../java/com/mogo/module/map/MapPresenter.java | 2 +- modules/mogo-module-search/build.gradle | 2 ++ .../module/navi/bean/EntityConvertUtils.java | 2 +- .../module/navi/manager/MogoAddressManager.java | 2 +- .../module/navi/manager/MogoSearchManager.java | 5 +---- .../navi/manager/MogoSearchManagerImpl.kt | 4 ++-- .../navi/ui/search/CategoryPresenter.java | 2 +- .../navi/ui/search/CategorySearchFragment.kt | 5 ++--- .../module/navi/ui/search/ChoosePathFragment.kt | 6 +++--- .../navi/ui/setting/SettingAddressFragment.kt | 10 +++++----- modules/mogo-module-service/build.gradle | 2 ++ .../com/mogo/module/service/MogoServices.java | 3 +-- .../java/com/mogo/module/service/Utils.java | 2 +- .../dispatch/DispatchAutoPilotManager.java | 2 +- .../DispatchAdasAutoPilotLocReceiverBean.java | 2 +- .../service/intent/MockIntentHandler.java | 2 +- .../intent/OnlineCarSearchIntentHandler.java | 2 +- .../launchercard/LauncherCardRefresher.java | 2 +- .../module/service/marker/MapMarkerManager.java | 2 +- .../module/service/network/RefreshModel.java | 9 +-------- .../service/network/ZhidaoRefreshModel.java | 17 +---------------- .../service/network/bean/TtsConfigBody.java | 2 +- .../panel/OnlineCarPanelPresenter.java | 2 +- .../polyline/LimberCollisionPolyline.java | 2 +- .../module/service/refresh/RefreshObject.java | 2 +- .../module/service/utils/LocationParseUtil.java | 2 +- .../utils/SimpleLocationCorrectStrategy.java | 2 +- modules/mogo-module-share/build.gradle | 2 ++ .../module/share/TanluCardViewProvider.java | 2 +- .../com/mogo/module/share/TanluManager.java | 2 +- .../share/manager/TrafficUploadManager.kt | 8 ++++++-- .../mogo/module/share/manager/UploadHelper.kt | 7 +++++-- .../AccidentStrategyReceiver.kt | 10 +++++++--- .../share/strategyreceiver/BlockStrategy.kt | 14 +++++++++----- modules/mogo-module-smp/build.gradle | 1 + .../module/small/map/SmallMapDirectionView.java | 2 +- .../mogo/module/small/map/SmallMapFragment.java | 2 +- .../mogo/module/small/map/SmallMapProvider.java | 2 +- .../small/map/view/ISmallMapDirectionView.java | 2 +- modules/mogo-module-v2x/build.gradle | 2 ++ .../com/mogo/module/v2x/V2XMarkerService.java | 2 +- .../com/mogo/module/v2x/V2XModuleProvider.java | 3 +-- .../com/mogo/module/v2x/V2XStatusManager.java | 3 +-- .../v2x/adapter/holder/V2XBaseViewHolder.java | 2 +- .../v2x/adapter/holder/V2XEventUgcVH.java | 2 +- .../v2x/adapter/holder/V2XFatigueDrivingVH.java | 3 +-- .../holder/V2XHistoryBaseViewHolder.java | 3 +-- .../mogo/module/v2x/alarm/V2XAlarmServer.java | 2 +- .../v2x/entity/model/CloundWarningInfo.java | 2 +- .../module/v2x/entity/model/DrawLineInfo.java | 2 +- .../v2x/entity/net/V2XOptimalRouteDataRes.java | 2 +- .../v2x/fragment/V2XSurroundingFragment.java | 2 +- .../v2x/listener/V2XLocationListener.java | 2 +- .../v2x/listener/V2XMessageListener_401012.java | 2 +- .../impl/MoGoPersonWarnPolylineManager.java | 3 +-- .../manager/impl/MoGoStopPolylineManager.java | 3 +-- .../v2x/manager/impl/MoGoV2XMarkerManager.java | 2 +- .../manager/impl/MoGoV2XPolylineManager.java | 2 +- .../manager/impl/MoGoWarnPolylineManager.java | 4 +--- .../module/v2x/network/V2XRefreshModel.java | 2 +- .../v2x/observer/V2XOptimalRouteObserver.java | 2 +- .../v2x/overlay/V2XOptimalRouteOverlay.java | 2 +- .../receiver/TestPanelBroadcastReceiver.java | 2 +- .../fatigue/V2XFatigueDrivingScenario.java | 2 +- .../scenario/scene/obu/OptimalSpeedMarker.java | 2 +- .../scenario/scene/obu/V2XObuEventScenario.java | 4 +--- .../scene/warning/V2XFrontWarningScenario.java | 2 +- .../scene/warning/V2XWarningMarker.java | 12 +----------- .../scene/warning/V2XWarningWindow.java | 9 +-------- .../mogo/module/v2x/utils/LocationUtils.java | 2 +- .../com/mogo/module/v2x/utils/MarkerUtils.java | 2 +- .../module/v2x/utils/TestOnLineCarUtils.java | 2 +- modules/tanlulib/build.gradle | 2 ++ .../zhidao/roadcondition/model/LocationInfo.kt | 6 +++--- .../zhidao/roadcondition/util/LocationUtil.kt | 6 +++--- services/mogo-service-api/build.gradle | 2 ++ .../service/adas/IMogoAdasRouteCallBack.java | 2 +- .../service/module/IMogoAddressManager.java | 2 +- .../mogo/service/module/IMogoSearchManager.java | 2 +- .../service/share/IMogoTanluUiProvider.java | 2 +- .../mogo/service/share/TanluUploadParams.java | 2 +- .../mogo/service/smp/IMogoSmallMapProvider.java | 2 +- services/mogo-service/build.gradle | 2 ++ .../service/impl/adas/MogoADASController.java | 2 +- 185 files changed, 241 insertions(+), 270 deletions(-) rename {libraries/mogo-map-api/src/main/java/com/mogo => core/mogo-core-data/src/main/java/com/mogo/eagle/core/data}/map/MogoLatLng.java (98%) diff --git a/OCH/mogo-och-bus/build.gradle b/OCH/mogo-och-bus/build.gradle index 0cfd857606..55525d9984 100644 --- a/OCH/mogo-och-bus/build.gradle +++ b/OCH/mogo-och-bus/build.gradle @@ -56,6 +56,8 @@ dependencies { implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") implementation project(":modules:mogo-module-common") + implementation project(':core:mogo-core-data') + } } diff --git a/OCH/mogo-och-noop/build.gradle b/OCH/mogo-och-noop/build.gradle index 05bf3ff391..19a041cbe2 100644 --- a/OCH/mogo-och-noop/build.gradle +++ b/OCH/mogo-och-noop/build.gradle @@ -48,6 +48,8 @@ dependencies { implementation project(":OCH:mogo-och") implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") + implementation project(':core:mogo-core-data') + } } diff --git a/OCH/mogo-och-taxi/build.gradle b/OCH/mogo-och-taxi/build.gradle index a98a531507..0453ce4c85 100644 --- a/OCH/mogo-och-taxi/build.gradle +++ b/OCH/mogo-och-taxi/build.gradle @@ -52,6 +52,7 @@ dependencies { implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") implementation project(":modules:mogo-module-common") + implementation project(':core:mogo-core-data') } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java index 5020733d92..0af32891ae 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java @@ -9,7 +9,7 @@ import com.mogo.cloud.commons.utils.CoordinateUtils; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.data.BaseData; import com.mogo.commons.network.SubscribeImpl; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.HostConst; 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 a808d35cbd..a6ecb368d8 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 @@ -2,7 +2,7 @@ package com.mogo.och.taxi; import android.content.Context; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import com.mogo.map.overlay.IMogoOverlayManager; import com.mogo.map.overlay.IMogoPolyline; 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 b7e177fb3f..be246c3d75 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 @@ -8,7 +8,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.mogo.cloud.commons.utils.CoordinateUtils; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.map.overlay.MogoPolylineOptions; diff --git a/OCH/mogo-och/build.gradle b/OCH/mogo-och/build.gradle index c39f87ffff..1a55b51f32 100644 --- a/OCH/mogo-och/build.gradle +++ b/OCH/mogo-och/build.gradle @@ -50,6 +50,8 @@ dependencies { implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") implementation project(":modules:mogo-module-common") + implementation project(':core:mogo-core-data') + } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index bd658caa2f..27cea7edc7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -12,7 +12,7 @@ import android.widget.FrameLayout import com.alibaba.android.arouter.launcher.ARouter import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.function.hmi.R -import com.mogo.map.MogoLatLng +import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.map.navi.IMogoCarLocationChangedListener2 import com.mogo.module.common.MogoApisHandler import com.mogo.service.IMogoServiceApis diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoLatLng.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java similarity index 98% rename from libraries/mogo-map-api/src/main/java/com/mogo/map/MogoLatLng.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java index 5c7629e2f1..8c47532497 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoLatLng.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java @@ -1,4 +1,4 @@ -package com.mogo.map; +package com.mogo.eagle.core.data.map; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/model/V2XThreatIndInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/model/V2XThreatIndInfo.kt index 21250eac29..43e103e990 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/model/V2XThreatIndInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/model/V2XThreatIndInfo.kt @@ -34,11 +34,11 @@ class V2XThreatIndInfo { // /** // * Wgs84坐标系，线性经纬度轨迹列表 // */ -// private val locus_list: List? = null +// private val locus_list: List? = null // // /** // * 高德坐标系Gcj，线性经纬度轨迹列表 // */ -// private val gd_locus_list: List? = null +// private val gd_locus_list: List? = null } \ No newline at end of file diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index fa63207538..42bd0084dd 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -34,7 +34,7 @@ import com.amap.api.navi.enums.AMapNaviViewShowMode; import com.amap.api.navi.model.NaviInfo; import com.mogo.map.IMogoMap; import com.mogo.map.IMogoMapView; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.hook.BnHooker; import com.mogo.map.impl.amap.marker.AMapMarkerWrapper; import com.mogo.map.impl.amap.message.AMapMessageListener; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index f2d77f5907..a77d9729fe 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -29,7 +29,7 @@ import com.amap.api.maps.model.animation.TranslateAnimation; import com.amap.api.navi.model.NaviInfo; import com.mogo.map.IMogoMap; import com.mogo.map.IMogoMapView; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.hook.BnHooker; import com.mogo.map.impl.amap.marker.AMapMarkerWrapper; import com.mogo.map.impl.amap.message.AMapMessageListener; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java index fb1443b279..9b63643fba 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java @@ -18,7 +18,7 @@ import com.amap.api.maps.model.animation.TranslateAnimation; import com.amap.api.maps.utils.overlay.MovingPointOverlay; import com.autonavi.amap.mapcore.IPoint; import com.mogo.commons.AbsMogoApplication; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.AMapWrapper; import com.mogo.map.impl.amap.utils.ObjectUtils; import com.mogo.map.marker.IMogoInfoWindowAdapter; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AMapNaviListenerAdapter.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AMapNaviListenerAdapter.java index ab14875e9e..7027991eaa 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AMapNaviListenerAdapter.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AMapNaviListenerAdapter.java @@ -17,7 +17,7 @@ import com.amap.api.navi.model.NaviInfo; import com.autonavi.tbt.TrafficFacilityInfo; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.voice.AIAssist; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.utils.logger.Logger; import java.util.List; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/CalculatePathItem.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/CalculatePathItem.java index 8a705ce576..d1dc20389f 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/CalculatePathItem.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/CalculatePathItem.java @@ -7,7 +7,7 @@ import com.amap.api.maps.AMap; import com.amap.api.navi.model.AMapNaviPath; import com.amap.api.navi.model.AMapNaviStep; import com.amap.api.navi.model.NaviLatLng; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.overlay.RouteOverLayWrapper; import java.util.ArrayList; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java index 5f49def021..dd2d019c1f 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java @@ -13,7 +13,7 @@ import com.amap.api.navi.model.AMapNaviPath; import com.amap.api.navi.model.NaviLatLng; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.AMapWrapper; import com.mogo.map.impl.amap.message.AMapMessageManager; import com.mogo.map.impl.amap.utils.ObjectUtils; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java index d7efa99215..f1294a4316 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java @@ -13,7 +13,7 @@ import com.amap.api.navi.model.AMapNaviCameraInfo; import com.amap.api.navi.model.AMapNaviLocation; import com.amap.api.navi.model.NaviInfo; import com.mogo.commons.voice.AIAssist; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.AMapWrapper; import com.mogo.map.impl.amap.message.AMapMessageManager; import com.mogo.map.impl.amap.utils.ObjectUtils; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java index 1e4b63ed3e..20f37b9efc 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java @@ -18,7 +18,7 @@ import com.amap.api.navi.model.AMapNaviLocation; import com.amap.api.navi.model.AMapNaviPath; import com.amap.api.navi.model.NaviInfo; import com.amap.api.navi.model.NaviLatLng; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.AMapWrapper; import com.mogo.map.impl.amap.R; import com.mogo.map.impl.amap.overlay.RouteOverLayWrapper; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/AMapPolylineWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/AMapPolylineWrapper.java index 0c2766d842..88e4b21346 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/AMapPolylineWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/AMapPolylineWrapper.java @@ -3,7 +3,7 @@ package com.mogo.map.impl.amap.overlay; import com.amap.api.maps.model.LatLng; import com.amap.api.maps.model.Polyline; import com.amap.api.maps.model.PolylineOptions; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.utils.ObjectUtils; import com.mogo.map.overlay.IMogoPolyline; import com.mogo.map.overlay.MogoPolylineOptions; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverlayHelper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverlayHelper.java index 2cdbc7ff32..62a86be0dc 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverlayHelper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverlayHelper.java @@ -5,7 +5,7 @@ import android.content.Context; import com.amap.api.services.core.LatLonPoint; import com.amap.api.services.route.DriveRouteResult; import com.amap.api.services.route.RouteSearch; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.AMapWrapper; import com.mogo.map.impl.amap.InterceptorHandler; import com.mogo.utils.logger.Logger; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java index 55dc81ad65..73f4b45b5a 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java @@ -10,7 +10,7 @@ import com.amap.api.services.route.DriveStep; import com.amap.api.services.route.RideRouteResult; import com.amap.api.services.route.RouteSearch; import com.amap.api.services.route.WalkRouteResult; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.amap.utils.ObjectUtils; import com.mogo.map.search.drive.IMogoRoadSearch; import com.mogo.map.search.drive.IMogoRoadSearchListener; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/TrafficSearchClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/TrafficSearchClient.java index c09b514f2d..fa772f2c7b 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/TrafficSearchClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/TrafficSearchClient.java @@ -8,7 +8,7 @@ import com.amap.api.services.traffic.TrafficStatusEvaluation; import com.amap.api.services.traffic.TrafficStatusInfo; import com.amap.api.services.traffic.TrafficStatusResult; import com.mogo.commons.AbsMogoApplication; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.search.traffic.IMogoTrafficSearch; import com.mogo.map.search.traffic.IMogoTrafficSearchListener; import com.mogo.map.search.traffic.MogoTrafficResult; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java index cb294f50ed..0bb8ebc73b 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java @@ -6,7 +6,7 @@ import android.location.Location; import android.view.View; import android.view.animation.Interpolator; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.EnumMapUI; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/CoordinateConvertUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/CoordinateConvertUtils.java index c77e1ca6c8..f4542d2fa6 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/CoordinateConvertUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/CoordinateConvertUtils.java @@ -4,7 +4,7 @@ import android.content.Context; import com.amap.api.maps.CoordinateConverter; import com.amap.api.maps.model.LatLng; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.ArrayList; import java.util.List; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MogoMapUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MogoMapUtils.java index ee152da0cb..91a51fc994 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MogoMapUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/MogoMapUtils.java @@ -2,7 +2,7 @@ package com.mogo.map.impl.amap.utils; import com.amap.api.maps.model.LatLng; import com.amap.api.maps.model.LatLngBounds; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.exception.MogoMapException; import com.mogo.utils.logger.Logger; diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java index 26bb9545f5..db7af8df93 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java @@ -38,7 +38,7 @@ import com.amap.api.services.poisearch.PoiResult; import com.amap.api.services.poisearch.PoiSearch; import com.amap.api.services.poisearch.SubPoiItem; import com.amap.api.services.road.Crossroad; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import com.mogo.map.marker.IMogoMarkerIconViewCreator; import com.mogo.map.marker.MogoMarkerOptions; diff --git a/libraries/map-autonavi/build.gradle b/libraries/map-autonavi/build.gradle index 46cf993136..4e7f6f5255 100644 --- a/libraries/map-autonavi/build.gradle +++ b/libraries/map-autonavi/build.gradle @@ -39,6 +39,7 @@ dependencies { implementation project(':foudations:mogo-commons') implementation project(':services:mogo-service-api') + implementation project(':core:mogo-core-data') } } diff --git a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java index 8e082f3bfd..87e8d8a351 100644 --- a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java +++ b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.graphics.Rect; import android.location.Location; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.navi.MogoCalculatePath; diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 825f47b24f..07236c1b18 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -61,6 +61,7 @@ dependencies { implementation project(':foudations:mogo-utils') implementation project(':libraries:mogo-map-api') implementation project(':foudations:mogo-commons') + implementation project(':core:mogo-core-data') } implementation rootProject.ext.dependencies.mogocustommap } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 8b5ff25f57..376bd68a9a 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -25,7 +25,7 @@ import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.commons.debug.DebugConfig; import com.mogo.map.IMogoMap; import com.mogo.map.IMogoMapView; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.custom.location.GpsTester; import com.mogo.map.impl.custom.navi.NaviClient; import com.mogo.map.impl.custom.utils.MogoMapUtils; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java index a069dda1f6..ba8c773439 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java @@ -6,9 +6,8 @@ import android.text.TextUtils; import android.view.View; import android.view.animation.Interpolator; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.custom.utils.ObjectUtils; -import com.mogo.map.impl.custom.utils.ResIdCache; import com.mogo.map.marker.IMogoInfoWindowAdapter; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/CalculatePathItem.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/CalculatePathItem.java index 40a62e5d48..f670912d9e 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/CalculatePathItem.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/CalculatePathItem.java @@ -7,7 +7,7 @@ //import com.amap.api.navi.model.AMapNaviPath; //import com.amap.api.navi.model.AMapNaviStep; //import com.amap.api.navi.model.NaviLatLng; -//import com.mogo.map.MogoLatLng; +//import com.mogo.eagle.core.data.map.MogoLatLng; //import com.mogo.map.impl.custom.overlay.RouteOverLayWrapper; // //import java.util.ArrayList; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviClient.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviClient.java index b5ca09f758..78ade2f5ec 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviClient.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviClient.java @@ -10,25 +10,19 @@ import android.location.Location; //import com.amap.api.navi.enums.AimLessMode; //import com.amap.api.navi.enums.NaviType; //import com.amap.api.navi.model.NaviLatLng; -import com.mogo.commons.AbsMogoApplication; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.custom.AMapWrapper; -import com.mogo.map.impl.custom.message.AMapMessageManager; -import com.mogo.map.impl.custom.utils.ObjectUtils; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.navi.MogoCalculatePath; import com.mogo.map.navi.MogoCarLocationChangedListenerRegister; import com.mogo.map.navi.MogoNaviConfig; -import com.mogo.map.navi.MogoNaviListenerHandler; import com.mogo.map.navi.OnCalculatePathItemClickInteraction; import com.mogo.utils.logger.Logger; import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidaoauto.map.sdk.open.poyline.Polyline; import com.zhidaoauto.map.sdk.open.view.MapAutoViewHelper; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviListenerAdapter.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviListenerAdapter.java index fee1514b3a..9bafac5602 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviListenerAdapter.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviListenerAdapter.java @@ -14,7 +14,7 @@ //import com.amap.api.navi.model.AMapNaviLocation; //import com.amap.api.navi.model.NaviInfo; //import com.mogo.commons.voice.AIAssist; -//import com.mogo.map.MogoLatLng; +//import com.mogo.eagle.core.data.map.MogoLatLng; //import com.mogo.map.impl.custom.message.AMapMessageManager; //import com.mogo.map.impl.custom.utils.ObjectUtils; //import com.mogo.map.navi.MogoCalculatePath; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviOverlayHelper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviOverlayHelper.java index 4dbebe02b1..11dcceac3f 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviOverlayHelper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/navi/NaviOverlayHelper.java @@ -19,7 +19,7 @@ //import com.amap.api.navi.model.AMapNaviPath; //import com.amap.api.navi.model.NaviInfo; //import com.amap.api.navi.model.NaviLatLng; -//import com.mogo.map.MogoLatLng; +//import com.mogo.eagle.core.data.map.MogoLatLng; //import com.mogo.map.impl.custom.R; //import com.mogo.map.impl.custom.overlay.RouteOverLayWrapper; //import com.mogo.map.marker.MogoMarkersHandler; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/AMapPolylineWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/AMapPolylineWrapper.java index a4c8e2e538..bbb662d128 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/AMapPolylineWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/AMapPolylineWrapper.java @@ -1,7 +1,7 @@ package com.mogo.map.impl.custom.overlay; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.impl.custom.utils.ObjectUtils; import com.mogo.map.overlay.IMogoPolyline; import com.mogo.map.overlay.MogoPolylineOptions; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/RouteOverlayHelper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/RouteOverlayHelper.java index 4b0428c501..5c8dc0f86b 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/RouteOverlayHelper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/overlay/RouteOverlayHelper.java @@ -5,7 +5,7 @@ //import com.amap.api.services.core.LatLonPoint; //import com.amap.api.services.route.DriveRouteResult; //import com.amap.api.services.route.RouteSearch; -//import com.mogo.map.MogoLatLng; +//import com.mogo.eagle.core.data.map.MogoLatLng; //import com.mogo.map.impl.custom.AMapWrapper; //import com.mogo.map.impl.custom.InterceptorHandler; //import com.mogo.utils.logger.Logger; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java index 9610ba22fb..92bfe97367 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/RoadSearchClient.java @@ -2,7 +2,7 @@ package com.mogo.map.impl.custom.search; import android.content.Context; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.search.drive.IMogoRoadSearch; import com.mogo.map.search.drive.IMogoRoadSearchListener; import com.mogo.map.search.drive.MogoRoadSearchQuery; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java index 654f33047b..d51e914a16 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java @@ -6,7 +6,7 @@ import android.location.Location; import android.view.View; import android.view.animation.Interpolator; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.EnumMapUI; @@ -14,7 +14,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.MapCameraPosition; import com.mogo.map.uicontroller.MapControlResult; import com.mogo.map.uicontroller.VisualAngleMode; -import com.mogo.utils.logger.Logger; import com.zhidaoauto.map.sdk.open.MapAutoApi; import org.json.JSONObject; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java index bd5865b560..a6e709160c 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/MogoMapUtils.java @@ -1,8 +1,6 @@ package com.mogo.map.impl.custom.utils; -import android.util.Log; - -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.exception.MogoMapException; import com.zhidaoauto.map.sdk.open.camera.LatLngBounds; import com.zhidaoauto.map.sdk.open.query.LonLatPoint; 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 be0ba2ae21..35cbc9819b 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 @@ -5,8 +5,7 @@ import android.graphics.Color; import android.text.TextUtils; import android.view.View; -import com.mogo.cloud.commons.utils.CoordinateUtils; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.overlay.MogoPolylineOptions; @@ -23,10 +22,7 @@ import com.mogo.map.search.poisearch.MogoPoiResult; import com.mogo.map.search.poisearch.MogoSearchBound; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.uicontroller.MapCameraPosition; -import com.mogo.utils.logger.Logger; import com.zhidaoauto.map.sdk.open.camera.CameraPosition; -import com.zhidaoauto.map.sdk.open.data.MapDataApi; -import com.zhidaoauto.map.sdk.open.data.SinglePointRoadInfo; import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptor; import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory; import com.zhidaoauto.map.sdk.open.marker.MarkerOptions; diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java index ccd8dc5321..93c0409dcd 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java @@ -1,7 +1,7 @@ package com.mogo.map.impl.custom.utils; import com.mogo.cloud.commons.utils.CoordinateUtils; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.utils.logger.Logger; import com.zhidaoauto.map.sdk.open.query.LonLatPoint; diff --git a/libraries/mogo-map-api/build.gradle b/libraries/mogo-map-api/build.gradle index 983487d047..dac2b70e1a 100644 --- a/libraries/mogo-map-api/build.gradle +++ b/libraries/mogo-map-api/build.gradle @@ -36,6 +36,7 @@ dependencies { implementation rootProject.ext.dependencies.mogoutils } else { implementation project(':foudations:mogo-utils') + implementation project(':core:mogo-core-data') } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java index 53b8db5544..85d8e3bf32 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/IMogoMapListener.java @@ -2,7 +2,7 @@ package com.mogo.map.listener; import android.view.MotionEvent; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.model.MogoPoi; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.VisualAngleMode; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java index 312a6e9aea..91aa8a9f53 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java @@ -1,9 +1,8 @@ package com.mogo.map.listener; -import android.util.Log; import android.view.MotionEvent; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.model.MogoPoi; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.VisualAngleMode; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java index d1605deb43..e9c9641784 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java @@ -1,6 +1,5 @@ package com.mogo.map.marker; -import android.content.Context; import android.graphics.Bitmap; import android.graphics.Point; import android.view.View; @@ -8,7 +7,7 @@ import android.view.animation.Interpolator; import androidx.annotation.RawRes; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.marker.anim.OnMarkerAnimationListener; import java.util.ArrayList; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java index 3262caa27f..018ee1d7a0 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java @@ -2,7 +2,7 @@ package com.mogo.map.marker; import android.content.Context; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.ArrayList; import java.util.List; 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 d6307452fe..4d48901067 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 @@ -6,7 +6,7 @@ import android.view.View; import androidx.annotation.RawRes; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import java.util.ArrayList; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/model/MogoPoi.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/model/MogoPoi.java index c0d287db72..42ce3a00c3 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/model/MogoPoi.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/model/MogoPoi.java @@ -3,7 +3,7 @@ package com.mogo.map.model; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java index 30a1581828..fc4d7e4cf1 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener.java @@ -1,6 +1,7 @@ package com.mogo.map.navi; -import com.mogo.map.MogoLatLng; + +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java index c53bdbb124..7d99de5385 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java @@ -3,8 +3,7 @@ package com.mogo.map.navi; import android.graphics.Rect; import android.location.Location; -import com.mogo.map.MogoLatLng; -import com.mogo.map.location.MogoLocation; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.List; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java index ec44cd59cb..28a7cb29c5 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCalculatePath.java @@ -1,7 +1,7 @@ package com.mogo.map.navi; import android.text.TextUtils; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.List; /** diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionLink.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionLink.java index 47ac00720a..228cf2ebc5 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionLink.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoCongestionLink.java @@ -3,7 +3,7 @@ package com.mogo.map.navi; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.ArrayList; import java.util.List; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoPolyline.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoPolyline.java index f20e545720..15a0350051 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoPolyline.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMogoPolyline.java @@ -3,7 +3,7 @@ package com.mogo.map.overlay; import androidx.annotation.ColorInt; import com.mogo.map.IDestroyable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.List; 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 929390c731..1a9bd7074b 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 @@ -4,7 +4,7 @@ import android.graphics.Color; import androidx.annotation.ColorInt; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.location.MogoLocation; import java.util.ArrayList; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearchListener.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearchListener.java index 87d3c5eb3d..101ac5f250 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearchListener.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/IMogoRoadSearchListener.java @@ -1,6 +1,6 @@ package com.mogo.map.search.drive; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.List; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/MogoRoadSearchQuery.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/MogoRoadSearchQuery.java index 00684eb74c..b85d3b1553 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/MogoRoadSearchQuery.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/drive/MogoRoadSearchQuery.java @@ -1,6 +1,6 @@ package com.mogo.map.search.drive; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.List; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoAoiItem.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoAoiItem.java index 98b4c8ef03..ee3ea1df4b 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoAoiItem.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoAoiItem.java @@ -3,7 +3,7 @@ package com.mogo.map.search.geo; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoBusinessArea.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoBusinessArea.java index d8e48978e1..87ffc0cbc1 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoBusinessArea.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoBusinessArea.java @@ -3,7 +3,7 @@ package com.mogo.map.search.geo; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoGeocodeAddress.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoGeocodeAddress.java index f92f294de2..5b8a14ccda 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoGeocodeAddress.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoGeocodeAddress.java @@ -1,6 +1,6 @@ package com.mogo.map.search.geo; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoPoiItem.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoPoiItem.java index 27ed374472..1396e79f95 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoPoiItem.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoPoiItem.java @@ -3,7 +3,7 @@ package com.mogo.map.search.geo; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.ArrayList; import java.util.List; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoRegeocodeRoad.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoRegeocodeRoad.java index 59b32cbcf2..7e142de3ff 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoRegeocodeRoad.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoRegeocodeRoad.java @@ -3,7 +3,7 @@ package com.mogo.map.search.geo; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoStreetNumber.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoStreetNumber.java index c026129e36..9068052787 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoStreetNumber.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoStreetNumber.java @@ -3,7 +3,7 @@ package com.mogo.map.search.geo; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoSubPoiItem.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoSubPoiItem.java index b43ff95317..fcd3891003 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoSubPoiItem.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/MogoSubPoiItem.java @@ -3,7 +3,7 @@ package com.mogo.map.search.geo; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoRegeocodeQuery.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoRegeocodeQuery.java index 75446b08d6..c060987019 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoRegeocodeQuery.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoRegeocodeQuery.java @@ -3,7 +3,7 @@ package com.mogo.map.search.geo.query; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/MogoTip.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/MogoTip.java index 26aeb8de5d..2f0be191e9 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/MogoTip.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/MogoTip.java @@ -3,7 +3,7 @@ package com.mogo.map.search.inputtips; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/query/MogoInputtipsQuery.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/query/MogoInputtipsQuery.java index 16e10de6bc..3e8842fe76 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/query/MogoInputtipsQuery.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/inputtips/query/MogoInputtipsQuery.java @@ -1,6 +1,6 @@ package com.mogo.map.search.inputtips.query; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/MogoSearchBound.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/MogoSearchBound.java index 773ae1b650..06cee16726 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/MogoSearchBound.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/MogoSearchBound.java @@ -3,7 +3,7 @@ package com.mogo.map.search.poisearch; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.List; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java index 76f8ed09d6..32d7ea839b 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java @@ -3,7 +3,7 @@ package com.mogo.map.search.poisearch.query; import android.os.Parcel; import android.os.Parcelable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/IMogoTrafficSearch.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/IMogoTrafficSearch.java index 063d0fcb80..5425813832 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/IMogoTrafficSearch.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/IMogoTrafficSearch.java @@ -1,6 +1,6 @@ package com.mogo.map.search.traffic; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; public interface IMogoTrafficSearch { diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/MogoTrafficStatusInfo.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/MogoTrafficStatusInfo.java index da5692b81a..33c3107467 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/MogoTrafficStatusInfo.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/traffic/MogoTrafficStatusInfo.java @@ -1,6 +1,6 @@ package com.mogo.map.search.traffic; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.List; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 31b5eba192..7df23c1442 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -8,7 +8,7 @@ import android.view.animation.Interpolator; import androidx.annotation.Nullable; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.anim.OnMarkerAnimationListener; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/MapCameraPosition.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/MapCameraPosition.java index 52ea00bfad..8ca1781777 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/MapCameraPosition.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/MapCameraPosition.java @@ -1,6 +1,6 @@ package com.mogo.map.uicontroller; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author congtaowang diff --git a/libraries/mogo-map/build.gradle b/libraries/mogo-map/build.gradle index f072b5cf2c..6891d56a23 100644 --- a/libraries/mogo-map/build.gradle +++ b/libraries/mogo-map/build.gradle @@ -36,6 +36,8 @@ dependencies { implementation project(':libraries:mogo-map-api') api project(':libraries:map-autonavi') implementation project(':foudations:mogo-commons') + + implementation project(':core:mogo-core-data') } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index 52445654ea..1178b5c2ba 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -6,6 +6,7 @@ import android.location.Location; import android.view.View; import android.view.animation.Interpolator; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.EnumMapUI; diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java index 01c96ff02d..e25fc96ecc 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java @@ -2,6 +2,7 @@ package com.mogo.map; import android.content.Context; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.marker.MogoMarkerOptions; @@ -105,7 +106,7 @@ public class MogoMarkerManager implements IMogoMarkerManager { } @Override - public void addRouteWay( Context context, MogoLatLng startPoint, MogoLatLng endPoint, List< MogoLatLng > wayPoints ) { + public void addRouteWay(Context context, MogoLatLng startPoint, MogoLatLng endPoint, List< MogoLatLng > wayPoints ) { // RouteOverlayHelper.getInstance().addRouteWay( context, startPoint, endPoint, wayPoints ); } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java index 246cf2df56..c536bf40ae 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java @@ -4,6 +4,7 @@ import android.content.Context; import android.graphics.Rect; import android.location.Location; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.navi.MogoCalculatePath; diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoTrafficSearch.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoTrafficSearch.java index 4f5bc3e4c3..c99347eb67 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoTrafficSearch.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoTrafficSearch.java @@ -1,5 +1,6 @@ package com.mogo.map; +import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.map.search.traffic.IMogoTrafficSearch; import com.mogo.map.search.traffic.IMogoTrafficSearchListener; diff --git a/modules/mogo-module-adas/build.gradle b/modules/mogo-module-adas/build.gradle index 526aa254fd..76cf2bad2d 100644 --- 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() 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 78bdb659fd..e60b7d42b4 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 @@ -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; 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 d746f4d3a0..af70a606a9 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 @@ -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; 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 cfcb213500..8b84f3f488 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 @@ -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; diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index 150dd4bc9e..f67848b1cf 100644 --- 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' diff --git 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 index 6dac8a627a..fb35abcf1f 100644 --- 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; diff --git 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 index f40121cca2..bc4cb1ac7e 100644 --- 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; diff --git 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 index cb5b948acb..023f5e633a 100644 --- 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; diff --git 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 index 58f16cadd5..43ecb09c95 100644 --- 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; diff --git 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 index 9a2c862eb8..5903a122e3 100644 --- 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; diff --git 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 index d6c8dc5554..4314acb5a9 100644 --- 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 ), diff --git 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 index 0a89862ea9..ee17d909ff 100644 --- 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; diff --git 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 index b08350f440..16044abb6d 100644 --- 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; diff --git 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 index 3280dffb2b..01491454e3 100644 --- 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; diff --git 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 index 02a4cc1322..9773232763 100644 --- 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; 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 3987281102..806da640f9 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 @@ -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; diff --git 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 index 61f5a5183f..beb1ef3083 100644 --- 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 diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index 4709d95ef3..0aedc8e945 100644 --- 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') + } } diff --git 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 index c396be0232..28fc94d57a 100644 --- 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; diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index e1ebdfcbef..e64b6ff73e 100644 --- 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') } } 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 9394603297..6bded07cb5 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 @@ -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; diff --git 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 index 7c959c2012..74dfa6c12b 100644 --- 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; diff --git a/modules/mogo-module-map/build.gradle b/modules/mogo-module-map/build.gradle index ebff9c6729..b4f1c55aee 100644 --- 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') + } } diff --git 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 index 9e34462381..f9e75d48c3 100644 --- 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; diff --git a/modules/mogo-module-search/build.gradle b/modules/mogo-module-search/build.gradle index 02e25879b6..edccd474df 100644 --- 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' diff --git 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 index 0b421ff6a4..67e79545d7 100644 --- 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; diff --git 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 index e5b4c314f6..5d675eede8 100644 --- 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; diff --git 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 index f93e774f96..5ac391975f 100644 --- 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; diff --git 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 index 91c9c01bc1..f269ee5416 100644 --- 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) diff --git 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 index ca563b4fa8..987a3dd4fc 100644 --- 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; diff --git 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 index 4fb9c33120..2baebafb9b 100644 --- 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 = ArrayList() private var arrayList = ArrayList() - private var locationList = ArrayList() + private var locationList = ArrayList() private lateinit var cmds: ArrayList diff --git 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 index 598c71c29b..f09ee0370e 100644 --- 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() diff --git 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 index bf89a36dc1..6b40b8a844 100644 --- 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() diff --git a/modules/mogo-module-service/build.gradle b/modules/mogo-module-service/build.gradle index 6cf487adb5..eea585b4bb 100644 --- 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') } } 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 f31e797e98..3e220c7e9f 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 @@ -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; diff --git 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 index 9978faf668..bc8d857307 100644 --- 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 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 3c1142c0a9..b86dd5b92b 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 @@ -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; diff --git 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 index b20952f555..a705447109 100644 --- 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; diff --git 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 index 7c515afe1b..49e85549d5 100644 --- 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; 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 e9255fac1f..abe0ef2372 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 @@ -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; 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 41d99b19f8..988afc1cc8 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 @@ -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; diff --git 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 index 91fd86008c..c99081b320 100644 --- 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; diff --git 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 index 0e10fea1ae..161ab53eb6 100644 --- 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; diff --git 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 index 32dec206c1..595ff09af9 100644 --- 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; /** diff --git 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 index 9bdb38652a..fe6a9bf359 100644 --- 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; diff --git 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 index 54049dbccf..ea24f810f1 100644 --- 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; diff --git 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 index 2ae17a8683..c7da3419fa 100644 --- 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; diff --git 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 index 9963c38d8a..e30d3953eb 100644 --- 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; /** diff --git 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 index 82a0071e9f..0749b00887 100644 --- 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; /** diff --git 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 index 69469b9964..e3f1cb2110 100644 --- 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; diff --git a/modules/mogo-module-share/build.gradle b/modules/mogo-module-share/build.gradle index 3599006cb8..969b011485 100644 --- 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') } } diff --git 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 index ea2a59c2af..3e9cf123be 100644 --- 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; 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 329a0f76a1..178d489cf8 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 @@ -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; diff --git 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 index 0afb54004e..20a151fcb0 100644 --- 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?) { diff --git 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 index b004de7d61..038778129a 100644 --- 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) diff --git 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 index 57aa54780f..2eb925583e 100644 --- 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) + )) } } } diff --git 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 index 1c80ee0899..9735522288 100644 --- 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") diff --git a/modules/mogo-module-smp/build.gradle b/modules/mogo-module-smp/build.gradle index 1d59a7f136..c182940292 100644 --- 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') } } diff --git 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 index 9f707b7b13..c3be13474a 100644 --- 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; diff --git 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 index a500221b0c..4d9a283e37 100644 --- 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; diff --git 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 index 78d0c87cfe..8b126f32f0 100644 --- 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; diff --git 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 index ad3d2f3a7f..52008b8e98 100644 --- 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; diff --git a/modules/mogo-module-v2x/build.gradle b/modules/mogo-module-v2x/build.gradle index 25ffb7e2b6..d057417b04 100644 --- 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 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 bbfb35fb79..1007178654 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 @@ -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; diff --git 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 index 3f13716984..f132f98f2e 100644 --- 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; 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 eca9f0f957..9115ce1900 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,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 diff --git 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 index 7710a10d3b..f32e6f6cd2 100644 --- 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; diff --git 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 index b9783f35eb..80b8f7aaaf 100644 --- 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; diff --git 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 index dcda2b1e84..d6b8f76e3f 100644 --- 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; diff --git 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 index dd9efee1cf..d75f897427 100644 --- 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; 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 eac6070820..e59a99107b 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 @@ -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; diff --git 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 index cf0c398f82..12d95c119d 100644 --- 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 diff --git 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 index c0272da780..db9013f79a 100644 --- 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; diff --git 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 index 0a8518e9be..e532355fdd 100644 --- 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; diff --git 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 index f546d0722d..7e5f145af1 100644 --- 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; 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 5e2d8f3675..2b716061a0 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 @@ -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; 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 227b1352f2..6cd710a9cd 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 @@ -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; diff --git 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 index 9e48b58dd7..9bd3af9936 100644 --- 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; /** diff --git 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 index 7d4e3b58cf..7acd6248f0 100644 --- 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; 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 efd1bfa2be..356e7dac1d 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 @@ -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; diff --git 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 index a6b1ec811d..2b6e611bbb 100644 --- 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; diff --git 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 index 351f220454..9107b2144f 100644 --- 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; - /** * 当前车辆与道路事件的连接线 */ 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 6cb0686d64..918222099d 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 @@ -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; 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 3ea660f8ca..2b6cac967b 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,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; 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 d6b05390dc..83c2801d2b 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,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; diff --git 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 index 36edca8324..4d560c2dc8 100644 --- 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; diff --git 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 index 2898e7d705..e7388177c1 100644 --- 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; diff --git 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 index 8f98c94d3b..d68b8cca51 100644 --- 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; 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 8d832562f5..232b04dfef 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 @@ -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; diff --git 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 index a30218ddc0..f63e0c4a31 100644 --- 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; diff --git 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 index 9ae538dd9a..9cdca34b82 100644 --- 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; diff --git 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 index 4f446bfe92..22442a2941 100644 --- 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 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 088586d229..2cc05a8e2a 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 @@ -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; diff --git 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 index c41bcf1c71..0515d2a26e 100644 --- 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; diff --git 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 index 396e8bef1d..42ea16a1fd 100644 --- 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; diff --git a/modules/tanlulib/build.gradle b/modules/tanlulib/build.gradle index 98938daec7..3042b2a8ee 100644 --- 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') + } } diff --git a/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/LocationInfo.kt b/modules/tanlulib/src/main/java/com/zhidao/roadcondition/model/LocationInfo.kt index b63e2e56af..72df4112cc 100644 --- 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 { 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 c392114384..6e05cc37d2 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,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) ) { diff --git a/services/mogo-service-api/build.gradle b/services/mogo-service-api/build.gradle index f14ff04f2f..f23f46cf2c 100644 --- a/services/mogo-service-api/build.gradle +++ b/services/mogo-service-api/build.gradle @@ -62,6 +62,8 @@ dependencies { api project(":skin:mogo-skin-support") implementation project(':core:mogo-core-data') api project(':core:mogo-core-function-api') + implementation project(':core:mogo-core-data') + } } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasRouteCallBack.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasRouteCallBack.java index 97bdfa6769..5af688da69 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasRouteCallBack.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasRouteCallBack.java @@ -1,6 +1,6 @@ package com.mogo.service.adas; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.List; diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoAddressManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoAddressManager.java index cd83a54470..08c8f103e5 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoAddressManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoAddressManager.java @@ -1,7 +1,7 @@ package com.mogo.service.module; import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author zyz diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoSearchManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoSearchManager.java index 92b1fe5067..79444f394d 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoSearchManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoSearchManager.java @@ -1,7 +1,7 @@ package com.mogo.service.module; import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * @author zyz diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluUiProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluUiProvider.java index 53d0aa6cd6..2b3534bff0 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluUiProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluUiProvider.java @@ -1,7 +1,7 @@ package com.mogo.service.share; import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * 探路相关ui provider diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/share/TanluUploadParams.java b/services/mogo-service-api/src/main/java/com/mogo/service/share/TanluUploadParams.java index 448a918057..88ee271b75 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/share/TanluUploadParams.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/share/TanluUploadParams.java @@ -1,6 +1,6 @@ package com.mogo.service.share; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; /** * 探路事件上报参数封装 diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java index d1015b3a18..8485cae808 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/smp/IMogoSmallMapProvider.java @@ -4,7 +4,7 @@ import androidx.annotation.IdRes; import androidx.fragment.app.FragmentActivity; import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.map.MogoLatLng; +import com.mogo.eagle.core.data.map.MogoLatLng; import java.util.List; diff --git a/services/mogo-service/build.gradle b/services/mogo-service/build.gradle index df212a7313..610a309e6a 100644 --- a/services/mogo-service/build.gradle +++ b/services/mogo-service/build.gradle @@ -60,6 +60,8 @@ dependencies { implementation project(":services:mogo-service-api") implementation project(':modules:mogo-module-adas') implementation project(':modules:mogo-module-check') + implementation project(':core:mogo-core-data') + } } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 7b8168d837..9b7690056e 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -13,7 +13,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; 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.uicontroller.EnumMapUI; import com.mogo.module.adas.AdasProvider; import com.mogo.module.adas.IAdasDataListener;