From 8d575634d87723612967b3c09b76ad29f0cbb61c Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 22 Jul 2024 20:04:16 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0][=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6]?= =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=E9=81=93=E8=B7=AF=E6=96=BD=E5=B7=A5?= =?UTF-8?q?=E7=9A=84=E4=BA=8B=E4=BB=B6=E7=9A=84=E9=93=BE=E8=B7=AF=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index 2c4df8d13e..cb0d5b044c 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -436,28 +436,20 @@ internal object V2NIdentifyDrawer: IEventDismissListener { override fun onAutopilotIdentifyDataUpdate(trafficData: List?) { super.onAutopilotIdentifyDataUpdate(trafficData) //source: 1 -> 感知数据; 2 -> 融合数据 - var hit = false val shiGong = trafficData?.filter { itx -> (itx.type == 501 || itx.type == 502) && itx.trackedSourceList.find { it.source != 1 } != null } if (!shiGong.isNullOrEmpty()) { - hit = true drawShiGong(shiGong) } val shiGu = trafficData?.filter { itx -> itx.type == 13 && itx.trackedSourceList.find { it.source != 1 } != null } if (!shiGu.isNullOrEmpty()) { - hit = true drawShiGu(shiGu) } - - if (!hit && trafficData?.find { it.type == 501 || it.type == 502 || it.type == 13 } != null) { - V2XBizTrace.onAck(trafficData, "感知类型-V2N", false) - } } - override fun onAutopilotV2nCongestionEvent(header: Header, rsi: RSI_PB) { super.onAutopilotV2nCongestionEvent(header, rsi) - V2XBizTrace.onAck("onAutopilotV2nCongestionEvent", rsi) +// V2XBizTrace.onAck("onAutopilotV2nCongestionEvent", rsi) rsi.rsiFrame?.rtes?.rteDataList?.filter { it.eventType == 102 }?.takeIf { @@ -469,7 +461,7 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } private fun drawShiGong(events: List) { - V2XBizTrace.onAck(events,"onV2NShiGong", false) +// V2XBizTrace.onAck(events,"onV2NShiGong", false) if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) { handler.removeMessages(MSG_WHAT_DRAW_SHIGONE) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGONE, events)) @@ -477,7 +469,7 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } private fun drawShiGu(events: List) { - V2XBizTrace.onAck(events,"onV2NShiGu", false) +// V2XBizTrace.onAck(events,"onV2NShiGu", false) if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) { handler.removeMessages(MSG_WHAT_DRAW_SHIGU) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGU, events)) @@ -485,7 +477,7 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } private fun drawYongDu(events: List) { - V2XBizTrace.onAck(events,"onV2NYongDu", false) +// V2XBizTrace.onAck(events,"onV2NYongDu", false) if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) { handler.removeMessages(MSG_WHAT_DRAW_YONGDU) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_YONGDU, events))