diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt index 4db46c81eb..9a5b5f9b23 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt @@ -67,15 +67,19 @@ object AiRoadMarker { private val onClearAllMarker = object : OnClearAllMarker { override fun onClearAllMarkers() { + Logger.d(TAG, "--- onClearAllMarkers ----") val marker = this@AiRoadMarker.marker.get() if (marker != null) { + Logger.d(TAG, "--- onClearAllMarkers ----2") unMarker(marker) } } override fun onClearAllMarkers(tag: String) { + Logger.d(TAG, "--- onClearAllMarkers ----: tag: $tag") val marker = this@AiRoadMarker.marker.get() if (marker != null) { + Logger.d(TAG, "--- onClearAllMarkers ----: tag: -- 1: $tag") unMarker(marker) } } @@ -327,20 +331,6 @@ object AiRoadMarker { handler.removeCallbacks(checkExpiredTask) } - private fun hideLine() { - val old = line.get() - if (old != null && !old.isDestroyed) { - old.isVisible = false - } - } - - private fun showLine() { - val old = line.get() - if (old != null && !old.isDestroyed) { - old.isVisible = true - } - } - private fun isOutOfRange(markerLon: Double, markerLat: Double, carLon: Double, carLat: Double, carAngle: Double): Boolean { return !isFrontOfCar(markerLon, markerLat, carLon, carLat, carAngle) } @@ -352,13 +342,18 @@ object AiRoadMarker { fun receive(marker: Marker) { val cur = this.marker.get() + Logger.d(TAG, "receive --- 1 ---") if (cur == marker) { + Logger.d(TAG, "receive --- 2 ---") val poi = this.marker.get() val car = this.carLocation.get() if (poi != null && car != null) { val distance = DrivingDirectionUtils.distance(car.first, car.second, marker.poi_lon, marker.poi_lat) + Logger.d(TAG, "receive --- 3 ---:car:[${car.first}, ${car.second}] -> poi:[${marker.poi_lon}, ${marker.poi_lat}] --> distance:$distance") if (distance < 300) { checkExpired() + } else { + handler.removeCallbacks(checkExpiredTask) } } }