From 53ea25fb65b2256f7fcc879fe7fbd9696dc92964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 5 Aug 2020 11:05:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E4=BC=98=E5=8C=96=E3=80=8D=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/alarm/V2XAlarmServer.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java index 2fdd7b412f..4067c6c0a4 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java @@ -29,8 +29,8 @@ import com.mogo.module.v2x.utils.TimeUtils; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.utils.ArrayUtils; import com.mogo.utils.logger.Logger; -import com.mogo.utils.storage.SharedPrefsMgr; import com.mogo.utils.network.utils.GsonUtil; +import com.mogo.utils.storage.SharedPrefsMgr; import java.util.ArrayList; import java.util.HashMap; @@ -41,7 +41,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; /** - * author : donghongyu + * @author donghongyu * e-mail : 1358506549@qq.com * date : 2020/4/13 11:02 AM * desc : @@ -96,7 +96,6 @@ public class V2XAlarmServer { eventLocation.getLat(), (int) currentLocation.getBearing() ); - // Logger.w(MODULE_NAME, "V2X预警--事件位置===" + eventLocation); if (0 <= eventAngle && eventAngle <= 20) { // 判断是否已经提示过道路事件 boolean isAlreadyAlert = false; @@ -112,12 +111,12 @@ public class V2XAlarmServer { isAlreadyAlert = true; } } -// Logger.w(MODULE_NAME, "V2X预警--车辆与事件信息：" + -// "\n距离：" + v2XRoadEventEntity.getDistance() + "米" + -// "\n是否已经提醒：" + isAlreadyAlert + -// "\n事件ID：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + -// "\n事件详情：" + GsonUtil.jsonFromObject(v2XRoadEventEntity.getNoveltyInfo()) -// ); + Logger.w(MODULE_NAME, "V2X预警--车辆与事件信息：" + + "\n距离：" + v2XRoadEventEntity.getDistance() + "米" + + "\n是否已经提醒：" + isAlreadyAlert + + "\n事件ID：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + + "\n事件详情：" + GsonUtil.jsonFromObject(v2XRoadEventEntity.getNoveltyInfo()) + ); // 进行提醒 if (!isAlreadyAlert) { mAlertRoadEventList.put(v2XRoadEventEntity, TimeUtils.getNowString()); @@ -125,22 +124,23 @@ public class V2XAlarmServer { } return null; } else { -// Logger.w(MODULE_NAME, "V2X预警--车辆与事件信息：" + -// "\n角度：" + eventAngle + " 度" + -// "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() -// ); + Logger.w(MODULE_NAME, "V2X预警--事件与车头角度夹角过大：" + + "\n角度：" + eventAngle + " 度" + + "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + ); } } else { -// Logger.w(MODULE_NAME, "V2X预警--车辆与事件信息：" + -// "\n距离：" + v2XRoadEventEntity.getDistance() + "米" + -// "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() -// ); + Logger.w(MODULE_NAME, "V2X预警--车辆距离事件距离大于500米了：" + + "\n距离：" + v2XRoadEventEntity.getDistance() + "米" + + "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() + ); } } else { -// Logger.w(MODULE_NAME, -// "车头方向： " + currentLocation.getAngle() + -// "\n事件方向：" + v2XRoadEventEntity.getLocation().getAngle() -// ); + Logger.w(MODULE_NAME, + "V2X预警--车头方向与事件方向角度不一致：" + + "\n车头方向： " + currentLocation.getBearing() + + "\n事件方向：" + v2XRoadEventEntity.getLocation().getAngle() + ); } } }