From c77ce390870e58c0a95bac1a85f988de9f21f55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 2 Nov 2020 20:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8F=90=E7=A4=BAUGC?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=8A=E6=97=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/v2x/V2XStatusManager.java  |  2 +-
 .../module/v2x/alarm/V2XEarlyWarningServer.java     | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java
index 1dfdf64b5a..eca9f0f957 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XStatusManager.java
@@ -54,7 +54,7 @@ public class V2XStatusManager {
         if (mLocation == null) {
             mLocation = new MogoLocation();
         }
-        Logger.d(V2XConst.MODULE_NAME, "当前车辆位置：" + mLocation.toString());
+        //Logger.d(V2XConst.MODULE_NAME, "当前车辆位置：" + mLocation.toString());
         return mLocation;
     }
 
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 04db9ff7f6..b6f4962f44 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
@@ -19,6 +19,8 @@ import com.mogo.service.share.IMogoTanluProvider;
 import com.mogo.service.share.TanluUploadParams;
 import com.mogo.utils.logger.Logger;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -29,6 +31,8 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 public class V2XEarlyWarningServer {
     private static final String TAG = "V2XEarlyWarningServer";
 
+    private static List<String> alertMessageId = new ArrayList<>();
+
     /**
      * 对提醒过的道路事件进行UGC检测
      *
@@ -52,15 +56,18 @@ public class V2XEarlyWarningServer {
                     );
 
                     // 判断车辆行驶角度是否与事件相反，相反的话表示已经行驶过去了
-                    if (155 <= eventAngle) {
+                    if (90 <= eventAngle && !alertMessageId.contains(v2XRoadEventEntity.getNoveltyInfo().getInfoId())) {
                         if (EventTypeUtils.isNeedRoadEventUgc(v2XRoadEventEntity.getPoiType())) {
 
-                            Logger.w(MODULE_NAME + "_" + TAG, "V2X预警--事件与车头角度夹角过大：" +
+                            Logger.w(MODULE_NAME + "_" + TAG, "V2X预警UGC--事件与车头角度夹角过大：" +
                                     "\n角度：" + eventAngle + " 度" +
                                     "\n事件详情：" + v2XRoadEventEntity.getNoveltyInfo().getInfoId() +
                                     "\n库存事件：" + V2XAlarmServer.mAlertRoadEventList.size()
                             );
 
+                            // 记录已经 UGC 提醒过的数据
+                            alertMessageId.add(v2XRoadEventEntity.getNoveltyInfo().getInfoId());
+
 
                             // 弹出UGC
                             V2XMessageEntity<V2XRoadEventEntity> v2XMessageEntity =
@@ -92,7 +99,7 @@ public class V2XEarlyWarningServer {
 
                         }
                         // 移出已经预警的事件列表
-                        V2XAlarmServer.mAlertRoadEventList.remove(v2XRoadEventEntity);
+                        //V2XAlarmServer.mAlertRoadEventList.remove(v2XRoadEventEntity);
                     }
                 }
             }