From eb74ce01b197c2b0e516dc153496ba866fc67d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 25 Nov 2020 16:57:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4UGC=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/alarm/V2XEarlyWarningServer.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java index 94fa20a857..db5b7cabcf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java @@ -53,21 +53,20 @@ public class V2XEarlyWarningServer { double carBearing = currentLocation.getBearing(); String roadInfoId = v2XRoadEventEntity.getNoveltyInfo().getInfoId(); - Logger.w(MODULE_NAME, - "V2X预警--UGC检测：" + - "\n事件详情：" + roadInfoId + - "\n车头方向： " + carBearing + - "\n车与事件夹角：" + eventAngle + - "\n已经UGC的事件：" + GsonUtil.jsonFromObject(alertMessageId) - ); - - // 判断是否预警过了 - if (!alertMessageId.contains(roadInfoId)) { - // 判断车辆行驶角度是否与事件相反，相反的话表示已经行驶过去了 - if (80 <= eventAngle) { - // 封路、施工、拥堵、拥堵 才会有UGC提示 - if (EventTypeUtils.isNeedRoadEventUgc(v2XRoadEventEntity.getPoiType())) { - + // 封路、施工、拥堵、拥堵 才会有UGC提示 + if (EventTypeUtils.isNeedRoadEventUgc(v2XRoadEventEntity.getPoiType())) { + Logger.w(MODULE_NAME, + "V2X预警--UGC检测：" + + "\n事件详情：" + roadInfoId + + "\n事件详情：" + EventTypeUtils.getPoiTypeStr(v2XRoadEventEntity.getPoiType()) + + "\n车头方向： " + carBearing + + "\n车与事件夹角：" + eventAngle + + "\n已经UGC的事件：" + GsonUtil.jsonFromObject(alertMessageId) + ); + // 判断是否预警过了 + if (!alertMessageId.contains(roadInfoId)) { + // 判断车辆行驶角度是否与事件相反，相反的话表示已经行驶过去了 + if (80 <= eventAngle) { Logger.w(MODULE_NAME + "_" + TAG, "V2X预警UGC--事件与车头角度夹角过大：" + "\n角度：" + eventAngle + " 度" + "\n事件详情：" + roadInfoId +