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 dd6cbfec91..a27df2e79c 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 @@ -624,6 +624,31 @@ class DebugSettingView @JvmOverloads constructor( } } + // 初始化 tracker感知数据源 数据 + trackerProvider.check( + when (FunctionBuildConfig.debugTrackerProvider) { + 0 -> { + R.id.trackerProviderOrigin + } + 1 -> { + R.id.trackerProviderObu + } + else -> R.id.trackerProviderOrigin + } + ) + trackerProvider.setOnCheckedChangeListener { _, checkedId -> + when (checkedId) { + R.id.trackerProviderOrigin -> { + FunctionBuildConfig.debugTrackerProvider = 0 + // update tracker provider view + } + R.id.trackerProviderObu -> { + FunctionBuildConfig.debugTrackerProvider = 1 + // update tracker provider view + } + } + } + // 初始化 ADAS感知数据是否绘制 选择情况 tbIsDrawIdentifyData.isChecked = FunctionBuildConfig.isDrawIdentifyData 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 f97bb8ffbe..4503817dc0 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 @@ -1729,6 +1729,35 @@ + + + + + + + + diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapIdentifySubscriber.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapIdentifySubscriber.kt index 7295fed265..ef9648297a 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapIdentifySubscriber.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapIdentifySubscriber.kt @@ -42,7 +42,7 @@ class MapIdentifySubscriber private constructor() : IMoGoSubscriber, override fun onAutopilotIdentifyDataUpdate(trafficData: List?) { try { - if (FunctionBuildConfig.isDrawIdentifyData) { + if (FunctionBuildConfig.isDrawIdentifyData && FunctionBuildConfig.debugTrackerProvider == 0) { ThreadUtils.getSinglePool().execute { IdentifyFactory.renderAdasRecognizedResult(trafficData) } @@ -56,10 +56,10 @@ class MapIdentifySubscriber private constructor() : IMoGoSubscriber, override fun onAutopilotIdentifyPlanningObj(planningObjects: List?) { try { - if (FunctionBuildConfig.isDrawIdentifyData) { - ThreadUtils.getSinglePool() - .execute { - IdentifyFactory.renderPlanningWarningObj(planningObjects) } + if (FunctionBuildConfig.isDrawIdentifyData && FunctionBuildConfig.debugTrackerProvider == 0) { + ThreadUtils.getSinglePool().execute { + IdentifyFactory.renderPlanningWarningObj(planningObjects) + } } else { IdentifyFactory.clearOldMarker() } 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 5259e770d9..1eb6414dc1 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 @@ -72,6 +72,20 @@ object FunctionBuildConfig { @JvmField var gpsProvider = 0 + /** + * 调试模式下，感知物识别使用的数据来源 0 = 工控机 1 = OBU + */ + @Volatile + @JvmField + var debugTrackerProvider = 0 + + /** + * 感知物识别使用的数据来源 0 = 默认输出 1 = 只显示工控硬件数据感知来源 2 = 只显示V2V数据来源 3 = 只显示V2N数据来源 + */ + @Volatile + @JvmField + var trackerProvider = 0 + /** * 地图是否绘制Adas识别回调的Marker * true - 绘制 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt index 152e8dec3b..fa71559d3d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/TrafficMarkerDrawer.kt @@ -6,6 +6,7 @@ import android.os.Handler import android.os.Message import android.text.TextUtils import com.mogo.commons.AbsMogoApplication +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.enums.TrafficTypeEnum import com.mogo.eagle.core.data.traffic.TrafficData import com.mogo.eagle.core.data.traffic.threatLevelColor @@ -46,8 +47,9 @@ object TrafficMarkerDrawer { object : Handler(WorkThreadHandler.newInstance("other_traffic_drawer").looper) { override fun handleMessage(msg: Message) { super.handleMessage(msg) - // TODO 因为与自动驾驶的感知重合，临时关掉OBU车辆绘制 - // drawerTrafficInfo() + if (FunctionBuildConfig.debugTrackerProvider == 1) { + drawerTrafficInfo() + } // 延时50毫秒重复发送自己，定时轮询进行车辆绘制，可以及时将已经不存在车辆删除 sendEmptyMessageDelayed(0, 50L) } @@ -71,6 +73,9 @@ object TrafficMarkerDrawer { * 更新识别数据位置 */ fun updateITrafficLocationInfo(trafficData: TrafficData) { + if (FunctionBuildConfig.debugTrackerProvider != 1) { + return + } val tempTraffic = mTrafficMap[trafficData.uuid] if (tempTraffic != null) { tempTraffic.lat = trafficData.lat @@ -90,6 +95,9 @@ object TrafficMarkerDrawer { * 更新识别数据颜色 */ fun updateITrafficThreatLevelInfo(trafficData: TrafficData) { + if (FunctionBuildConfig.debugTrackerProvider != 1) { + return + } if (trafficData != null && !TextUtils.isEmpty(trafficData.uuid)) { val tempTraffic = mTrafficMap[trafficData.uuid] if (tempTraffic != null) {