Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_check
# Conflicts: # app/build.gradle # app/src/main/java/com/mogo/launcher/MogoApplication.java # gradle.properties # modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java # modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java # services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java # services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java # services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
This commit is contained in:
@@ -7,9 +7,14 @@ import com.mogo.service.adas.IMogoADASController;
|
||||
import com.mogo.service.analytics.IMogoAnalytics;
|
||||
import com.mogo.service.auth.IMogoAuthManager;
|
||||
import com.mogo.service.cardmanager.IMogoCardManager;
|
||||
<<<<<<< HEAD
|
||||
import com.mogo.service.check.ICheckProvider;
|
||||
import com.mogo.service.connection.IMogoSocketManager;
|
||||
import com.mogo.service.connection.IMogoWebSocketManager;
|
||||
=======
|
||||
import com.mogo.service.cloud.socket.IMogoSocketManager;
|
||||
import com.mogo.service.cloud.socket.IMogoWebSocketManager;
|
||||
>>>>>>> dev/dev_eagle_architecture_upgrade
|
||||
import com.mogo.service.datamanager.IMogoDataManager;
|
||||
import com.mogo.service.entrance.IMogoEntranceButtonController;
|
||||
import com.mogo.service.eventpanel.IEventPanelProvider;
|
||||
@@ -17,9 +22,10 @@ import com.mogo.service.fragmentmanager.IMogoFragmentManager;
|
||||
import com.mogo.service.imageloader.IMogoImageloader;
|
||||
import com.mogo.service.intent.IMogoIntentManager;
|
||||
import com.mogo.service.launcher.IMogoLauncher;
|
||||
import com.mogo.service.locationinfo.IMogoLocationInfoService;
|
||||
import com.mogo.service.cloud.location.IMogoLocationInfoService;
|
||||
import com.mogo.service.map.IMogoMapFrameController;
|
||||
import com.mogo.service.map.IMogoMapService;
|
||||
import com.mogo.service.obu.IMoGoObuProvider;
|
||||
import com.mogo.service.smp.IMogoSmallMapProvider;
|
||||
import com.mogo.service.module.IMogoActionManager;
|
||||
import com.mogo.service.module.IMogoAddressManager;
|
||||
@@ -30,7 +36,7 @@ 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.passport.IMogoPassportManager;
|
||||
import com.mogo.service.cloud.passport.IMogoPassportManager;
|
||||
import com.mogo.service.share.IMogoShareManager;
|
||||
import com.mogo.service.share.IMogoTrafficUploadProvider;
|
||||
import com.mogo.service.statusmanager.IMogoMsgCenter;
|
||||
@@ -41,6 +47,7 @@ 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.service.warning.IMoGoWaringProvider;
|
||||
import com.mogo.service.windowview.IMogoTopViewManager;
|
||||
import com.mogo.service.windowview.IMogoWindowManager;
|
||||
import com.mogo.skin.support.IMogoSkinSupportInstaller;
|
||||
@@ -184,14 +191,7 @@ public interface IMogoServiceApis extends IProvider {
|
||||
*/
|
||||
IMogoRefreshStrategyController getRefreshStrategyControllerApi();
|
||||
|
||||
/**
|
||||
* 地址操作
|
||||
* Deprecated, use {@link IMogoSearchManager} instead.
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Deprecated
|
||||
IMogoAddressManager getAddressManagerApi();
|
||||
|
||||
|
||||
/**
|
||||
* 桌面控制接口
|
||||
@@ -328,6 +328,7 @@ public interface IMogoServiceApis extends IProvider {
|
||||
IMogoSmallMapProvider getSmallMapProviderApi();
|
||||
|
||||
/**
|
||||
<<<<<<< HEAD
|
||||
* 检测接口
|
||||
*/
|
||||
ICheckProvider getCheckProvider();
|
||||
@@ -335,5 +336,19 @@ public interface IMogoServiceApis extends IProvider {
|
||||
/*
|
||||
*V2X
|
||||
* */
|
||||
=======
|
||||
* V2X
|
||||
*/
|
||||
>>>>>>> dev/dev_eagle_architecture_upgrade
|
||||
IV2XProvider getV2XListenerManager();
|
||||
|
||||
/**
|
||||
* warning 模块
|
||||
*/
|
||||
IMoGoWaringProvider getWaringProviderApi();
|
||||
|
||||
/**
|
||||
* obu-mogo 模块
|
||||
*/
|
||||
IMoGoObuProvider getMoGoObuProviderApi();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user