From f66deef5948d0fb063c4ac93664bd27fc4d38b19 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:21:49 +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

---
 .../module/common/entity/MarkerCardResult.java  | 17 +++++++----------
 .../v2x/listener/V2XMessageListener_401012.java |  7 +++----
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java
index 3896ae58c4..61e425aaba 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java
@@ -16,6 +16,7 @@ public class MarkerCardResult extends BaseData {
 
     private List<MarkerOnlineCar> onlineCar;
     private List<MarkerExploreWay> exploreWay;
+    private long messageTime;
 
     public List<MarkerCarChat> getCarChat() {
         return carChat;
@@ -65,15 +66,11 @@ public class MarkerCardResult extends BaseData {
         this.dataType = dataType;
     }
 
-    @Override
-    public String toString() {
-        return "MarkerCardResult{" +
-                "dataType=" + dataType +
-                ", carChat=" + carChat +
-                ", exploreWay=" + exploreWay +
-                ", onlineCar=" + onlineCar +
-                ", shareMusic=" + shareMusic +
-                ", noveltyInfo=" + noveltyInfo +
-                '}';
+    public long getMessageTime() {
+        return messageTime;
+    }
+
+    public void setMessageTime(long messageTime) {
+        this.messageTime = messageTime;
     }
 }
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 9d5d6d6e40..34ada8b9c1 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,15 +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())
                     );
-                } else {
-                    calculateDistance = markerExploreWay.getDirection();
+                    markerExploreWay.setDistance(calculateDistance);
                 }
-                v2XRoadEventEntity.setDistance(calculateDistance);
+                v2XRoadEventEntity.setDistance(markerExploreWay.getDirection());
                 v2XRoadEventEntity.setNoveltyInfo(markerExploreWay);
                 v2XRoadEventEntity.setExpireTime(20000);