diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index e53772a855..8843d572e0 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -4,7 +4,6 @@ import android.content.Context; import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.commons.debug.DebugConfig; import com.mogo.map.CoordinatesTransformer; import com.mogo.map.IMogoMapApiBuilder; import com.mogo.map.IMogoMapView; @@ -34,31 +33,30 @@ import com.zhidaoauto.map.sdk.open.NavAutoApi; import com.zhidaoauto.map.sdk.open.NavParams; import com.zhidaoauto.map.sdk.open.view.MapAutoView; -public /** * @author congtaowang * @since 2020/12/9 - * + *

* 描述 */ -@Route( path = MapApiPath.PATH ) -class CustomMapApiBuilder implements IMogoMapApiBuilder { +@Route(path = MapApiPath.PATH) +public class CustomMapApiBuilder implements IMogoMapApiBuilder { private static final String TAG = "CustomMapApiBuilder"; @Override - public IMogoGeoSearch getGeoSearch( Context context ) { - return new GeocodeSearchClient( context ); + public IMogoGeoSearch getGeoSearch(Context context) { + return new GeocodeSearchClient(context); } @Override - public IMogoInputtipsSearch getInputtipsSearch( Context context, MogoInputtipsQuery query ) { - return new InputtipsSearch( context, query ); + public IMogoInputtipsSearch getInputtipsSearch(Context context, MogoInputtipsQuery query) { + return new InputtipsSearch(context, query); } @Override - public IMogoLocationClient getLocationClient( Context context ) { - return new ALocationClient( context ); + public IMogoLocationClient getLocationClient(Context context) { + return new ALocationClient(context); } @Override @@ -67,13 +65,13 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { } @Override - public IMogoNavi getNavi( Context context ) { - return NaviClient.getInstance( context ); + public IMogoNavi getNavi(Context context) { + return NaviClient.getInstance(context); } @Override - public IMogoPoiSearch getPoiSearchClient( Context context, MogoPoiSearchQuery query ) { - return new PoiSearchClient( context, query ); + public IMogoPoiSearch getPoiSearchClient(Context context, MogoPoiSearchQuery query) { + return new PoiSearchClient(context, query); } @Override @@ -82,31 +80,31 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { } @Override - public IMogoAimless getAimless( Context context ) { + public IMogoAimless getAimless(Context context) { return null; } @Override - public void createMapView( Context context ) { + public void createMapView(Context context) { // do not implements. } @Override - public IMogoMapView getMapView( Context context ) { - Log.d(TAG,"setDebugMode==true"); + public IMogoMapView getMapView(Context context) { + Log.d(TAG, "setDebugMode==true"); - MapParams mapParams = MapParams.Companion.init(); - mapParams.setDebugMode( false ) + MapParams mapParams = MapParams.Companion.init(); + mapParams.setDebugMode(false) // .setDataFileSource(1) //todo 1-使用本地地图数据，0-使用在线地图数据 - .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) - .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) + .setCoordinateType(MapParams.COORDINATETYPE_GCJ02) + .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_2D) // .setZoom( 20 ) // .setPointToCenter( 0.734375f, 0.5f ) - .setPointToCenter( 0.5f, 0.5f ) //todo 2D模式下需要注意ADAS部分遮挡 - .setStyleMode( MapParams.MAP_STYLE_VR ); + .setPointToCenter(0.5f, 0.5f) //todo 2D模式下需要注意ADAS部分遮挡 + .setStyleMode(MapParams.MAP_STYLE_VR); - NavAutoApi.INSTANCE.init( context, mapParams, NavParams.Companion.init()); + NavAutoApi.INSTANCE.init(context, mapParams, NavParams.Companion.init()); MapAutoView mapAutoView = new MapAutoView(context); IMogoMapView mapView = new AMapViewWrapper(mapAutoView); return mapView; @@ -123,8 +121,8 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { } @Override - public int getResIdByIconType( Context context, int iconType ) { - return IconTypeUtils.getResIdByIconType( context, iconType ); + public int getResIdByIconType(Context context, int iconType) { + return IconTypeUtils.getResIdByIconType(context, iconType); } @Override @@ -133,7 +131,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { } @Override - public void init( Context context ) { - Logger.d( TAG, "init" ); + public void init(Context context) { + Logger.d(TAG, "init"); } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapDelegateFactory.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapDelegateFactory.java index 5c26b24ccc..997f7d8fbb 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapDelegateFactory.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapDelegateFactory.java @@ -28,113 +28,75 @@ class MogoMapDelegateFactory { private static final String TAG = "MogoMapDelegateFactory"; -// private static boolean useCustom = false; -// -// public static boolean isUseCustom() { -// return useCustom; -// } - private static IMogoMapApiBuilder sApiBuilder; private static IMogoMapApiBuilder getApiBuilder() { - if ( sApiBuilder == null ) { - synchronized ( MogoMapDelegateFactory.class ) { - if ( sApiBuilder == null ) { - sApiBuilder = ARouter.getInstance().navigation( IMogoMapApiBuilder.class ); + if (sApiBuilder == null) { + synchronized (MogoMapDelegateFactory.class) { + if (sApiBuilder == null) { + sApiBuilder = ARouter.getInstance().navigation(IMogoMapApiBuilder.class); } } } return sApiBuilder; } - public static IMogoGeoSearch getGeoSearchDelegate( Context context ) { - return getApiBuilder().getGeoSearch( context ); -// if ( useCustom ) { -// Logger.d( TAG, "use custom IMogoGeoSearch" ); -// return new com.mogo.map.impl.custom.search.GeocodeSearchClient( context ); -// } -// return new com.mogo.map.impl.amap.search.GeocodeSearchClient( context ); + public static IMogoGeoSearch getGeoSearchDelegate(Context context) { + return getApiBuilder().getGeoSearch(context); } - public static IMogoInputtipsSearch getInputtipsSearchDelegate( Context context, MogoInputtipsQuery query ) { - return getApiBuilder().getInputtipsSearch( context, query ); -// if ( useCustom ) { -// Logger.d( TAG, "use custom IMogoInputtipsSearch" ); -// return new com.mogo.map.impl.custom.search.InputtipsSearch( context, query ); -// } -// return new com.mogo.map.impl.amap.search.InputtipsSearch( context, query ); + public static IMogoInputtipsSearch getInputtipsSearchDelegate(Context context, MogoInputtipsQuery query) { + return getApiBuilder().getInputtipsSearch(context, query); } - public static IMogoLocationClient getLocationClientDelegate( Context context ) { - return getApiBuilder().getLocationClient( context ); -// if ( useCustom ) { -// Logger.d( TAG, "use custom IMogoLocationClient" ); -// return new com.mogo.map.impl.custom.location.ALocationClient( context ); -// } -// return new com.mogo.map.impl.amap.location.ALocationClient( context ); + public static IMogoLocationClient getLocationClientDelegate(Context context) { + return getApiBuilder().getLocationClient(context); } public static IMogoMapUIController getMapUIControllerDelegate() { return getApiBuilder().getMapUIController(); -// if ( useCustom ) { -// Logger.d( TAG, "use custom IMogoMapUIController" ); -// return com.mogo.map.impl.custom.uicontroller.AMapUIController.getInstance(); -// } -// return com.mogo.map.impl.amap.uicontroller.AMapUIController.getInstance(); } - public static IMogoNavi getNaviDelegate( Context context ) { + public static IMogoNavi getNaviDelegate(Context context) { - if ( DebugConfig.isUseCustomNavi() ) { - return getApiBuilder().getNavi( context ); -// return com.mogo.map.impl.amap.navi.NaviClient.getInstance( context ); - } else if ( AppUtils.isAppInstalled( context, "com.autonavi.amapauto" ) ) { - return AutoNaviClient.getInstance( context ); + if (DebugConfig.isUseCustomNavi()) { + return getApiBuilder().getNavi(context); + } else if (AppUtils.isAppInstalled(context, "com.autonavi.amapauto")) { + return AutoNaviClient.getInstance(context); } - return getApiBuilder().getNavi( context ); -// return com.mogo.map.impl.amap.navi.NaviClient.getInstance( context ); + return getApiBuilder().getNavi(context); } - public static IMogoPoiSearch getPoiSearchClientDelegate( Context context, MogoPoiSearchQuery query ) { - return getApiBuilder().getPoiSearchClient( context, query ); -// if ( useCustom ) { -// Logger.d( TAG, "use custom IMogoPoiSearch" ); -// return new com.mogo.map.impl.custom.search.PoiSearchClient( context, query ); -// } -// return new com.mogo.map.impl.amap.search.PoiSearchClient( context, query ); + public static IMogoPoiSearch getPoiSearchClientDelegate(Context context, MogoPoiSearchQuery query) { + return getApiBuilder().getPoiSearchClient(context, query); } public static IMogoRoadSearch getRoadSearchDelegate() { return getApiBuilder().getRoadSearch(); -// if ( useCustom ) { -// Logger.d( TAG, "use custom IMogoRoadSearch" ); -// return new com.mogo.map.impl.custom.search.RoadSearchClient(); -// } -// return new com.mogo.map.impl.amap.search.RoadSearchClient(); } - public static IMogoAimless getAimless( Context context ) { - return getApiBuilder().getAimless( context ); + public static IMogoAimless getAimless(Context context) { + return getApiBuilder().getAimless(context); } - public static void createMapViewInstance( Context context ) { - getApiBuilder().createMapView( context ); + public static void createMapViewInstance(Context context) { + getApiBuilder().createMapView(context); } public static void destroy() { getApiBuilder().destroy(); } - public static IMogoMapView getMapView( Context context ) { - return getApiBuilder().getMapView( context ); + public static IMogoMapView getMapView(Context context) { + return getApiBuilder().getMapView(context); } public static IMogoTrafficSearch getTrafficSearch() { return getApiBuilder().getTrafficSearch(); } - public static CoordinatesTransformer getCoordinatesTransformer(){ + public static CoordinatesTransformer getCoordinatesTransformer() { return getApiBuilder().getCoordinatesTransformer(); } } 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 e25fc96ecc..33c6e39761 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 @@ -107,12 +107,10 @@ public class MogoMarkerManager implements IMogoMarkerManager { @Override public void addRouteWay(Context context, MogoLatLng startPoint, MogoLatLng endPoint, List< MogoLatLng > wayPoints ) { -// RouteOverlayHelper.getInstance().addRouteWay( context, startPoint, endPoint, wayPoints ); } @Override public void removeRouteWayOverlay() { -// RouteOverlayHelper.getInstance().removeAll(); } } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index e65056ce58..58796f09d1 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -251,15 +251,6 @@ public class AdasEventManager implements e.printStackTrace(); IdentifyDataDrawer.getInstance().clearOldMarker(); } - try { - for (IAdasDataListener listener : iAdasEventListeners) { - if (listener != null) { - listener.onRectData(trafficData); - } - } - } catch (Exception e) { - e.printStackTrace(); - } } @Override diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java index f87b28fe43..9133497141 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.java @@ -4,9 +4,6 @@ import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; -import com.mogo.eagle.core.data.traffic.TrafficData; - -import java.util.List; public interface IAdasDataListener { @@ -15,10 +12,6 @@ public interface IAdasDataListener { } - default void onRectData(List trafficData) { - - } - default void onWarnMessage(AutopilotWarnMessage autopilotWarnMessage) { } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java index 5f86fe8869..297a8a23bf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java @@ -1,13 +1,14 @@ package com.mogo.module.v2x; import android.content.Context; + import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.utilcode.util.Utils; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.overlay.IMogoOverlayManager; -import com.mogo.map.search.geo.IMogoGeoSearch; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.v2x.alarm.V2XCalculateServer; import com.mogo.module.v2x.manager.IMoGoPersonWarnPolylineManager; @@ -18,19 +19,15 @@ import com.mogo.module.v2x.manager.IMoGoV2XStatusManager; import com.mogo.module.v2x.manager.IMoGoWarnPolylineManager; import com.mogo.module.v2x.network.V2XRefreshModel; import com.mogo.service.IMogoServiceApis; -import com.mogo.eagle.core.data.constants.MogoServicePaths; -import com.mogo.service.adas.IMogoADASController; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cloud.socket.IMogoSocketManager; import com.mogo.service.entrance.IMogoEntranceButtonController; -import com.mogo.service.eventpanel.IEventPanelProvider; import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoActionManager; import com.mogo.service.module.IMogoMarkerService; import com.mogo.service.module.IMogoRegisterCenter; -import com.mogo.service.module.IMogoSearchManager; import com.mogo.service.share.IMogoShareManager; import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.share.IMogoTrafficUploadProvider; @@ -51,7 +48,6 @@ import com.zhidao.carchattingprovider.ICarsChattingProvider; * version: 1.0 */ public class V2XServiceManager { - private static final String TAG = "V2XServiceManager"; private static boolean isInit; @@ -63,8 +59,6 @@ public class V2XServiceManager { private static IMogoNavi mNavi; private static IMogoMapUIController mMapUIController; private static IMogoLocationClient mMogoLocationClient; - private static IMogoGeoSearch mIMogoGeoSearch; - private static IMogoSearchManager mIMogoSearchManager; private static IMogoTopViewManager mMogoTopViewManager; private static DisplayEffectsInterface displayEffectsManager; private static IMogoStatusManager mMogoStatusManager; @@ -79,12 +73,9 @@ public class V2XServiceManager { private static IMogoShareManager mIMogoShareManager; private static IMogoTanluProvider mIMogoTanluProvider; private static IMogoTrafficUploadProvider mIMogoTrafficUploadProvider; - //事件面板 - private static IEventPanelProvider mIEventPanelProvider; private static IMogoActionManager mMogoActionManager; private static ICarsChattingProvider mCarsChattingProvider; - private static IMogoADASController mIMogoADASController; private static IMogoIntentManager mMogoIntentManager; private static IMogoEntranceButtonController mMogoEntranceButtonController; private static IMogoOnlineCarListPanelProvider mMogoOnlineCarListPanelProvider; @@ -123,27 +114,21 @@ public class V2XServiceManager { mIMogoWindowManager = mMogoServiceApis.getWindowManagerApi(); mMogoRegisterCenter = mMogoServiceApis.getRegisterCenterApi(); mIMogoRefreshStrategyController = mMogoServiceApis.getRefreshStrategyControllerApi(); - mIMogoADASController = mMogoServiceApis.getAdasControllerApi(); mMogoEntranceButtonController = mMogoServiceApis.getEntranceButtonController(); mMogoActionManager = mMogoServiceApis.getActionManagerApi(); mMogoTopViewManager = mMogoServiceApis.getTopViewManager(); displayEffectsManager = mMogoServiceApis.getDisplayEffectsManager(); - mIMogoSearchManager = mMogoServiceApis.getSearchManagerApi(); mIMogoMarkerService = mMogoServiceApis.getMarkerService(); mIMogoShareManager = mMogoServiceApis.getShareManager(); mIMogoTanluProvider = mMogoServiceApis.getTanluApi(); mIMogoTrafficUploadProvider = mMogoServiceApis.getTrafficUploadApi(); mMogoOnlineCarListPanelProvider = mMogoServiceApis.getOnlineCarPanelApi(); - //事件面板 - mIEventPanelProvider = mMogoServiceApis.getEventPanelManager(); - mMarkerManager = mMapService.getMarkerManager(context); mNavi = mMapService.getNavi(context); mMapUIController = mMapService.getMapUIController(); mMogoLocationClient = mMapService.getSingletonLocationClient(context); mMogoOverlayManager = mMapService.getOverlayManager(context); - mIMogoGeoSearch = mMapService.getGeoSearch(context); mCarsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); mMogoIntentManager = mMogoServiceApis.getIntentManagerApi(); @@ -173,7 +158,7 @@ public class V2XServiceManager { return mMogoTopViewManager; } - public static DisplayEffectsInterface getDisplayEffectsManager(){ + public static DisplayEffectsInterface getDisplayEffectsManager() { return displayEffectsManager; } @@ -272,14 +257,6 @@ public class V2XServiceManager { return mMogoActionManager; } - public static IMogoGeoSearch getMogoGeoSearch() { - return mIMogoGeoSearch; - } - - public static IMogoSearchManager getSearchManager() { - return mIMogoSearchManager; - } - public static IMogoRefreshStrategyController getIMogoRefreshStrategyController() { return mIMogoRefreshStrategyController; } @@ -312,31 +289,11 @@ public class V2XServiceManager { return mMogoOnlineCarListPanelProvider; } - public static IEventPanelProvider getEventPanelProvider() { - return mIEventPanelProvider; - } - - public static IMogoADASController getmIMogoADASController() { - return mIMogoADASController; - } - - public static void setmIMogoADASController(IMogoADASController mIMogoADASController) { - V2XServiceManager.mIMogoADASController = mIMogoADASController; - } - public static IMoGoPersonWarnPolylineManager getMoGoPersonWarnPolylineManager() { return moGoPersonWarnPolylineManager; } - public static void setMoGoPersonWarnPolylineManager(IMoGoPersonWarnPolylineManager moGoPersonWarnPolylineManager) { - V2XServiceManager.moGoPersonWarnPolylineManager = moGoPersonWarnPolylineManager; - } - public static IMoGoStopPolylineManager getMoGoStopPolylineManager() { return moGoStopPolylineManager; } - - public static void setMoGoStopPolylineManager(IMoGoStopPolylineManager moGoStopPolylineManager) { - V2XServiceManager.moGoStopPolylineManager = moGoStopPolylineManager; - } } 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 ebc8cf7720..91f56a635b 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 @@ -30,12 +30,12 @@ public class LocationUtils { private static final String TAG = "LocationUtils"; public static void geoCodeSearch(MogoLocation location, IMogoGeoSearchListener listener) { - MogoRegeocodeQuery mogoRegeocodeQuery = new MogoRegeocodeQuery(); - mogoRegeocodeQuery.setPoint(new MogoLatLng(location.getLatitude(), location.getLongitude())); - - V2XServiceManager.getMogoGeoSearch().setGeoSearchListener(listener); - - V2XServiceManager.getMogoGeoSearch().getFromLocationAsyn(mogoRegeocodeQuery); +// MogoRegeocodeQuery mogoRegeocodeQuery = new MogoRegeocodeQuery(); +// mogoRegeocodeQuery.setPoint(new MogoLatLng(location.getLatitude(), location.getLongitude())); +// +// V2XServiceManager.getMogoGeoSearch().setGeoSearchListener(listener); +// +// V2XServiceManager.getMogoGeoSearch().getFromLocationAsyn(mogoRegeocodeQuery); } /** 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 e1dab2f730..4f0c6bd6a7 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 @@ -151,10 +151,6 @@ public class MogoADASController implements IMogoADASController { } } - @Override - public void onRectData(List trafficData) { - } - @Override public void onWarnMessage(AutopilotWarnMessage autopilotWarnMessage) { if (autopilotWarnMessage == null) {