Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	gradle.properties
#	modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
This commit is contained in:
donghongyu
2021-12-31 15:25:55 +08:00
30 changed files with 339 additions and 631 deletions

View File

@@ -10,6 +10,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel;
import com.zhidao.support.adas.high.AdasManager;
import com.zhidao.support.adas.high.bean.BasicInfo;
import com.zhidao.support.adas.high.common.CupidLogUtils;
/**
@@ -44,6 +45,8 @@ public class AdasProvider implements IProvider {
}
private void initAdas(Context context, AdasEventManager adasEventManager) {
CupidLogUtils.setEnableLog(false);
CupidLogUtils.setIsWriteLog(false);
AdasManager.getInstance().create(context);
AdasManager.getInstance().setOnAdasListener(new OnAdasListenerAdapter());
AdasManager.getInstance().setOnAdasConnectStatusListener(adasEventManager);
@@ -93,10 +96,6 @@ public class AdasProvider implements IProvider {
}
public void showAdas() {
}
public void killAdas() {
}