From acbde6411eb895f6314b44ee7e5c7718317c0282 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 29 Mar 2022 19:09:35 +0800 Subject: [PATCH] remove networkold api and union the adasapis and adasstatus lat lon data --- .../bus/fragment/BaseOchBusTabFragment.java | 4 +- .../och/bus/net/OCHBusServiceManager.java | 41 +----- .../och/bus/presenter/OchBusOrderModel.java | 2 +- .../network/TaxiPassengerServiceManager.java | 14 +- .../och/taxi/model/MogoOCHTaxiModelNew.java | 7 +- .../network/OCHTaxiServiceManagerNew.java | 66 +-------- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 20 +-- .../adapter/MoGoHandAdasMsgManager.java | 47 +++---- .../hmi/ui/notice/NoticeTrafficDialog.java | 11 +- .../hmi/ui/widget/AutoPilotStatusView.kt | 7 +- .../function/main/MainMoGoApplication.java | 1 - .../main/service/MogoMainService.java | 7 - .../function/monitoring/CronTaskManager.kt | 5 - .../obu/mogo/MogoPrivateObuManager.kt | 21 +-- .../manager/impl/MoGoV2XPolylineManager.java | 6 +- .../scene/warning/V2XWarningMarker.java | 5 +- .../v2x/events/utils/LocationUtils.java | 5 +- .../function/v2x/events/utils/MapUtils.kt | 5 +- .../events/view/V2XCrossRoadVideoView.java | 2 +- .../data/autopilot/AutopilotStatusInfo.kt | 1 + .../core/data/constants/MogoServicePaths.java | 15 -- .../IMoGoAutopilotVehicleStateListener.kt | 4 - .../CallerAutoPilotStatusListenerManager.kt | 32 +++++ ...lerAutopilotVehicleStateListenerManager.kt | 17 +-- .../com/mogo/commons/debug/DebugConfig.java | 51 ------- .../SnapshotLocationDataCenter.java | 132 ------------------ ...napShotMockTestPanelBroadCastReceiver.java | 53 ------- .../mogo/module/common/drawer/BaseDrawer.java | 16 +-- .../{datacenter => mock}/RealTimeData.java | 2 +- .../SpiRealTimeProvider.java | 2 +- .../service/intent/MockIntentHandler.java | 2 - .../service/marker/MapMarkerManager.java | 15 -- .../service/network/ZhidaoRefreshModel.java | 4 - .../routeoverlay/MogoRouteOverlayManager.java | 2 +- .../routeoverlay/RouteOverlayDrawer.java | 29 ++-- .../com/mogo/service/IMogoServiceApis.java | 17 --- .../service/adas/IMogoADASController.java | 49 ------- .../mogo/service/network/IMogoNetwork.java | 26 ---- .../warning/WarningStatusListener.java | 13 -- .../mogo/service/impl/MogoServiceApis.java | 14 +- .../service/impl/adas/MogoADASController.java | 55 -------- .../impl/network/MogoNetWorkService.java | 29 ---- .../impl/singleton/SingletonsHolder.java | 5 - 43 files changed, 129 insertions(+), 732 deletions(-) delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/receiver/SnapShotMockTestPanelBroadCastReceiver.java rename modules/mogo-module-common/src/main/java/com/mogo/module/common/{datacenter => mock}/RealTimeData.java (96%) rename modules/mogo-module-common/src/main/java/com/mogo/module/common/{datacenter => mock}/SpiRealTimeProvider.java (98%) delete mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java delete mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/network/IMogoNetwork.java delete mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/warning/WarningStatusListener.java delete mode 100644 services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java delete mode 100644 services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java index 9f90f0d7f7..65df5450fa 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java @@ -152,7 +152,7 @@ public abstract class BaseOchBusTabFragment { // 如果能自动驾驶，就自动驾驶，不能就提示 -// if (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getAutopilotStatus() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE){ +// if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE){ // return; // } // if (autopilotLoadingAnimator != null){ @@ -425,7 +425,7 @@ public abstract class BaseOchBusTabFragment callback) { - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } //获取当前高德坐标 mService.querySiteByCoordinate(MoGoAiCloudClientConfig.getInstance().getServiceAppId() @@ -76,9 +72,6 @@ public class OCHBusServiceManager { * @param callback */ public void resetStationStatus(Context context, int lineId, OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.resetStationStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),new OchBusResetDrivingLineRequest(lineId)) .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) @@ -93,9 +86,6 @@ public class OCHBusServiceManager { * @param callback */ public void leaveStation(Context context,int seq,int siteId,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.leaveStation(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OchBusUpdateSiteStatusRequest(seq,siteId,OchBusOrderModel.getInstance().mLongitude @@ -113,9 +103,6 @@ public class OCHBusServiceManager { * @param callback */ public void arriveSiteStation(Context context,int seq,int siteId,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.arriveSiteStation(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OchBusUpdateSiteStatusRequest(seq,siteId @@ -134,9 +121,6 @@ public class OCHBusServiceManager { */ public void queryStationLeaveAwayPassengers(Context context,int seq,int siteId ,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.queryStationLeaveAwayPassengers( MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),new QueryLeaveAwayPassengersRequest(seq,siteId)) .subscribeOn( Schedulers.io() ) @@ -150,9 +134,6 @@ public class OCHBusServiceManager { * @param callback */ public void stopTakeOrder(Context context,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.stopTakeOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OchBusOperationStatusRequest(OchBusOrderModel.getInstance().mLongitude @@ -168,9 +149,6 @@ public class OCHBusServiceManager { * @param callback */ public void startTakeOrder(Context context,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.startTakeOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OchBusOperationStatusRequest(OchBusOrderModel.getInstance().mLongitude @@ -186,9 +164,6 @@ public class OCHBusServiceManager { * @param callback */ public void queryOperationStatus(Context context,OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.queryOperationStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn( Schedulers.io() ) @@ -202,9 +177,6 @@ public class OCHBusServiceManager { * @param callback */ public void queryBusOrders(Context context, OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create( IOchBusApiService.class, baseUrl); - } mService.queryBusOrders(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn(Schedulers.io()) @@ -213,9 +185,6 @@ public class OCHBusServiceManager { } public void queryBusLines(Context context, OCHServiceCallback callback){ - if (mService == null){ - mService = MogoApisHandler.getInstance().getApis().getNetworkApi().create(IOchBusApiService.class,baseUrl); - } mService.queryBusLines(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),MoGoAiCloudClientConfig.getInstance().getSn()) .subscribeOn(Schedulers.io()) @@ -232,10 +201,6 @@ public class OCHBusServiceManager { */ public void runCarHeartbeat(Context context, double lon, double lat, OCHServiceCallback callback) { - if ( mService == null ) { - mService = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(IOchBusApiService.class, baseUrl); - } mService.runCarHeartbeat(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken(),new CarHeartbeatReqBean( MoGoAiCloudClientConfig.getInstance().getSn(), lon, lat)) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java index ea97ad4f27..4f1cf1a254 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java @@ -431,7 +431,7 @@ public class OchBusOrderModel { OchBusStation nextStation = stationList.get( currentStationIndex); // if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -// == Integer.parseInt(DebugConfig.getAutoPilotStatus())) { +// == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) { // TipToast.shortTip("自动驾驶状态为不可用！"); // } AutopilotControlParameters currentAutopilot = new AutopilotControlParameters(); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java index 753f04929f..ed8dfdae7d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java @@ -7,10 +7,10 @@ import android.content.Context; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager; +import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.eagle.core.network.RequestOptions; import com.mogo.eagle.core.network.SubscribeImpl; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.module.common.MogoApisHandler; import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryReqBean; import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean; import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBean; @@ -33,13 +33,11 @@ public class TaxiPassengerServiceManager { return SingletonHolder.INSTANCE; } - private String baseUrl = TaxiPassengerConst.getBaseUrl(); private TaxiPassengerServiceApi mOCHTaxiServiceApi; private TaxiPassengerServiceManager() { if (mOCHTaxiServiceApi == null){ - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(TaxiPassengerServiceApi.class, baseUrl); + mOCHTaxiServiceApi = MoGoRetrofitFactory.getInstance(TaxiPassengerConst.getBaseUrl()).create(TaxiPassengerServiceApi.class); } } @@ -59,10 +57,6 @@ public class TaxiPassengerServiceManager { */ public void queryOrdersInAndWaitService(Context context, TaxiPassengerServiceCallback callback) { - if (mOCHTaxiServiceApi == null) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(TaxiPassengerServiceApi.class, baseUrl); - } mOCHTaxiServiceApi.queryOrdersInAndWaitService(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,getDriverAppSn()) //获取到司机端的sn @@ -80,10 +74,6 @@ public class TaxiPassengerServiceManager { */ public void queryOrderById(Context context, String orderNo, TaxiPassengerServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(TaxiPassengerServiceApi.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderById(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new TaxiPassengerOrderQueryReqBean(getDriverAppSn(), orderNo)) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java index ddd574d459..1e20d6555f 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java @@ -790,8 +790,9 @@ public class MogoOCHTaxiModelNew { return; } + if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE - == Integer.parseInt(DebugConfig.getAutoPilotStatus())) { + == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) { // TODO: 2021/11/28 工控机存在刚开始状态为0，但是可以开启变为2，工控机解决前不显示此toast // TipToast.shortTip("自动驾驶状态为不可用！"); } @@ -855,8 +856,8 @@ public class MogoOCHTaxiModelNew { if (distance > OCHTaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { distance = CoordinateUtils.calculateLineDistance(startLon, startLat, - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(), - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat()); + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat()); } if (distance <= OCHTaxiConst.ARRIVE_AT_START_STATION_DISTANCE) { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java index 81b755599a..49629bf737 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java @@ -6,10 +6,10 @@ import android.content.Context; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.eagle.core.data.BaseData; +import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.eagle.core.network.RequestOptions; import com.mogo.eagle.core.network.SubscribeImpl; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.module.common.MogoApisHandler; import com.mogo.och.taxi.bean.CarHeartbeatReqBean; import com.mogo.och.taxi.bean.DriverServiceDataRespBean; import com.mogo.och.taxi.bean.DriverStatusQueryRespBean; @@ -49,13 +49,11 @@ public class OCHTaxiServiceManagerNew { return SingletonHolder.INSTANCE; } - private String baseUrl = OCHTaxiConst.getBaseUrl(); private OCHTaxiServiceApiNew mOCHTaxiServiceApi; private OCHTaxiServiceManagerNew() { if (mOCHTaxiServiceApi == null){ - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); + mOCHTaxiServiceApi = MoGoRetrofitFactory.getInstance(OCHTaxiConst.getBaseUrl()).create(OCHTaxiServiceApiNew.class); } } @@ -66,10 +64,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrdersInAndWaitService(Context context, OCHTaxiServiceCallback callback) { - if (mOCHTaxiServiceApi == null) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrdersInAndWaitService(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -85,10 +79,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryNewBookingOrder(Context context, OCHTaxiServiceCallback callback) { - if (mOCHTaxiServiceApi == null) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryNewBookingOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -105,10 +95,6 @@ public class OCHTaxiServiceManagerNew { */ public void grabOrder(Context context, String orderNo, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.grabOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderGrabReqBean( @@ -126,10 +112,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrderGrabStatus(Context context, String orderNo, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderGrabStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderGrabReqBean( @@ -147,10 +129,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrderRouteInfo(Context context, String orderNo, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderRouteInfo(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderQueryRouteInfoReqBean( @@ -169,10 +147,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrderById(Context context, String orderNo, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderById(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderQueryReqBean( @@ -191,10 +165,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrderInService(Context context, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrderInService(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -213,10 +183,6 @@ public class OCHTaxiServiceManagerNew { */ public void cancelOrder(Context context, String orderNo, int cancelType, String cancelReason, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.cancelOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderCancelReqBean( @@ -235,10 +201,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryOrdersList(Context context, int page, int size, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryOrdersList(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrdersListQueryReqBean( @@ -257,10 +219,6 @@ public class OCHTaxiServiceManagerNew { */ public void updateOrderStatus(Context context, String orderNo, int orderStatus, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.updateOrderStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderStatusUpdateReqBean( @@ -278,10 +236,6 @@ public class OCHTaxiServiceManagerNew { */ public void updateDriverServiceStatus(Context context, int status, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.updateDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new DriverStatusUpdateReqBean( @@ -298,10 +252,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryDriverServiceStatus(Context context, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -319,10 +269,6 @@ public class OCHTaxiServiceManagerNew { */ public void runCarHeartbeat(Context context, double lon, double lat, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.runCarHeartbeat(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new CarHeartbeatReqBean( @@ -339,10 +285,6 @@ public class OCHTaxiServiceManagerNew { */ public void queryDriverServiceData(Context context, OCHTaxiServiceCallback callback) { - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.queryServiceData(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,MoGoAiCloudClientConfig.getInstance().getSn()) @@ -359,10 +301,6 @@ public class OCHTaxiServiceManagerNew { */ public void updateOrderRoute(Context context, String orderNo, List points, OCHTaxiServiceCallback callback){ - if ( mOCHTaxiServiceApi == null ) { - mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi() - .create(OCHTaxiServiceApiNew.class, baseUrl); - } mOCHTaxiServiceApi.updateOrderRoute(MoGoAiCloudClientConfig.getInstance().getServiceAppId() ,MoGoAiCloudClientConfig.getInstance().getToken() ,new OrderRouteUpdateReqBean(orderNo,points)) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index 92fcd2e26d..17c995a697 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -11,7 +11,6 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_C import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS @@ -19,6 +18,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LO import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.invokeArriveAtStation @@ -37,8 +37,6 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showAdUpgradeStatu import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showDockerRebootResult import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.module.common.MogoApisHandler -import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.zhidao.support.adas.high.AdasManager import com.zhidao.support.adas.high.OnAdasListener import com.zhidao.support.adas.high.bean.IPCUpgradeStateInfo @@ -125,21 +123,13 @@ class MoGoAdasListenerImpl : OnAdasListener { ) override fun onGnssInfo(header: MessagePad.Header, gnssInfo: MessagePad.GnssInfo?) { invokeAutopilotCarStateData(gnssInfo) - // 同步给MAP地图 if (gnssInfo != null) { - MogoApisHandler.getInstance().apis.adasControllerApi.lastLat = gnssInfo.latitude - MogoApisHandler.getInstance().apis.adasControllerApi.lastLon = gnssInfo.longitude - MogoApisHandler.getInstance().apis.adasControllerApi.satelliteTime = - java.lang.Double.valueOf(gnssInfo.satelliteTime).toLong() - if (1 == FunctionBuildConfig.gpsProvider) { - CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map( - gnssInfo - ) - SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo(gnssInfo) + // 同步给MAP地图 + CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map(gnssInfo) + // 同步更新经纬度和系统时间至 AutoPilotStatusListener + CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon(gnssInfo.satelliteTime.toLong(),gnssInfo.longitude, gnssInfo.latitude) } - //根据加速度判断 是否刹车 - CallerAutopilotVehicleStateListenerManager.invokeAutopilotBrakeLightByAcceleration(gnssInfo.acceleration) } } diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index 784f21cfb5..c80a2da935 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -1,13 +1,18 @@ package com.mogo.eagle.core.function.autopilot.adapter; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; + import android.text.TextUtils; -import android.util.Log; + +import androidx.annotation.Nullable; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener; +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager; +import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager; import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager; @@ -24,12 +29,11 @@ import chassis.Chassis; import mogo.telematics.pad.MessagePad; import record_cache.RecordPanelOuterClass; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; - public class MoGoHandAdasMsgManager implements IMoGoAutopilotIdentifyListener, IMoGoAutopilotVehicleStateListener, - IMoGoAutopilotCarConfigListener{ + IMoGoAutopilotCarConfigListener, + IMoGoAutopilotCarStateListener { private final String TAG = "AdasEventManager"; @@ -39,6 +43,7 @@ public class MoGoHandAdasMsgManager implements CallerAutopilotIdentifyListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotVehicleStateListenerManager.INSTANCE.addListener(TAG, this); CallerAutopilotCarConfigListenerManager.INSTANCE.addListener(TAG, this); + CallerAutopilotCarStatusListenerManager.INSTANCE.addListener(TAG, this); } public static MoGoHandAdasMsgManager getInstance() { @@ -91,17 +96,13 @@ public class MoGoHandAdasMsgManager implements } else { isShowTurnLight = false; } -// CallerLogger.INSTANCE.d(M_DEVA + TAG, "onAutopilotLightSwitchData -- newState:" + state + ",oldState:" + lightSwitch.getNumber()); CallerHmiManager.INSTANCE.showTurnLight(state); } } @Override public void onAutopilotBrakeLightData(boolean brakeLight) { -// CallerLogger.INSTANCE.d(M_DEVA + TAG, "onAutopilotBrakeLightData -- brakeLight = $brakeLight ---$isShowTurnLight"); -// if (!isShowTurnLight) { -// CallerHmiManager.INSTANCE.showBrakeLight(brakeLight ? 1 : 0); -// } + } @Override @@ -137,22 +138,20 @@ public class MoGoHandAdasMsgManager implements } } - /** - * 根据加速度判断是否刹车 - * @param acceleration - */ @Override - public void onAutopilotBrakeLightByAcceleration(double acceleration) { - //设置刹车信息 - if (acceleration < -2.5) { - brakeLight = 1; - } else { - brakeLight = 0; + public void onAutopilotCarStateData(@Nullable MessagePad.GnssInfo gnssInfo) { + //根据加速度判断 是否刹车 + if (gnssInfo != null) { + //设置刹车信息 + if (gnssInfo.getAcceleration() < -2.5) { + brakeLight = 1; + } else { + brakeLight = 0; + } + if (!isShowTurnLight) { + ThreadUtils.runOnUiThread(() -> CallerHmiManager.INSTANCE.showBrakeLight(brakeLight)); + } } -// CallerLogger.INSTANCE.d(M_DEVA + TAG, "onAutopilotBrakeLightByAcceleration -- acceleration = " + acceleration); - if (!isShowTurnLight) { - CallerHmiManager.INSTANCE.showBrakeLight(brakeLight); - } - } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java index ba343cca12..d381f12080 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java @@ -21,6 +21,7 @@ import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData; import com.mogo.eagle.core.data.notice.NoticeValue; import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.function.call.notice.CallerNoticeManager; import com.mogo.eagle.core.function.hmi.R; @@ -173,13 +174,11 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs parameters.vehicleType = 10; //云平台使用的是火星坐标,自动驾驶需要wgs84 double[] gcj02 = CoordinateUtils.transformGcj02toWgs84(mTrafficStyleInfo.getLat(), mTrafficStyleInfo.getLon()); - AutopilotControlParameters.AutoPilotLonLat startLocation = new AutopilotControlParameters.AutoPilotLonLat - (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(), - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat()); - parameters.startLatLon = startLocation; - AutopilotControlParameters.AutoPilotLonLat endLocation = new AutopilotControlParameters.AutoPilotLonLat + parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat + (CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon()); + parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat (gcj02[0], gcj02[1]); - parameters.endLatLon = endLocation; CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt index 545ae2765b..c689d665ad 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt @@ -10,6 +10,8 @@ import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getCurWgs84Lat +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getCurWgs84Lon import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -84,10 +86,7 @@ class AutoPilotStatusView @JvmOverloads constructor( currentAutopilot.endName = "HYJC" currentAutopilot.isSpeakVoice = false currentAutopilot.startLatLon = - AutopilotControlParameters.AutoPilotLonLat( - MogoApisHandler.getInstance().apis.adasControllerApi.lastLat, - MogoApisHandler.getInstance().apis.adasControllerApi.lastLon - ) + AutopilotControlParameters.AutoPilotLonLat(getCurWgs84Lat(),getCurWgs84Lon()) currentAutopilot.endLatLon = AutopilotControlParameters.AutoPilotLonLat(26.819716071924688, 112.57715442110867) currentAutopilot.vehicleType = 10 diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index d8b205af5c..201eac3af4 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -305,7 +305,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { // 开启Socket长链服务 double lat = location.getLatitude(); double lon = location.getLongitude(); - CallerLogger.INSTANCE.d(M_MAIN + TAG,"emArrow lat : " + lat + " , lon : " + lon); apis.getSocketManagerApi(getApplicationContext()).init(getApplicationContext(), DebugConfig.getSocketAppId(),lat,lon); } diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java index af38fd178b..70d175f446 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java @@ -51,7 +51,6 @@ class MogoMainService extends Service implements IMogoLocationListener { UiThreadHandler.postDelayed(() -> { CallerLogger.INSTANCE.d(M_MAIN + TAG, "5秒已过，启动基础服务……"); loadBaseModules(); - initADAS(); initGpsSimulatorListener(); HdMapBuildConfig.isMapLoaded = true; }, 5_000L @@ -97,12 +96,6 @@ class MogoMainService extends Service implements IMogoLocationListener { MogoModulesManager.getInstance().loadBaseModule(); } - private void initADAS() { - if (mServiceApis != null) { - mServiceApis.getAdasControllerApi().init(AbsMogoApplication.getApp()); - } - } - @Override public void onLocationChanged(MogoLocation location) { EventDispatchCenter.getInstance().onLocationChanged(location); diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt index 1ecf72376f..4149a3d30a 100644 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt +++ b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt @@ -12,7 +12,6 @@ import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MONITOR import com.mogo.map.MogoLocationClient -import com.mogo.module.common.MogoApisHandler import com.mogo.module.common.constants.HostConst import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable @@ -25,10 +24,6 @@ class CronTaskManager(private var context: Context?) { private const val CRON_TASK_TYPE = 1011 } - private val netWork by lazy { - MogoApisHandler.getInstance().apis.networkApi - } - // 请求路侧摄像头 private var disposable: Disposable? = null diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index 5321d8fbd2..da4e99e73d 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -8,7 +8,9 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Default import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.TooClose @@ -17,9 +19,6 @@ import com.mogo.eagle.core.function.obu.mogo.utils.TrafficDataConvertUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr -import com.mogo.eagle.core.utilcode.util.TimeUtils -import com.mogo.map.MogoMapUIController -import com.mogo.module.common.datacenter.SnapshotLocationDataCenter import com.mogo.module.common.drawer.TrafficMarkerDrawer import com.mogo.module.common.enums.EventTypeEnum import com.mogo.service.IMogoServiceApis @@ -169,21 +168,13 @@ class MogoPrivateObuManager private constructor() { } catch (e: Exception) { e.printStackTrace() } - try { - data.putOpt("receiverDataTime", System.currentTimeMillis()) - } catch (e: Exception) { - e.printStackTrace() - } - try { - data.putOpt("adasSatelliteTime", System.currentTimeMillis()) - } catch (e: Exception) { - e.printStackTrace() - } // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU if (2 == FunctionBuildConfig.gpsProvider) { - MogoMapUIController.getInstance().syncLocation2Map(data) - SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo(data) + // 同步给MAP地图 + CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map(data) + // 同步更新经纬度和系统时间至 AutoPilotStatusListener + CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon(System.currentTimeMillis(),position.longitude, position.latitude) } } catch (e: Exception) { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XPolylineManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XPolylineManager.java index 21badb6fae..2a104b9933 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XPolylineManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XPolylineManager.java @@ -4,6 +4,7 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi; import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths; import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XPolylineManager; @@ -13,7 +14,6 @@ import com.mogo.map.MogoOverlayManager; 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.entity.V2XRoadEventEntity; import com.mogo.module.common.enums.EventTypeEnum; import com.mogo.service.statusmanager.IMogoStatusManager; @@ -78,8 +78,8 @@ public class MoGoV2XPolylineManager implements IMoGoV2XPolylineManager { // 当前车辆位置 MogoLatLng carLocation = new MogoLatLng( - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(), - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon() + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon() ); if (carLocation != null) { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java index a2bf87339d..a4d8606382 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java @@ -9,6 +9,7 @@ import com.mogo.cloud.commons.utils.CoordinateUtils; import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi; import com.mogo.eagle.core.function.v2x.events.entity.model.DrawLineInfo; @@ -43,8 +44,8 @@ public class V2XWarningMarker implements IV2XMarker { private final List fillPoints = new ArrayList();//停止线经纬度合集 private boolean isFirstLocation = false; private MogoLatLng carLocation = new MogoLatLng( - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(), - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon() + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon() ); /* diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/LocationUtils.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/LocationUtils.java index 5180ec2f69..5065941603 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/LocationUtils.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/LocationUtils.java @@ -5,6 +5,7 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi; @@ -31,8 +32,8 @@ public class LocationUtils { public static MogoLatLng getCurrentLatLon() { // 当前车辆位置 MogoLatLng latLon = new MogoLatLng( - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(), - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon() + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon() ); IMogoLocationClient locationClient = CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(AbsMogoApplication.getApp()); if (locationClient != null) { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/MapUtils.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/MapUtils.kt index 5a984a3007..e92c8eacae 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/MapUtils.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/MapUtils.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.v2x.events.utils import android.content.Context import android.graphics.Rect import com.mogo.eagle.core.data.map.MogoLatLng +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi import com.mogo.eagle.core.utilcode.util.WindowUtils @@ -42,8 +43,8 @@ class MapUtils { mBoundRect.right = paddingRight // 当前车辆位置 val carLocation = MogoLatLng( - MogoApisHandler.getInstance().apis.adasControllerApi.lastLat, - MogoApisHandler.getInstance().apis.adasControllerApi.lastLon + CallerAutoPilotStatusListenerManager.getCurWgs84Lat(), + CallerAutoPilotStatusListenerManager.getCurWgs84Lon() ) // 调整自适应的地图镜头 carLocation?.let { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java index 0bb8b71559..10b639a5e7 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XCrossRoadVideoView.java @@ -46,7 +46,7 @@ import java.util.List; import tv.danmaku.ijk.media.player.IjkMediaPlayer; /** - * author : donghongyu EmArrow + * author : donghongyu * e-mail : 1358506549@qq.com * date : 2020-02-06 23:07 * update : 2021-04-01 17:30 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt index fa7bc32898..e0a7e2d4a9 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStatusInfo.kt @@ -28,6 +28,7 @@ class AutopilotStatusInfo : Serializable { var locationStatus = false var locationLat = 0.0 var locationLon = 0.0 + var satelliteTime = 0L /** * 车速 m/s diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index 1744e94233..01d02d1686 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -37,14 +37,6 @@ public class MogoServicePaths { @Deprecated public static final String PATH_UTILS_ANALYTICS = "/utils/analytics"; - - /** - * 网络服务接口路径 - */ - @Keep - @Deprecated - public static final String PATH_SERVICES_NETWORK = "/networkservices/api"; - /** * netty 长链 */ @@ -117,13 +109,6 @@ public class MogoServicePaths { @Deprecated public static final String PATH_DATA_MANAGER = "/datamanager/api"; - /** - * adas 控制 - */ - @Keep - @Deprecated - public static final String PATH_ADAS_CONTROLLER = "/adascontroller/api"; - /** * 接口集合 */ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt index ac5f0ae827..22e15a2f25 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt @@ -19,8 +19,4 @@ interface IMoGoAutopilotVehicleStateListener { */ fun onAutopilotBrakeLightData(brakeLight: Boolean) - /** - * 车辆刹车灯 根据加速度 - */ - fun onAutopilotBrakeLightByAcceleration(acceleration: Double) } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index d8f787a070..9c27fd9453 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -37,6 +37,38 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { return GsonUtils.toJson(mAutopilotStatusInfo) } + /** + * 通过Gnss定位更新来同步更新自动驾驶状态 + */ + fun updateAutoPilotLatLon(satelliteTime: Long, lon: Double, lat: Double) { + mAutopilotStatusInfo.locationLat = lat + mAutopilotStatusInfo.locationLon = lon + mAutopilotStatusInfo.satelliteTime = satelliteTime + mAutopilotStatusInfo.locationStatus = true + invokeAutoPilotStatus() + } + + /** + * 获取当前时刻WGS84 lat + */ + fun getCurWgs84Lat(): Double { + return mAutopilotStatusInfo.locationLat + } + + /** + * 获取当前时刻WGS84 lon + */ + fun getCurWgs84Lon(): Double { + return mAutopilotStatusInfo.locationLon + } + + /** + * 获取当前时刻WGS84 卫星时间 + */ + fun getCurWgs84SatelliteTime(): Long { + return mAutopilotStatusInfo.satelliteTime + } + /** * 添加 ADAS状态 监听 * @param tag 标记，用来注销监听使用 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt index 7be50470bd..d1c9c9919a 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt @@ -13,7 +13,7 @@ object CallerAutopilotVehicleStateListenerManager : CallerBase() { // 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步 private val M_AUTOPILOT_VEHICLE_LISTENERS: ConcurrentHashMap = - ConcurrentHashMap() + ConcurrentHashMap() /** * 添加 ADAS车辆状态&定位 监听 @@ -21,8 +21,8 @@ object CallerAutopilotVehicleStateListenerManager : CallerBase() { * @param listener 监听回调 */ fun addListener( - @Nullable tag: String, - @Nullable listener: IMoGoAutopilotVehicleStateListener + @Nullable tag: String, + @Nullable listener: IMoGoAutopilotVehicleStateListener ) { if (M_AUTOPILOT_VEHICLE_LISTENERS.containsKey(tag)) { return @@ -77,16 +77,5 @@ object CallerAutopilotVehicleStateListenerManager : CallerBase() { } } - /** - * 车辆刹车根据加速度判断 - */ - @Synchronized - fun invokeAutopilotBrakeLightByAcceleration(accrleration: Double) { - M_AUTOPILOT_VEHICLE_LISTENERS.forEach { - val listener = it.value - listener.onAutopilotBrakeLightByAcceleration(accrleration) - } - } - } \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index f73594e403..528b44d48c 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -293,57 +293,6 @@ public class DebugConfig { DebugConfig.downloadSnapshot = downloadSnapshot; } - // 环境状态 - public static final int sLocation = 0; - public static final int sAdasRecognized = 1; - public static final int sDownloadSnapshot = 2; - public static final int sAutoPilotStatus = 3; - public static final int sDownloadLink = 4; - public static final int sLon = 5; - public static final int sLat = 6; - - public static String[] sStatus = new String[]{ - "false", - "false", - "false", - "0", - "false", - "0", - "0" - }; - - public synchronized static void setStatus(int type, boolean status) { - sStatus[type] = String.valueOf(status); - } - - public synchronized static void setStatusData(int type, double data) { - sStatus[type] = String.valueOf(data); - } - - public synchronized static void setAutoPilotStatus(String status) { - sStatus[sAutoPilotStatus] = status; - } - - public synchronized static String getAutoPilotStatus() { - return sStatus[sAutoPilotStatus]; - } - - public synchronized static String getStatus(int type, boolean set2False) { - String result = sStatus[type]; - if (set2False) { - sStatus[type] = "false"; - } - return result; - } - - public synchronized static String getStatusData(int type) { - if (type > 4) { - return sStatus[type].toString(); - } else { - return "0"; - } - } - private static boolean isUseAdasRecognize = true; public static void setUseAdasRecognize(boolean status) { diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java deleted file mode 100644 index 82d10e590d..0000000000 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.mogo.module.common.datacenter; - -import static com.mogo.eagle.core.data.config.FunctionBuildConfig.gpsProvider; - -import com.mogo.commons.debug.DebugConfig; -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; -import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; -import com.mogo.map.MogoMapUIController; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.service.cloud.location.CloudLocationInfo; - -import org.json.JSONObject; - -import java.util.ArrayList; -import java.util.List; - -import mogo.telematics.pad.MessagePad; - -/** - * 定位坐标同步数据中心 - * 接收来自工控机实际定位数据 - */ -public class SnapshotLocationDataCenter { - - private static volatile SnapshotLocationDataCenter sInstance; - - private SnapshotLocationDataCenter() { - } - - public static SnapshotLocationDataCenter getInstance() { - if (sInstance == null) { - synchronized (SnapshotLocationDataCenter.class) { - if (sInstance == null) { - sInstance = new SnapshotLocationDataCenter(); - } - } - } - return sInstance; - } - - public synchronized void release() { - sInstance = null; - } - - // adda 工控机数据缓存 - private final List mMachineCacheList = new ArrayList<>(); - - private double mCurLon; - private double mCurLat; - private long mSatelliteTime = 0; - - /** - * 同步从工控机来的数据 - * - * @param data JSON结构化数据 - */ - public void syncAdasLocationInfo(JSONObject data) { - if (data == null) { - return; - } - //测试面板状态同步 - DebugConfig.setStatus(DebugConfig.sLocation, true); - - double lon = data.optDouble("lon", -1); - double lat = data.optDouble("lat", -1); - double alt = data.optDouble("alt", -1); - double heading = data.optDouble("heading", -1); - double speed = data.optDouble("speed", -1); - long satelliteTime = data.optLong("satelliteTime"); - long systemTime = data.optLong("systemTime"); - realSync(lon, lat, alt, heading, speed, satelliteTime, systemTime); - } - - public void syncAdasLocationInfo(MessagePad.GnssInfo gnssInfo) { - //测试面板状态同步 - DebugConfig.setStatus(DebugConfig.sLocation, true); - - double lon = gnssInfo.getLongitude(); - double lat = gnssInfo.getLatitude(); - double alt = gnssInfo.getAltitude(); - double heading = gnssInfo.getHeading(); - double speed = gnssInfo.getGnssSpeed(); - long satelliteTime = Double.valueOf(gnssInfo.getSatelliteTime()).longValue(); - long systemTime = Double.valueOf(gnssInfo.getSystemTime()).longValue(); - realSync(lon, lat, alt, heading, speed, satelliteTime, systemTime); - } - - private void realSync(double lon, double lat, double alt, double heading, double speed, long satelliteTime, long systemTime) { - - DebugConfig.setStatusData(DebugConfig.sLon, lon); - DebugConfig.setStatusData(DebugConfig.sLat, lat); - - // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统，1-工控机，2-OBU - AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); - autopilotStatusInfo.setLocationLat(lat); - autopilotStatusInfo.setLocationLon(lon); - - autopilotStatusInfo.setLocationStatus(true); - CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatus(); - - // 使用与渠道配置一样的gps提供者提供的数据 -// if (gpsProvider == FunctionBuildConfig.gpsProvider) { -// CloudLocationInfo cloudLocationInfo = new CloudLocationInfo(); -// cloudLocationInfo.setAlt(alt); -// cloudLocationInfo.setHeading(heading); -// cloudLocationInfo.setLat(lat); -// cloudLocationInfo.setLon(lon); -// cloudLocationInfo.setSpeed(speed); -// cloudLocationInfo.setSatelliteTime(satelliteTime); -// cloudLocationInfo.setSystemTime(systemTime); -// cloudLocationInfo.setTileId(String.valueOf(MogoMapUIController.getInstance().getTileId(lon, lat))); -// mMachineCacheList.add(cloudLocationInfo); -// -// mCurLon = cloudLocationInfo.getLon(); -// mCurLat = cloudLocationInfo.getLat(); -// mSatelliteTime = cloudLocationInfo.getSatelliteTime(); -// } - } - - public double getCurLon() { - return mCurLon; - } - - public double getCurLat() { - return mCurLat; - } - - public long getSatelliteTime() { - return mSatelliteTime; - } -} diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/receiver/SnapShotMockTestPanelBroadCastReceiver.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/receiver/SnapShotMockTestPanelBroadCastReceiver.java deleted file mode 100644 index 635efc8586..0000000000 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/receiver/SnapShotMockTestPanelBroadCastReceiver.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.mogo.module.common.datacenter.receiver; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -import com.mogo.module.common.datacenter.RealTimeData; -import com.mogo.module.common.datacenter.SnapshotLocationDataCenter; - -public class SnapShotMockTestPanelBroadCastReceiver extends BroadcastReceiver { - - private static final String TAG = "SnapShotMockTestPanelBroadCastReceiver"; - - /** - * 定位模拟测试控制面板广播Action - */ - public static final String BROADCAST_TEST_PANEL_CONTROL_TYPE_EXTRA_KEY = "sceneType"; - - @Override - public void onReceive(Context context, Intent intent) { - try { - int sceneType = intent.getIntExtra(BROADCAST_TEST_PANEL_CONTROL_TYPE_EXTRA_KEY, 0); - // 分发场景 - dispatchSceneTest(sceneType); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 分发处理场景 - * 定位模拟分发场景中，需要case自己处理数据，以生产者消费者模式来提供 RealTimeData 所需字段 - * - * @param sceneType 场景类型 - */ - private void dispatchSceneTest(int sceneType) { - if (sceneType == 1) { - //模拟顺义固定位置 - RealTimeData.getInstance().setLat(39.968309); - RealTimeData.getInstance().setLon(116.410871); - RealTimeData.getInstance().setHeading(120); - RealTimeData.getInstance().setSpeed(30); - long satelliteTime = SnapshotLocationDataCenter.getInstance().getSatelliteTime(); - if (satelliteTime == 0) { - satelliteTime = System.currentTimeMillis(); - } - RealTimeData.getInstance().setSatelliteTime(satelliteTime); - } else if (sceneType == 2) { - - } - - } -} diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 112ada1a9b..7248ca7ab1 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -6,11 +6,10 @@ import android.content.Context; import android.text.TextUtils; import com.mogo.commons.AbsMogoApplication; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.map.marker.IMogoMarker; -import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.R; import com.mogo.module.common.constants.AdasRecognizedType; -import com.mogo.module.common.datacenter.SnapshotLocationDataCenter; import java.util.Collection; import java.util.Iterator; @@ -151,15 +150,10 @@ public class BaseDrawer { * @return 0:lon 1:lat */ protected double[] getCurCoordinates() { - double[] coordinates = { - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(), - MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(), + return new double[]{ + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat() }; - if (coordinates[0] <= 0) { - coordinates[0] = SnapshotLocationDataCenter.getInstance().getCurLon(); - coordinates[1] = SnapshotLocationDataCenter.getInstance().getCurLat(); - } - return coordinates; } /** @@ -168,7 +162,7 @@ public class BaseDrawer { * @return SNTP时间 */ protected long getCurSatelliteTime() { - Long satelliteTime = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getSatelliteTime(); + long satelliteTime = CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84SatelliteTime(); if (satelliteTime == 0) { return System.currentTimeMillis(); } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/RealTimeData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/mock/RealTimeData.java similarity index 96% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/RealTimeData.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/mock/RealTimeData.java index fb371c7337..09d7622a76 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/RealTimeData.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/mock/RealTimeData.java @@ -1,4 +1,4 @@ -package com.mogo.module.common.datacenter; +package com.mogo.module.common.mock; public class RealTimeData { diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SpiRealTimeProvider.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/mock/SpiRealTimeProvider.java similarity index 98% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SpiRealTimeProvider.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/mock/SpiRealTimeProvider.java index 9b45273641..c5e3e7655c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SpiRealTimeProvider.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/mock/SpiRealTimeProvider.java @@ -1,4 +1,4 @@ -package com.mogo.module.common.datacenter; +package com.mogo.module.common.mock; import com.elegant.spi.annotations.Service; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; 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 9dee9fd091..89c3aefe08 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 @@ -38,7 +38,6 @@ import com.mogo.map.search.geo.MogoGeocodeResult; import com.mogo.map.search.geo.MogoRegeocodeResult; import com.mogo.map.search.geo.query.MogoRegeocodeQuery; import com.mogo.module.common.constants.DataTypes; -import com.mogo.module.common.datacenter.SnapshotLocationDataCenter; import com.mogo.module.common.dialog.WMDialog; import com.mogo.module.common.drawer.IdentifyDataDrawer; import com.mogo.module.common.drawer.SnapshotSetDataDrawer; @@ -712,7 +711,6 @@ public class MockIntentHandler implements IntentHandler { JSONObject jo = new JSONObject(line); //改变rtk定位数据，触发自车移动 MogoMapUIController.getInstance().syncLocation2Map(jo); - SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo(jo); return true; } 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 7414b9232d..22be7481aa 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 @@ -127,21 +127,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, // }); // } - /* - * 云端下发数据与adas定频传输数据均发送至同一Handler线程处理 - */ - // 云端下发的数据 - MoGoAiCloudRealTime.registerOnMsgListener(new IMogoCloudOnMsgListener() { - @Override - public void onMsgSend(long id) { - - } - - @Override - public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) { - DebugConfig.setStatus(DebugConfig.sDownloadSnapshot, true); - } - }); } 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 a360a519fe..9eb129f943 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 @@ -2,11 +2,8 @@ package com.mogo.module.service.network; import android.content.Context; -import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.module.common.constants.HostConst; -import com.mogo.service.network.IMogoNetwork; /** @@ -22,7 +19,6 @@ public class ZhidaoRefreshModel { private final ZhidaoApiService mRefreshApiService; public ZhidaoRefreshModel(Context context) { - IMogoNetwork network = (IMogoNetwork) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_NETWORK).navigation(context); this.mRefreshApiService = MoGoRetrofitFactory.getInstance(HostConst.CARLIFE_HOST).create(ZhidaoApiService.class); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java index 581ff75982..485c1d326d 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java @@ -62,7 +62,7 @@ public class MogoRouteOverlayManager implements } private void intiDrawer() { - RouteOverlayDrawer.getInstance(mContext).initdraw(); + RouteOverlayDrawer.getInstance(mContext).initDraw(); } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java index c45236b594..6d1bf7c3f6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java @@ -8,9 +8,9 @@ import android.graphics.BitmapFactory; import android.graphics.Color; import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ColorUtils; -import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.map.MogoMarkerManager; import com.mogo.map.MogoOverlayManager; import com.mogo.map.marker.IMogoMarker; @@ -18,7 +18,6 @@ import com.mogo.map.marker.MogoMarkerOptions; 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.service.R; import java.util.ArrayList; @@ -30,16 +29,16 @@ public class RouteOverlayDrawer { private IMogoPolyline mMoGoPolyline; // 连接线参数 - private MogoPolylineOptions mPolylineOptions; + private final MogoPolylineOptions mPolylineOptions; // 线路径集合 - private List mPolylinePointList; + private final List mPolylinePointList; // 渐变色 - private List mPolylineColors; - private Context mContext; + private final List mPolylineColors; + private final Bitmap endingBitmap; + private final Context mContext; IMogoOverlayManager mogoOverlayManager; private IMogoMarker endMarker; - private MogoMarkerOptions markderOptions; - private Bitmap endingBitmap; + private MogoMarkerOptions markerOptions; private static volatile RouteOverlayDrawer sInstance; private static final String markerType = "route_ending"; @@ -81,8 +80,8 @@ public class RouteOverlayDrawer { if (endMarker != null) { return; } - if (markderOptions == null) { - markderOptions = new MogoMarkerOptions() + if (markerOptions == null) { + markerOptions = new MogoMarkerOptions() .matchOnRoadSide(true) .gps(true) .icon(endingBitmap) @@ -92,9 +91,9 @@ public class RouteOverlayDrawer { .zIndex(30001); // .object(markerShowEntity) } - markderOptions.latitude(lat).longitude(lon); + markerOptions.latitude(lat).longitude(lon); //CallerLogger.INSTANCE.d(M_OLD_ROUTE + TAG,"addEndingMarker-"+lat+":"+lon); - endMarker = MogoMarkerManager.getInstance(mContext).addMarker(markerType, markderOptions); + endMarker = MogoMarkerManager.getInstance(mContext).addMarker(markerType, markerOptions); // if (DebugConfig.isDebug()){ // ToastUtils.showLong("绘制终点marker,"+lat+":"+lon); // } @@ -152,9 +151,11 @@ public class RouteOverlayDrawer { CallerLogger.INSTANCE.d(M_OLD_ROUTE + TAG, "drawTrajectoryList cost : " + (drawend - drawstart)); } - public void initdraw() { + public void initDraw() { mPolylinePointList.clear(); - MogoLatLng latLng = new MogoLatLng(MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(), MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon()); + MogoLatLng latLng = new MogoLatLng( + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon()); mPolylinePointList.add(latLng); mPolylinePointList.add(latLng); mPolylineColors.clear(); diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java index eb72d214a9..45331d19a5 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java @@ -3,7 +3,6 @@ package com.mogo.service; import android.content.Context; import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.service.adas.IMogoADASController; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cloud.location.IMogoLocationInfoService; import com.mogo.service.cloud.passport.IMogoPassportManager; @@ -14,7 +13,6 @@ import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.module.IMogoActionManager; import com.mogo.service.module.IMogoRegisterCenter; -import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.v2x.DisplayEffectsInterface; import com.mogo.service.windowview.IMogoTopViewManager; @@ -78,13 +76,6 @@ public interface IMogoServiceApis extends IProvider { */ IMogoRegisterCenter getRegisterCenterApi(); - /** - * 网络接口api - * - * @return - */ - IMogoNetwork getNetworkApi(); - /** * 状态管理接口 * @@ -99,13 +90,6 @@ public interface IMogoServiceApis extends IProvider { */ IMogoWindowManager getWindowManagerApi(); - /** - * 辅助驾驶控制接口 - * - * @return - */ - IMogoADASController getAdasControllerApi(); - /** * 动作控制 * @@ -121,7 +105,6 @@ public interface IMogoServiceApis extends IProvider { */ IMogoTopViewManager getTopViewManager(); - /** * 浓雾等极端事件特殊效果管理类 * diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java deleted file mode 100644 index a73e21ca1d..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.mogo.service.adas; - -import com.alibaba.android.arouter.facade.template.IProvider; - -/** - * @author congtaowang - * @since 2020-03-10 - *

- * v2x 页面控制 - */ -public interface IMogoADASController extends IProvider { - - /** - * 获取车身的定位纬度 - * - * @return - */ - double getLastLat(); - - /** - * 设置自车的定位纬度 - */ - void setLastLat(double lastLat); - - /** - * 获取车身定位经度 - * - * @return - */ - double getLastLon(); - - /** - * 设置自车的定位经度 - */ - void setLastLon(double lastLon); - - /** - * 获取由工控机传回的GPS星历时间 - * - * @return Long - */ - Long getSatelliteTime(); - - /** - * 设置自车的GPS星历时间 - */ - void setSatelliteTime(Long satelliteTime); - -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/network/IMogoNetwork.java b/services/mogo-service-api/src/main/java/com/mogo/service/network/IMogoNetwork.java deleted file mode 100644 index d995f43e5d..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/network/IMogoNetwork.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mogo.service.network; - -import androidx.annotation.Keep; - -import com.alibaba.android.arouter.facade.template.IProvider; - -/** - * @author congtaowang - * @since 2019-12-23 - *

- * 描述 - */ -@Keep -public interface IMogoNetwork extends IProvider { - - /** - * 埋点 - * - * @param service 业务类 - * @param baseUrl url - * @return 业务类动态代理 - */ - @Keep - T create(final Class service, String baseUrl); - -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/warning/WarningStatusListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/warning/WarningStatusListener.java deleted file mode 100644 index e4a7d98314..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/warning/WarningStatusListener.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.service.warning; - -/** - * @author xiaoyuzhou - * @date 2021/9/13 4:41 下午 - */ -public interface WarningStatusListener { - default void onShow() { - } - - default void onDismiss() { - } -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java index f1b21b2ed8..7c3a60aa9a 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java @@ -8,7 +8,6 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.service.IMogoServiceApis; -import com.mogo.service.adas.IMogoADASController; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.cloud.location.IMogoLocationInfoService; import com.mogo.service.cloud.passport.IMogoPassportManager; @@ -23,7 +22,6 @@ import com.mogo.service.impl.singleton.SingletonsHolder; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.module.IMogoActionManager; import com.mogo.service.module.IMogoRegisterCenter; -import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.v2x.DisplayEffectsInterface; import com.mogo.service.windowview.IMogoTopViewManager; @@ -41,7 +39,7 @@ public class MogoServiceApis implements IMogoServiceApis { private static final String TAG = "MogoServiceApis"; - private static Object sLock = new Object(); + private static final Object sLock = new Object(); @Override public IMogoAnalytics getAnalyticsApi() { @@ -68,11 +66,6 @@ public class MogoServiceApis implements IMogoServiceApis { return IntentManager.getInstance(); } - @Override - public IMogoNetwork getNetworkApi() { - return SingletonsHolder.get(IMogoNetwork.class); - } - @Override public IMogoStatusManager getStatusManagerApi() { return SingletonsHolder.get(IMogoStatusManager.class); @@ -99,11 +92,6 @@ public class MogoServiceApis implements IMogoServiceApis { return getApiInstance(IMogoWindowManager.class, MogoServicePaths.PATH_WINDOW_MANAGER); } - @Override - public IMogoADASController getAdasControllerApi() { - return getApiInstance(IMogoADASController.class, MogoServicePaths.PATH_ADAS_CONTROLLER); - } - @Override public IMogoActionManager getActionManagerApi() { return getApiInstance(IMogoActionManager.class, MogoServicePaths.PATH_ACTION_APIS); 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 deleted file mode 100644 index 6a079a3c2a..0000000000 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.mogo.service.impl.adas; - -import android.content.Context; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.eagle.core.data.constants.MogoServicePaths; -import com.mogo.service.adas.IMogoADASController; - -@Route(path = MogoServicePaths.PATH_ADAS_CONTROLLER) -public class MogoADASController implements IMogoADASController { - - private static final String TAG = "MogoADASController"; - - private double mLastLon; - private double mLastLat; - private Long mSatelliteTime; - - @Override - public double getLastLat() { - return mLastLat; - } - - @Override - public void setLastLat(double lastLat) { - mLastLat = lastLat; - } - - @Override - public double getLastLon() { - return mLastLon; - } - - @Override - public void setLastLon(double lastLon) { - mLastLon = lastLon; - } - - @Override - public Long getSatelliteTime() { - return mSatelliteTime; - } - - @Override - public void setSatelliteTime(Long satelliteTime) { - mSatelliteTime = satelliteTime; - } - - @Override - public void init(Context context) { - - } - -} - - diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java deleted file mode 100644 index d5ffc1db45..0000000000 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/network/MogoNetWorkService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.mogo.service.impl.network; - - -import android.content.Context; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.eagle.core.data.constants.MogoServicePaths; -import com.mogo.eagle.core.network.MoGoRetrofitFactory; -import com.mogo.service.network.IMogoNetwork; - -/** - * @author zyz - * @since 2019-12-18 - *

- * 网络对外地接口 - */ -@Route(path = MogoServicePaths.PATH_SERVICES_NETWORK) -public class MogoNetWorkService implements IMogoNetwork { - - @Override - public void init(Context context) { - } - - @Override - public T create(Class service, String baseUrl) { - return MoGoRetrofitFactory.getInstance(baseUrl).create(service); - } - -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java b/services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java index 27e9d38f5e..80c544a06d 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java @@ -5,9 +5,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.service.datamanager.IMogoDataManager; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.impl.fragmentmanager.MogoFragmentManager; -import com.mogo.service.impl.network.MogoNetWorkService; import com.mogo.service.impl.statusmanager.MogoStatusManager; -import com.mogo.service.network.IMogoNetwork; import com.mogo.service.statusmanager.IMogoStatusManager; import java.util.Map; @@ -21,13 +19,10 @@ import java.util.concurrent.ConcurrentHashMap; */ public class SingletonsHolder { - private static final String TAG = "SingletonsHolder"; - private static final Map sSingletons = new ConcurrentHashMap<>(); static { sSingletons.put(IMogoFragmentManager.class, new MogoFragmentManager()); - sSingletons.put(IMogoNetwork.class, new MogoNetWorkService()); sSingletons.put(IMogoStatusManager.class, new MogoStatusManager()); sSingletons.put(IMogoDataManager.class, ARouter.getInstance().navigation(IMogoDataManager.class)); }