diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
index f05e957166..319a1a79c7 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
@@ -64,6 +64,8 @@ public class MoGoHandAdasMsgManager implements
ThreadUtils.getSinglePool().execute(() ->
IdentifyDataDrawer.getInstance().renderAdasRecognizedResult(trafficData)
);
+ } else {
+ IdentifyDataDrawer.getInstance().clearOldMarker();
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 468b46abf3..f08fd8433a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -238,26 +238,16 @@ class DebugSettingView @JvmOverloads constructor(
}
}
- // 初始化 感知数据是否绘制 选择情况
- rgIsDrawIdentifyData.check(
- when (FunctionBuildConfig.isDrawIdentifyData) {
- true -> {
- R.id.rbDraw
- }
- false -> {
- R.id.rbDoNotDraw
- }
- }
- )
- rgIsDrawIdentifyData.setOnCheckedChangeListener { group, checkedId ->
- when (checkedId) {
- R.id.rbDraw -> {
- FunctionBuildConfig.isDrawIdentifyData = true
- }
- R.id.rbDoNotDraw -> {
- FunctionBuildConfig.isDrawIdentifyData = false
- }
- }
+ // 初始化 ADAS感知数据是否绘制 选择情况
+ tbIsDrawIdentifyData.isChecked = FunctionBuildConfig.isDrawIdentifyData
+ tbIsDrawIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
+ FunctionBuildConfig.isDrawIdentifyData = isChecked
+ }
+
+ // 初始化 OBU感知数据是否绘制 选择情况
+ tbIsDrawOBUIdentifyData.isChecked = FunctionBuildConfig.isDrawObuIdentifyData
+ tbIsDrawOBUIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
+ FunctionBuildConfig.isDrawObuIdentifyData = isChecked
}
// 演示模式,上一次勾选的数据
@@ -269,9 +259,9 @@ class DebugSettingView @JvmOverloads constructor(
val isDemoMode =
SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.IS_DEMO_MODE, false)
CallerAutoPilotManager.setDemoMode(isDemoMode)
- rbIsDemoMode.isChecked = isDemoMode
+ tbIsDemoMode.isChecked = isDemoMode
// 演示模式
- rbIsDemoMode.setOnCheckedChangeListener { buttonView, isChecked ->
+ tbIsDemoMode.setOnCheckedChangeListener { buttonView, isChecked ->
CallerAutoPilotManager.setDemoMode(isChecked)
FunctionBuildConfig.isDemoMode = isChecked
SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.IS_DEMO_MODE, isChecked)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 49881fa8ef..4e048d8fbe 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -28,7 +28,7 @@
android:padding="@dimen/dp_10"
android:text="鹰眼应用信息"
android:textColor="#000"
- android:textSize="@dimen/dp_34"
+ android:textSize="@dimen/dp_24"
android:textStyle="bold" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:textSize="@dimen/dp_24" />
+ android:textSize="@dimen/dp_24" />
+ android:textSize="@dimen/dp_24" />
+ android:textSize="@dimen/dp_24" />
-
+
-
+ android:orientation="horizontal">
-
+
-
+
-
+
-
-
-
+ android:gravity="center"
+ android:padding="@dimen/dp_5"
+ android:text="录制Bag包"
+ android:textSize="@dimen/dp_24" />
-
-
-
-
-
-
-
-
-
+ android:textSize="@dimen/dp_24" />
-
-
+ android:orientation="horizontal">
-
+
+
+
+
+
+ android:textSize="@dimen/dp_24" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
index 1b420f1d10..3c9f81e04c 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -42,6 +42,14 @@ object FunctionBuildConfig {
@JvmField
var isDrawIdentifyData = true
+ /**
+ * 地图是否绘制 OBU 识别回调的Marker
+ * true - 绘制
+ * false - 不绘制
+ */
+ @JvmField
+ var isDrawObuIdentifyData = true
+
/**
* 地图是否忽略判断条件直接绘制工控机引导线数据&全局路径规划
* 用于调试
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java
index de5222d30b..b4491b0cac 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java
@@ -3,7 +3,6 @@ package com.mogo.module.common.drawer;
import android.content.Context;
import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.enums.TrafficTypeEnum;
import com.mogo.eagle.core.data.traffic.TrafficData;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
@@ -33,7 +32,10 @@ public class IdentifyDataDrawer {
* 已经感知不到的脏数据
*/
private final ConcurrentHashMap mDirtyPositions = new ConcurrentHashMap<>();
-
+ /**
+ * 记录每次实际绘制的交通元素UUID
+ */
+ private final ArrayList trafficDataUuidList = new ArrayList<>();
/**
* 过滤后的数据集合
*/
@@ -65,7 +67,7 @@ public class IdentifyDataDrawer {
* @param resultList adas感知融合数据
*/
public void renderAdasRecognizedResult(ArrayList resultList) {
- if (resultList == null || resultList.isEmpty() || !DebugConfig.isUseAdasRecognize()) {
+ if (resultList == null || resultList.isEmpty()) {
clearOldMarker();
Logger.w(TAG, "感知数据为空无需渲染……");
return;
@@ -78,7 +80,7 @@ public class IdentifyDataDrawer {
}
// 循环将集合中的数据提取记录
- ArrayList trafficDataUuidList = new ArrayList<>();
+
for (TrafficData trafficData : resultList) {
// 过滤掉未知感知数据
if (trafficData.getType() == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI) {
@@ -132,9 +134,13 @@ public class IdentifyDataDrawer {
* 清除旧的 marker 数据
*/
public void clearOldMarker() {
- if (mMarkersCaches != null) {
- mMarkersCaches.clear();
+ for (String uuid : trafficDataUuidList) {
+ MogoApisHandler.getInstance().getApis()
+ .getMapServiceApi()
+ .getMarkerManager(mContext)
+ .removeMarker(uuid);
}
+ trafficDataUuidList.clear();
}
private void addPreVehicleModel() {