From 9417136b153b7047aac41a63e5b3c6826bed32cf Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Fri, 2 Apr 2021 11:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E7=82=B9=E6=B5=8B=E8=AF=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scene/warning/V2XWarningMarker.java       | 36 ++++++++++---------
 .../res/raw/scenario_warning_event_data.json  |  2 +-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
index cb6c5decb6..9b17a2bb16 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
@@ -29,6 +29,7 @@ import java.util.List;
  */
 public class V2XWarningMarker implements IV2XMarker {
     private V2XWarningEntity mMarkerEntity;
+    private MarkerShowEntity markerShowEntity = new MarkerShowEntity();
     private Context mContext = V2XServiceManager.getContext();
 
     @Override
@@ -39,30 +40,33 @@ public class V2XWarningMarker implements IV2XMarker {
             location.setLat(mMarkerEntity.getLat());
             location.setLon(mMarkerEntity.getLon());
 
-            MarkerShowEntity markerShowEntity = new MarkerShowEntity();
             markerShowEntity.setMarkerLocation(location);
             markerShowEntity.setMarkerType(V2XConst.V2X_FRONT_WARNING_MARKER);
-
-            if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
-                clearPOI();
-                WorkThreadHandler.getInstance().postDelayed(() -> {
-                    IMogoMarker marker = drawMarkerAndReturn(markerShowEntity);
-                    //如果有预警碰撞点,识别物与预警碰撞点之间连线,并执行平移动画
-                    if (mMarkerEntity.getCollisionLat() > 0 && mMarkerEntity.getCollisionLon() != 0) {
-                        drawLine();
-                        smooth(marker);
-                    }
-                }, 0);
-
-            } else {
-
-            }
+//            drawLineAndSmooth();
+            pointsBetween();
         } catch (Exception e) {
 
         }
 
     }
 
+    private void drawLineAndSmooth(){
+        if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+            clearPOI();
+            WorkThreadHandler.getInstance().postDelayed(() -> {
+                IMogoMarker marker = drawMarkerAndReturn(markerShowEntity);
+                //如果有预警碰撞点,识别物与预警碰撞点之间连线,并执行平移动画
+                if (mMarkerEntity.getCollisionLat() > 0 && mMarkerEntity.getCollisionLon() != 0) {
+                    drawLine();
+                    smooth(marker);
+                }
+            }, 0);
+
+        } else {
+
+        }
+    }
+
     public void pointsBetween() {
         try {
             List stopLines = mMarkerEntity.getStopLines();
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json
index 06b468f7d1..d7728ad888 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json
@@ -2,7 +2,7 @@
   "type": 2,
   "lat": 39.977148,
   "lon": 116.417478,
-  "distance": 2.22,
+  "distance": 2,
   "collisionLat": 39.977094,
   "collisionLon": 116.417634,
   "stopLines":[