yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'demo/shunyi_v2v' into demo/shunyi_v2v_merge

Browse Source 
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
#	modules/mogo-module-search/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
This commit is contained in:
tongchenfei
2020-09-04 17:32:26 +08:00
parent e02c26d492 ef5c3d306e
commit b7092f5774
16 changed files with 462 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -80,7 +80,9 @@ public class MogoApplication extends AbsMogoApplication {
MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_MOGO_MONITOR, "MogoMonitor"));
MogoModulePaths.addModule( new MogoModule( V2XConst.PATH_EVENT_PANEL, V2XConst.MODULE_NAME_EVENT_PANEL ) );
MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) );
// 碰撞报警模块
MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_CRASH_WARNING,
"CrashWarning"));
if ( !DebugConfig.isLauncher() ) {
PersistentManager.getInstance().initManager( this );
Intent intent = new Intent( this, MogoMainService.class );