Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java

@@ -34,7 +34,6 @@ import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.service.share.IMogoTanluProvider;
 import com.mogo.service.share.IMogoTrafficUploadProvider;
-import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
@@ -95,7 +94,6 @@ public class V2XServiceManager {
     private static V2XStatusManager mV2XStatusManager;
     private static V2XSocketManager mV2XSocketManager;
     private static V2XCalculateServer mV2XCalculateServer;
-    private static IMogoSmallMapProvider mSmallMapProvider;
 
 
     // 下面的是重构后的代码，建议
@@ -136,7 +134,6 @@ public class V2XServiceManager {
             mIMogoTanluProvider = mMogoServiceApis.getTanluApi();
             mIMogoTrafficUploadProvider = mMogoServiceApis.getTrafficUploadApi();
             mMogoOnlineCarListPanelProvider = mMogoServiceApis.getOnlineCarPanelApi();
-            mSmallMapProvider = mMogoServiceApis.getSmallMapProviderApi();
 
             //事件面板
             mIEventPanelProvider = mMogoServiceApis.getEventPanelManager();
@@ -188,10 +185,6 @@ public class V2XServiceManager {
         return mMapService;
     }
 
-    public static IMogoSmallMapProvider getMogoSmallMapProvider() {
-        return mSmallMapProvider;
-    }
-
     public static IMogoOverlayManager getMogoOverlayManager() {
         return mMogoOverlayManager;
     }

services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java

@@ -314,17 +314,6 @@ public interface IMogoServiceApis extends IProvider {
      */
     IMogoMapFrameController getMapFrameControllerApi();
 
-    /**
-     * 地图图层控制接口
-     *
-     * @return
-     */
-    IMogoSmallMapProvider getSmallMapProviderApi();
-
-    /**
-     * 检测接口
-     */
-    ICheckProvider getCheckProvider();
 
     /*
      *V2X
@@ -336,8 +325,4 @@ public interface IMogoServiceApis extends IProvider {
      */
     IMoGoWaringProvider getWaringProviderApi();
 
-    /**
-     * obu-mogo 模块
-     */
-    IMoGoObuProvider getMoGoObuProviderApi();
 }

services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java

@@ -5,13 +5,15 @@ import android.content.Context;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.facade.template.IProvider;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.auth.IMogoAuthManager;
 import com.mogo.service.cardmanager.IMogoCardManager;
-import com.mogo.eagle.core.function.api.check.ICheckProvider;
+import com.mogo.service.cloud.location.IMogoLocationInfoService;
+import com.mogo.service.cloud.passport.IMogoPassportManager;
 import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.service.cloud.socket.IMogoWebSocketManager;
 import com.mogo.service.datamanager.IMogoDataManager;
@@ -25,11 +27,8 @@ import com.mogo.service.impl.intent.IntentManager;
 import com.mogo.service.impl.singleton.SingletonsHolder;
 import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.service.launcher.IMogoLauncher;
-import com.mogo.service.cloud.location.IMogoLocationInfoService;
 import com.mogo.service.map.IMogoMapFrameController;
 import com.mogo.service.map.IMogoMapService;
-import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider;
-import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider;
 import com.mogo.service.module.IMogoActionManager;
 import com.mogo.service.module.IMogoMarkerService;
 import com.mogo.service.module.IMogoRegisterCenter;
@@ -38,18 +37,16 @@ import com.mogo.service.module.IMogoSettingManager;
 import com.mogo.service.monitor.IMogoMonitorProvider;
 import com.mogo.service.network.IMogoNetwork;
 import com.mogo.service.obu.IMogoCrashWarnProvider;
-import com.mogo.service.cloud.passport.IMogoPassportManager;
 import com.mogo.service.share.IMogoShareManager;
+import com.mogo.service.share.IMogoTanluProvider;
+import com.mogo.service.share.IMogoTanluUiProvider;
 import com.mogo.service.share.IMogoTrafficUploadProvider;
 import com.mogo.service.statusmanager.IMogoMsgCenter;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
-import com.mogo.service.share.IMogoTanluProvider;
-import com.mogo.service.share.IMogoTanluUiProvider;
 import com.mogo.service.v2x.DisplayEffectsInterface;
 import com.mogo.service.v2x.IV2XProvider;
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider;
 import com.mogo.service.windowview.IMogoTopViewManager;
 import com.mogo.service.windowview.IMogoWindowManager;
 import com.mogo.skin.support.IMogoSkinSupportInstaller;
@@ -256,15 +253,6 @@ public class MogoServiceApis implements IMogoServiceApis {
         return getApiInstance(IMogoMapFrameController.class, MogoServicePaths.PATH_MAP_FRAME_CONTROLLER);
     }
 
-    @Override
-    public IMogoSmallMapProvider getSmallMapProviderApi() {
-        return getApiInstance(IMogoSmallMapProvider.class, MogoServicePaths.PATH_SMALL_MAP);
-    }
-
-    @Override
-    public ICheckProvider getCheckProvider() {
-        return getApiInstance(ICheckProvider.class, MogoServicePaths.PATH_CHECK);
-    }
 
     @Override
     public IV2XProvider getV2XListenerManager() {
@@ -276,11 +264,6 @@ public class MogoServiceApis implements IMogoServiceApis {
         return getApiInstance(IMoGoWaringProvider.class, MogoServicePaths.PATH_V2X_WARNING);
     }
 
-    @Override
-    public IMoGoObuProvider getMoGoObuProviderApi() {
-        return getApiInstance(IMoGoObuProvider.class, MogoServicePaths.PATH_V2X_OBU_MOGO);
-    }
-
     @Override
     public IMogoTrafficUploadProvider getTrafficUploadApi() {
         return getApiInstance(IMogoTrafficUploadProvider.class, MogoServicePaths.PATH_TRAFFIC_UPLOAD);
@@ -299,6 +282,7 @@ public class MogoServiceApis implements IMogoServiceApis {
                     SingletonsHolder.registerApi(clazz, newInst);
                     Logger.d(TAG, "keep IProvider instance to SingletonHolder: path = %s", path);
                 } catch (Exception e) {
+                    e.printStackTrace();
                 }
                 return newInst;
             }