From e50a3cc973fb09d3a75398ed3b01dae3970a3b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 6 Aug 2020 17:10:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BD=8D=E7=BD=AE=E6=B2=A1=E6=9C=89=E6=8B=BF?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E6=97=B6=E5=80=99=E8=B7=9D=E7=A6=BB=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/listener/V2XMessageListener_401012.java     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
index 38b9fab0a3..9d5d6d6e40 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
@@ -52,10 +52,15 @@ public class V2XMessageListener_401012 implements IMogoOnMessageListener<MarkerC
                 v2XRoadEventEntity.setPoiType(markerExploreWay.getPoiType());
                 // 当前车辆数据
                 MogoLocation currentLocation = V2XServiceManager.getV2XStatusManager().getLocation();
-                float calculateDistance = Utils.calculateLineDistance(
-                        new MogoLatLng(markerLocation.getLat(), markerLocation.getLon()),
-                        new MogoLatLng(currentLocation.getLatitude(), currentLocation.getLongitude())
-                );
+                float calculateDistance;
+                if (currentLocation.getLatitude() == 0 || currentLocation.getLongitude() == 0) {
+                    calculateDistance = Utils.calculateLineDistance(
+                            new MogoLatLng(markerLocation.getLat(), markerLocation.getLon()),
+                            new MogoLatLng(currentLocation.getLatitude(), currentLocation.getLongitude())
+                    );
+                } else {
+                    calculateDistance = markerExploreWay.getDirection();
+                }
                 v2XRoadEventEntity.setDistance(calculateDistance);
                 v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
                 v2XRoadEventEntity.setExpireTime(20000);