From bb4632fc25142bcdef0d4d596379bde329c46b06 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 23 Apr 2021 17:03:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/manager/impl/MoGoV2XCloundDataManager.java       | 9 +++++----
 .../module/v2x/manager/impl/MoGoWarnPolylineManager.java | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
index 48fba32e7b..f80e8b53a8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java
@@ -33,6 +33,7 @@ import java.util.List;
 
 import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA;
 import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA;
+import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_TOP;
 import static com.mogo.module.v2x.V2XServiceManager.getContext;
 
 /**
@@ -86,7 +87,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
             isSelfLineClear = false;
             isFirstLocation = false;
             V2XServiceManager.getMarkerManager().removeMarkers(WARNING_ARROWS);
-            if (cloundWarningInfo.getDirection() == 1) { //前方 TODO
+            if (cloundWarningInfo.getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP) { //前方 TODO
                 middleLocationInStopLine = getMiddleLocationInStopLine();
                 MogoLatLng warningLocation = Trigonometric.getNewLocation(middleLocationInStopLine, 50, cloundWarningInfo.getAngle());
                 //停止线前方画线
@@ -275,7 +276,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
     }
 
     /**
-     * 自车为起点绘制(根据设计,前方行人/弱势交通参与者预警 getDirection() == 1 自车与停止线之间为蓝色预警;其他侧方预警自车与预碰撞点之间显示红色预警)
+     * 自车为起点绘制(根据设计,前方行人/弱势交通参与者预警 getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP自车与停止线之间为蓝色预警;其他侧方预警自车与预碰撞点之间显示红色预警)
      */
     private void drawSlefCarLine(double lon, double lat, float bearing) {
         if (!isSelfLineClear) {
@@ -291,8 +292,8 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog
                 }
 
                 //自车位置
-                endLatlng = new MogoLatLng(mCloundWarningInfo.getDirection() == 1 ? middleLocationInStopLine.lat : mCloundWarningInfo.getCollisionLat(),
-                        mCloundWarningInfo.getDirection() == 1 ? middleLocationInStopLine.lon : mCloundWarningInfo.getCollisionLon());
+                endLatlng = new MogoLatLng(mCloundWarningInfo.getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP ? middleLocationInStopLine.lat : mCloundWarningInfo.getCollisionLat(),
+                        mCloundWarningInfo.getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP ? middleLocationInStopLine.lon : mCloundWarningInfo.getCollisionLon());
                 startLatlng = new MogoLatLng(lat, lon);
                 float distance = CoordinateUtils.calculateLineDistance(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat);
                 addMiddleLoc = Trigonometric.getNewLocation(startLatlng, distance / 2, Trigonometric.getAngle(startLatlng.lon, startLatlng.lat, endLatlng.lon, endLatlng.lat));
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java
index 19fb6736e2..2a4d46a497 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java
@@ -19,6 +19,8 @@ import com.mogo.realtime.entity.ADASRecognizedResult;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_TOP;
+
 /**
  * 当前车辆与道路事件的连接线
  */
@@ -42,7 +44,7 @@ public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager {
             MogoPolylineOptions options = new MogoPolylineOptions();
             List<Integer> colors = new ArrayList<>();
 
-            if (info.getDirection() == 1) {
+            if (info.getDirection() == ALERT_THE_FRONT_CRASH_WARNING_TOP) {
                 colors.add(0x0D3036FF);
                 colors.add(0xD93036FF);
                 colors.add(0x0D3036FF);