Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java
This commit is contained in:
tongchenfei
2020-06-12 11:03:03 +08:00
16 changed files with 107 additions and 52 deletions

View File

@@ -16,6 +16,7 @@ import com.mogo.module.main.EventDispatchCenter;
import com.mogo.module.main.cards.MogoModulesManager;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.logger.Logger;
import com.zhidao.roadcondition.service.MainService;
@@ -43,9 +44,12 @@ class MogoMainService extends Service implements IMogoLocationListener {
mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation();
initAndStartLocation();
initGpsSimulatorListener();
loadBaseModules();
startTanluService();
initADAS();
UiThreadHandler.postDelayed( () -> {
loadBaseModules();
startTanluService();
initADAS();
}, 2_000L
);
}
@Nullable