From 76cbf6c6a732af2e7f25732e7f8c4309d10ce466 Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 19 Jul 2024 17:36:15 +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=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 26 ------------------- 1 file changed, 26 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 e59be301e1..2c4df8d13e 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 @@ -81,11 +81,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener { V2XBizTrace.onAck(TAG, mapOf("shiGong-shiGu" to ""), true) return@Callback true } - if (msg.what == MSG_WHAT_DRAW_SHIGONE) { - Log.d("V2NIdentifyDrawer", "---callback -- drawShiGong --- 1 ---") - } else { - Log.d("V2NIdentifyDrawer", "---callback -- drawShiGu --- 1 ---") - } val car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() val filtered = events.filterIsInstance().filter { itx -> DrivingDirectionUtils.getDegreeOfCar2Poi( @@ -97,23 +92,12 @@ internal object V2NIdentifyDrawer: IEventDismissListener { ) < 90 && CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, itx.longitude, itx.latitude) <= 300 } if (filtered.isEmpty()) { - if (msg.what == MSG_WHAT_DRAW_SHIGONE) { - Log.d("V2NIdentifyDrawer", "---callback -- drawShiGong --- filter is empty return ---") - } else { - Log.d("V2NIdentifyDrawer", "---callback -- drawShiGu --- filter is empty return---") - } V2XBizTrace.onAck(TAG, mapOf("shiGong-shiGu-filter" to ""), true) return@Callback true } - if (msg.what == MSG_WHAT_DRAW_SHIGONE) { - Log.d("V2NIdentifyDrawer", "---callback -- drawShiGong --- 2 ---") - } else { - Log.d("V2NIdentifyDrawer", "---callback -- drawShiGu --- 2 ---") - } filtered.forEach { itx -> val id = itx.v2XUuid.ifEmpty { itx.uuid.toString() } V2XBizTrace.onAck(itx, "filtered -> ${itx.type}") - Log.d("V2NIdentifyDrawer", "---callback --- id: $id ---") AiRoadMarker.aiMakers.getOrPut(id) { AiRoadMarker().apply { scope.launch { @@ -214,12 +198,9 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } }.receive() } - } else if (msg.what == MSG_WHAT_DRAW_YONGDU) { - Log.d("V2NIdentifyDrawer", "---callback -- drawYongDu --- 1 ---") } else if (msg.what == MSG_WHAT_DRAW_OTHER_RETROGRADE_VEHICLE) { val event = msg.obj as? MessagePad.Event if (event == null) { - Logger.i(TAG, "other_retrograde_vehicle --> event == null") V2XBizTrace.onAck(TAG, mapOf("other_retrograde_vehicle" to "event == null"), true) return@Callback true } @@ -489,9 +470,7 @@ internal object V2NIdentifyDrawer: IEventDismissListener { private fun drawShiGong(events: List) { V2XBizTrace.onAck(events,"onV2NShiGong", false) - Log.d("V2NIdentifyDrawer", "---drawShiGong --- 1 ---:${events.size}, [${FunctionBuildConfig.v2nMainSwitch}, ${FunctionBuildConfig.isNewV2NData}]") if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) { - Log.d("V2NIdentifyDrawer", "---drawShiGong --- 2 ---") handler.removeMessages(MSG_WHAT_DRAW_SHIGONE) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGONE, events)) } @@ -499,7 +478,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener { private fun drawShiGu(events: List) { V2XBizTrace.onAck(events,"onV2NShiGu", false) - Log.d("V2NIdentifyDrawer", "---drawShiGu --- 1 ---:${events.size}, [${FunctionBuildConfig.v2nMainSwitch}, ${FunctionBuildConfig.isNewV2NData}]") if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) { handler.removeMessages(MSG_WHAT_DRAW_SHIGU) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGU, events)) @@ -508,7 +486,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener { private fun drawYongDu(events: List) { V2XBizTrace.onAck(events,"onV2NYongDu", false) - Log.d("V2NIdentifyDrawer", "---drawYongDu --- 1 ---:${events.size}, [${FunctionBuildConfig.v2nMainSwitch}, ${FunctionBuildConfig.isNewV2NData}]") if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) { handler.removeMessages(MSG_WHAT_DRAW_YONGDU) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_YONGDU, events)) @@ -516,7 +493,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } private fun drawOtherRetrogradeVehicle(event: MessagePad.Event) { - Logger.i("V2NIdentifyDrawer", "---drawOtherRetrogradeVehicle --- :${event.toString()}, [${FunctionBuildConfig.v2nMainSwitch}, ${FunctionBuildConfig.isNewV2NData}]") if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) { handler.removeMessages(MSG_WHAT_DRAW_OTHER_RETROGRADE_VEHICLE) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_OTHER_RETROGRADE_VEHICLE, event)) @@ -524,7 +500,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } private fun drawGreenWave(crossSpeed: V2nCrossSpeed) { - Log.d("V2NIdentifyDrawer", "---drawGreenWave---: $crossSpeed, [${FunctionBuildConfig.v2nMainSwitch}, ${FunctionBuildConfig.isNewV2NData}]") if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) { handler.removeMessages(MSG_WHAT_DRAW_GREEN_WAVE) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_GREEN_WAVE, crossSpeed)) @@ -532,7 +507,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } private fun drawPeopleCross(event: MessagePad.Event) { - Log.d("V2NIdentifyDrawer", "---drawPeopleCross---: $event, [${FunctionBuildConfig.v2nMainSwitch}, ${FunctionBuildConfig.isNewV2NData}]") if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nMainSwitch && FunctionBuildConfig.isNewV2NData) { handler.removeMessages(MSG_WHAT_DRAW_PEOPLE_CROSS) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_PEOPLE_CROSS, event))