Merge branch 'dev_1.1.2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_1.1.2

# Conflicts:
#	app/build.gradle
#	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
#	settings.gradle
This commit is contained in:
tongchenfei
2020-08-10 14:46:39 +08:00
59 changed files with 925 additions and 545 deletions

View File

@@ -23,6 +23,7 @@ import com.mogo.service.module.IMogoMarkerService;
import com.mogo.service.module.IMogoRegisterCenter;
import com.mogo.service.module.IMogoSearchManager;
import com.mogo.service.module.IMogoSettingManager;
import com.mogo.service.monitor.IMogoMonitorProvider;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.obu.IMogoObuManager;
import com.mogo.service.passport.IMogoPassportManager;
@@ -250,4 +251,10 @@ public interface IMogoServiceApis extends IProvider {
* @return
*/
IMogoTanluProvider getTanluApi();
/**
* 获取Monitor相关api
* @return
*/
IMogoMonitorProvider getMogoMonitorApi();
}