Merge branch 'dev_MogoAP_eagle-220_211207_8.0.15'

# Conflicts:
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
This commit is contained in:
donghongyu
2021-12-31 15:19:03 +08:00
22 changed files with 299 additions and 486 deletions

View File

@@ -25,6 +25,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.traffic.TrafficData;
import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.util.ThreadUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.map.navi.IMogoNaviListener;
@@ -595,7 +596,8 @@ public class MockIntentHandler implements IntentHandler {
case 52:
// 打开连调工控机、ADAS的控制面板
//adb shell am broadcast -a com.mogo.mock --ei oper 52
EnvStatusManager.getInstance().showPanel(context);
//EnvStatusManager.getInstance().showPanel(context);
ToastUtils.showShort("请使用新版调试面板!!");
break;
case 53:// 控制 Adas识别 是否可用
boolean isUseAdasRecognize = intent.getBooleanExtra("status", false);

View File

@@ -23,7 +23,7 @@ import com.mogo.utils.storage.SharedPrefsMgr;
import static com.mogo.utils.CommonUtils.getVersionName;
/*
/**
* @author congtaowang
* @since 2021/3/17
*