From 9fdf2b51dc0551738f14c4ae790069b3efe914e1 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 30 Jun 2023 16:06:58 +0800 Subject: [PATCH] [3.3.0] add log --- .../com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt | 5 +---- .../eagle/function/biz/v2x/v2n/V2XEventManager.kt | 2 +- .../function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 1 + .../v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt | 13 ------------- .../scenario/scene/road/V2XRoadEventScenario.java | 3 ++- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt index 2e65d11008..0317364f70 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt @@ -1,6 +1,5 @@ package com.mogo.eagle.function.biz.v2x -import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X @@ -17,9 +16,7 @@ class V2XBizTrace { paramIndexes = [0, 1] ) fun onAck(data: Any, data1: Any) { - if (DebugConfig.isDebug()) { - CallerLogger.d("$M_V2X${data.toString()}", data1) - } + CallerLogger.d("$M_V2X${data.toString()}", data1) } } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt index e91545a014..40e98389fc 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt @@ -207,7 +207,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, return } } - CallerLogger.d("$M_V2X$TAG", "poiType : $poiType , 触发道路事件") + V2XBizTrace.onAck("$M_V2X$TAG","poiType : $poiType , 触发道路事件") CallerHmiManager.warningV2X( poiType, tts, 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 592a529b26..1bfea7b0eb 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 @@ -76,6 +76,7 @@ internal object V2NIdentifyDrawer { val distance = CoordinateUtils.calculateLineDistance(itx.longitude, itx.latitude, car.longitude, car.latitude) val alertContent = getAlertContent(poiType, distance.toDouble()) val ttsContent = getTtsContent(poiType, distance.toDouble()) + V2XBizTrace.onAck("V2NIdentifyDrawer","绘制poi事件:$poiType") saveMsgBox(MsgBoxBean(V2X, V2XMsg(poiType, alertContent, ttsContent))) CallerHmiManager.warningV2X(poiType, alertContent, ttsContent, object : IMoGoWarningStatusListener { override fun onShow() { diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt index 6a7bbadd8c..861dd2d1f1 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt @@ -5,7 +5,6 @@ import android.graphics.Color import android.os.Handler import android.os.HandlerThread import android.os.Looper -import android.util.Log import android.view.animation.DecelerateInterpolator import androidx.core.util.Pair import com.mogo.eagle.core.data.map.MogoLatLng @@ -83,7 +82,6 @@ class AiRoadMarker { marker.entity?.apply { roadMarker.drawMarkers(this, wrapper) } } if (drawRoadLine) { - Log.d(TAG, "--- marker --- 1 ---") //施工中心点前方的自车行驶方向上300米距离 val l1 = MogoMap.getInstance().mogoMap.getCenterLineRangeInfo( marker.poi_lon, @@ -92,7 +90,6 @@ class AiRoadMarker { 300f ) //施工中心点后方的自车行驶方向上300米距离 - Log.d(TAG, "--- marker --- 3 --- l1:$l1") V2XBizTrace.onAck("$TAG --- marker --- 3 --- l1:", l1) val l2 = MogoMap.getInstance().mogoMap.getCenterLineRangeInfo( marker.poi_lon, @@ -101,11 +98,9 @@ class AiRoadMarker { -300f ) if (l1.points.isEmpty() || l2.points.isEmpty()) { - Log.d(TAG, " --- marker --- 3 --- return ----") V2XBizTrace.onAck("$TAG --- marker --- 3 --- return ----", "") return@post } - Log.d(TAG, " --- marker --- 4 --- l2: $l2") V2XBizTrace.onAck("$TAG --- marker --- 4 --- l2:", l2) val points = LinkedList() if (l2 != null && l2.points.isNotEmpty()) { @@ -115,7 +110,6 @@ class AiRoadMarker { } val centerX = marker.poi_lon val centerY = marker.poi_lat - Log.d(TAG, "--- marker --- 5 --- marker: $marker") V2XBizTrace.onAck("$TAG --- marker --- 5 --- marker:", marker) val farthestPoint = marker.polygon?.let { var find: Pair = Pair(centerX, centerY) @@ -136,7 +130,6 @@ class AiRoadMarker { MogoLatLng(find.second, find.first) } ?: MogoLatLng(centerY, centerX) marker.farthestPoint = Pair(farthestPoint.lon, farthestPoint.lat) - Log.d(TAG, "--- marker --- 6 --- marker:$marker") V2XBizTrace.onAck("$TAG --- marker --- 6 --- marker:", marker) if (l1 != null && l1.points.isNotEmpty()) { for (l in l1.points) { @@ -169,7 +162,6 @@ class AiRoadMarker { builder.points(points) builder.colors(colors) builder.setVisible(true) - Log.d(TAG, "--- marker --- 7 --- points:${points.size}") V2XBizTrace.onAck("$TAG --- marker --- 7 --- points:", "${points.size}") val line = overlayManager?.showOrUpdateLine(builder.build()) if (line != null) { @@ -186,10 +178,8 @@ class AiRoadMarker { private fun removeLine() { val old = line.get() - Log.d(TAG, " --- removeRedLine --- 1") V2XBizTrace.onAck("$TAG --- removeRedLine --- 1", "") if (old != null) { - Log.d(TAG,"--- removeRedLine --- 2") V2XBizTrace.onAck("$TAG --- removeRedLine --- 2", "") line.set(null) old.delegate?.remove() @@ -198,7 +188,6 @@ class AiRoadMarker { private fun unMarker(marker: Marker) { v2nDrawHandler.post { - Log.d(TAG,"$TAG --- unMarker ---") V2XBizTrace.onAck("$TAG --- unMarker ---", "") this.marker.set(null) removeLine() @@ -209,13 +198,11 @@ class AiRoadMarker { } fun receive() { - Log.d(TAG, " --- receive --- 1 ---") V2XBizTrace.onAck("$TAG --- receive --- 1 ---", "") val poi = this.marker.get() val car = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84() if (poi != null) { val distance = CoordinateUtils.calculateLineDistance(car.longitude, car.latitude, poi.poi_lon, poi.poi_lat) - Log.d(TAG ," --- receive --- 2 ---car:[${car.longitude}, ${car.latitude}] -> poi:[${poi.poi_lon}, ${poi.poi_lat}] --> distance:$distance") V2XBizTrace.onAck( "$TAG --- receive --- 2 ---", "car:[${car.longitude}, ${car.latitude}] -> poi:[${poi.poi_lon}, ${poi.poi_lat}] --> distance:$distance" diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java index be0d509a70..0af5af6b95 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java @@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager; import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager; +import com.mogo.eagle.function.biz.v2x.V2XBizTrace; import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.AbsV2XScenario; import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker; import com.mogo.eagle.core.network.utils.GsonUtil; @@ -44,7 +45,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp @Override public void init(V2XMessageEntity v2XMessageEntity) { try { - Logger.d(TAG, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity)); + V2XBizTrace.Companion.onAck("v2XMessageEntity",GsonUtil.jsonFromObject(v2XMessageEntity)); V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent(); if (v2XRoadEventEntity != null) { if (!isSameScenario(v2XMessageEntity)) {