From c87f8e2dca5e381d82e72ac60709bf0ea672d88b Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 4 Sep 2024 17:25:55 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0][=E5=BC=95=E5=AF=BC=E7=BA=BF]=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E8=BD=A6=E5=BC=95=E5=AF=BC=E7=BA=BF?= =?UTF-8?q?=E9=BB=91=E8=BE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 46 ------------------- .../v2n/scenario/scene/airoad/AiRoadMarker.kt | 2 +- .../scene/road/V2XAiRoadEventMarker.kt | 4 +- .../routeoverlay/RouteOverlayDrawer.java | 4 +- 4 files changed, 5 insertions(+), 51 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 5cd21c1e00..a9a0282d94 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 @@ -140,52 +140,6 @@ internal object V2NIdentifyDrawer: IEventDismissListener { car.longitude, car.latitude ) -// if (polygon.isNotEmpty()) { -// val decision = V2NUtils.computeOccupyLanesInfo(Triple(car.longitude, car.latitude, car.heading.toFloat()), Triple(itx.longitude, itx.latitude, itx.heading.toFloat()), polygon.map { kotlin.Pair(it.first, it.second) }) -// if (decision != null) { -// val isDriver = AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) -// val total = decision.total -// val occupy = decision.occupy -// val laneId = decision.laneId -// val sb = StringBuilder() -// V2XBizTrace.onAck(decision, "计算出道路事件占道决策数据1") -// if (laneId != null) { -// val isOccupy = occupy.find { it.id == laneId } != null -// if (isOccupy) { -// if (isDriver) { -// val bestLane = V2NUtils.computeBestLane(laneId, occupy, total) -// V2XBizTrace.onAck(bestLane, "计算出最优车道") -// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇建议您尽快${bestLane.second}") -// } else { -// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇时刻为您守护") -// } -// } else { -// if (isDriver) { -// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇提醒您小心${ if (computeDirection(laneId, occupy) > 0) "右侧" else "左侧" }行人及来车") -// } else { -// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇时刻为您守护") -// } -// } -// } else { -// sb.append("发现前方${distance.toInt()}米${ if (poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGONG.poiType) "车道施工" else "车道事故" }@@, 蘑菇时刻为您守护") -// } -// if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { -// runCatching { -// CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.getEnumType(poiType)), START) -// } -// scope.launch { -// delay(5000) -// runCatching { -// CallerHmiManager.notifyXiaoZhiStatusChanged(V2N(EventTypeEnumNew.getEnumType(poiType)), STOP) -// } -// } -// } -// val ss = sb.toString() -// val content = ss.substring(0, ss.indexOf("@@")) -// val tts = ss.replace("@@", "") -// CallerRoadV2NEventWindowListenerManager.showLiveVideo(id, itx.detectStartTime.takeIf { it > 0 } ?: System.currentTimeMillis(), EventTypeEnumNew.getUpdateIconRes(poiType), content, isDriver, tts, itx.cameraIp, itx.longitude, itx.latitude) -// } -// } val isDriver = AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) if (!isDriver) { runCatching { 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 58430910aa..5e585e9729 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 @@ -46,7 +46,7 @@ class AiRoadMarker { val aiMakers = ConcurrentHashMap() private const val TAG = "AiRoadMarker" - private val COLOR_START = Color.parseColor("#002ABAD9") + private val COLOR_START = Color.parseColor("#0030A3FF") private val COLOR_END = Color.parseColor("#66FF7A30") private val builders by lazy { ConcurrentHashMap() } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt index 9263f5adce..5b7c1267b1 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt @@ -38,12 +38,12 @@ class V2XAiRoadEventMarker { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { val colors = ArrayList() colors.add(Color.argb(204, 237, 172, 21)) - colors.add(Color.argb(0, 255, 255, 255)) + colors.add(Color.argb(0, 48, 163, 255)) builder.colors(colors) } else { val colors = ArrayList() colors.add(Color.parseColor("#99FF8F2A")) - colors.add(Color.argb(0, 255, 255, 255)) + colors.add(Color.argb(0, 48, 163, 255)) builder.colors(colors) } val dispersedPoints = getDispersedPoints(polygon.map { Pair(it.first, it.second) }, 3) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java index bdbd113d63..29983c3fd9 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java @@ -73,7 +73,7 @@ public class RouteOverlayDrawer { List alphas = MapTools.INSTANCE.getColorAlpha(temps); if (alphas != null && !alphas.isEmpty()) { for (int i : alphas) { - greenWaveColors.add(Color.argb(i, 109,254,208)); + greenWaveColors.add(Color.argb(i, 48, 163, 255)); } } } @@ -151,7 +151,7 @@ public class RouteOverlayDrawer { if (alphas != null && !alphas.isEmpty()) { colors = new CopyOnWriteArrayList<>(); for (int i : alphas) { - colors.add(Color.argb(i, 48,203,251)); + colors.add(Color.argb(i, 48,163,255)); } } }