From a7a11d950fc4eb148ffda51d126c016c461bd1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 1 Sep 2020 19:30:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dv2x=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/V2XEventPanelModuleProvider.java | 1 + .../mogo/module/v2x/V2XServiceManager.java | 78 ++++++++++--------- .../v2x/fragment/V2XEventPanelFragment.kt | 6 +- 3 files changed, 44 insertions(+), 41 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java index 4b101c27e5..67b2f03b53 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java @@ -34,6 +34,7 @@ public class V2XEventPanelModuleProvider implements @Override public Fragment createFragment(Context context, Bundle data) { + V2XServiceManager.init(context); return V2XEventPanelFragment.Companion.getInstance(); } 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 9aac886249..823faa7f2f 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 @@ -11,10 +11,10 @@ import com.mogo.map.search.geo.IMogoGeoSearch; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.carchattingprovider.ICarsChattingProvider; import com.mogo.module.v2x.alarm.V2XCalculateServer; -import com.mogo.module.v2x.network.V2XRefreshModel; import com.mogo.module.v2x.manager.IMoGoV2XMarkerManager; import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager; import com.mogo.module.v2x.manager.IMoGoV2XStatusManager; +import com.mogo.module.v2x.network.V2XRefreshModel; import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; @@ -45,6 +45,9 @@ import com.zhidao.carchattingprovider.CallChattingProviderConstant; */ public class V2XServiceManager { private static final String TAG = "V2XServiceManager"; + + private static boolean isInit; + private static Context mContext; private static IMogoServiceApis mMogoServiceApis; @@ -88,45 +91,49 @@ public class V2XServiceManager { public static void init(final Context context) { - mContext = context; - mMogoServiceApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context); + if (!isInit) { + isInit = true; - mMapService = mMogoServiceApis.getMapServiceApi(); - mImageLoader = mMogoServiceApis.getImageLoaderApi(); - mMogoStatusManager = mMogoServiceApis.getStatusManagerApi(); - mMogoSocketManager = mMogoServiceApis.getSocketManagerApi(context); - mMogoAnalytics = mMogoServiceApis.getAnalyticsApi(); - mIMogoWindowManager = mMogoServiceApis.getWindowManagerApi(); - mMogoRegisterCenter = mMogoServiceApis.getRegisterCenterApi(); - mIMogoRefreshStrategyController = mMogoServiceApis.getRefreshStrategyControllerApi(); - mIMogoADASController = mMogoServiceApis.getAdasControllerApi(); - mMogoEntranceButtonController = mMogoServiceApis.getEntranceButtonController(); - mMogoActionManager = mMogoServiceApis.getActionManagerApi(); - mMogoTopViewManager = mMogoServiceApis.getTopViewManager(); - mIMogoSearchManager = mMogoServiceApis.getSearchManagerApi(); - mIMogoMarkerService = mMogoServiceApis.getMarkerService(); - mIMogoShareManager = mMogoServiceApis.getShareManager(); - mIMogoTanluProvider = mMogoServiceApis.getTanluApi(); + mContext = context; + mMogoServiceApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context); - mMarkerManager = mMapService.getMarkerManager(context); - mNavi = mMapService.getNavi(context); - mMapUIController = mMapService.getMapUIController(); - mMogoLocationClient = mMapService.getSingletonLocationClient(context); - mMogoOverlayManager = mMapService.getOverlayManager(context); - mIMogoGeoSearch = mMapService.getGeoSearch(context); + mMapService = mMogoServiceApis.getMapServiceApi(); + mImageLoader = mMogoServiceApis.getImageLoaderApi(); + mMogoStatusManager = mMogoServiceApis.getStatusManagerApi(); + mMogoSocketManager = mMogoServiceApis.getSocketManagerApi(context); + mMogoAnalytics = mMogoServiceApis.getAnalyticsApi(); + mIMogoWindowManager = mMogoServiceApis.getWindowManagerApi(); + mMogoRegisterCenter = mMogoServiceApis.getRegisterCenterApi(); + mIMogoRefreshStrategyController = mMogoServiceApis.getRefreshStrategyControllerApi(); + mIMogoADASController = mMogoServiceApis.getAdasControllerApi(); + mMogoEntranceButtonController = mMogoServiceApis.getEntranceButtonController(); + mMogoActionManager = mMogoServiceApis.getActionManagerApi(); + mMogoTopViewManager = mMogoServiceApis.getTopViewManager(); + mIMogoSearchManager = mMogoServiceApis.getSearchManagerApi(); + mIMogoMarkerService = mMogoServiceApis.getMarkerService(); + mIMogoShareManager = mMogoServiceApis.getShareManager(); + mIMogoTanluProvider = mMogoServiceApis.getTanluApi(); - mCarsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); - mMogoIntentManager = mMogoServiceApis.getIntentManagerApi(); + mMarkerManager = mMapService.getMarkerManager(context); + mNavi = mMapService.getNavi(context); + mMapUIController = mMapService.getMapUIController(); + mMogoLocationClient = mMapService.getSingletonLocationClient(context); + mMogoOverlayManager = mMapService.getOverlayManager(context); + mIMogoGeoSearch = mMapService.getGeoSearch(context); - mV2XRefreshModel = V2XRefreshModel.getInstance(context); - mV2XMarkerService = V2XMarkerService.getInstance(context); - mV2XStatusManager = V2XStatusManager.getInstance(); - mV2XSocketManager = V2XSocketManager.getInstance(); - mV2XCalculateServer = V2XCalculateServer.getInstance(); + mCarsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); + mMogoIntentManager = mMogoServiceApis.getIntentManagerApi(); - moGoV2XMarkerManager = (IMoGoV2XMarkerManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_MARKER_MANAGER).navigation(context); - moGoV2XPolylineManager = (IMoGoV2XPolylineManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_POLYLINE_MANAGER).navigation(context); - moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(context); + mV2XRefreshModel = V2XRefreshModel.getInstance(context); + mV2XMarkerService = V2XMarkerService.getInstance(context); + mV2XStatusManager = V2XStatusManager.getInstance(); + mV2XSocketManager = V2XSocketManager.getInstance(); + mV2XCalculateServer = V2XCalculateServer.getInstance(); + + moGoV2XMarkerManager = (IMoGoV2XMarkerManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_MARKER_MANAGER).navigation(context); + moGoV2XPolylineManager = (IMoGoV2XPolylineManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_POLYLINE_MANAGER).navigation(context); + moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(context); + } } public static Context getContext() { @@ -258,5 +265,4 @@ public class V2XServiceManager { } - } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 48c5eb7ab4..5a277dafae 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -131,17 +131,13 @@ class V2XEventPanelFragment : MvpFragment