From 6506548086f61594960acc71f17be6f4b221fef4 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:32:14 +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

---
 .../src/main/java/com/mogo/module/v2x/V2XStatusManager.java   | 2 ++
 .../mogo/module/v2x/listener/V2XMessageListener_401012.java   | 4 ++--
 2 files changed, 4 insertions(+), 2 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 12396a786e..1dfdf64b5a 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
@@ -3,6 +3,7 @@ package com.mogo.module.v2x;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.utils.logger.Logger;
 
 /**
  * author : donghongyu
@@ -53,6 +54,7 @@ public class V2XStatusManager {
         if (mLocation == null) {
             mLocation = new MogoLocation();
         }
+        Logger.d(V2XConst.MODULE_NAME, "当前车辆位置：" + mLocation.toString());
         return mLocation;
     }
 
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 34ada8b9c1..3716e804b7 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
@@ -53,14 +53,14 @@ public class V2XMessageListener_401012 implements IMogoOnMessageListener<MarkerC
                 // 当前车辆数据
                 MogoLocation currentLocation = V2XServiceManager.getV2XStatusManager().getLocation();
                 float calculateDistance;
-                if (currentLocation.getLatitude() != 0 && currentLocation.getLongitude() != 0) {
+                if (currentLocation.getLatitude() > 0 || currentLocation.getLongitude() > 0) {
                     calculateDistance = Utils.calculateLineDistance(
                             new MogoLatLng(markerLocation.getLat(), markerLocation.getLon()),
                             new MogoLatLng(currentLocation.getLatitude(), currentLocation.getLongitude())
                     );
                     markerExploreWay.setDistance(calculateDistance);
                 }
-                v2XRoadEventEntity.setDistance(markerExploreWay.getDirection());
+                v2XRoadEventEntity.setDistance(markerExploreWay.getDistance());
                 v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
                 v2XRoadEventEntity.setExpireTime(20000);