From fea9f20480f5753036b028468d20e06ae4440c06 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 3 Aug 2022 20:28:35 +0800
Subject: [PATCH] =?UTF-8?q?[290=20bus/taxi]taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=80=E5=8D=95=E5=90=8E=E5=89=A9=E4=BD=99?=
 =?UTF-8?q?=E9=87=8C=E7=A8=8B=E5=92=8C=E6=97=B6=E9=97=B4=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java  | 8 +++++---
 .../mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java  | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index a06c4210e4..b5c057b931 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -1208,8 +1208,10 @@ public class TaxiModel {
 
         @Override
         public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) {
-            CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotRotting = "
-                    + GsonUtil.jsonFromObject(routeList));
+            if (null != routeList && routeList.getWayPointsList() != null){
+                CallerLogger.INSTANCE.d(M_TAXI + TAG, "getWayPointsList = "
+                        + routeList.getWayPointsList().size());
+            }
             if (null != routeList && routeList.getWayPointsList().size() > 0) {
                 updateOrderRoute(routeList.getWayPointsList());
                 updateOrderRouteInfo(routeList.getWayPointsList());
@@ -1327,7 +1329,7 @@ public class TaxiModel {
                     new TaxiServiceCallback<QueryOrderRouteResp>() {
                         @Override
                         public void onSuccess(QueryOrderRouteResp data) {
-                            if (data != null && data.data != null) {
+                            if (data != null && data.data != null && mRoutePoints.size() == 0) {
                                 mRoutePoints.clear();
                                 mRoutePoints.addAll(data.data);
                             }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
index a5e09fe2dd..c1a2ec1ff7 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
@@ -167,6 +167,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
         if (order.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.getCode()) {
             mCurrentOrder = null;
             isHaveBeingOrder(false);
+            mDistanceAndTime2.setText("距离 - - 公里，用时 - - 分");
+            mDistanceAndTime3.setText("距离 - - 公里，用时 - - 分");
             return;
         }
         mOrderNo = order.orderNo;
@@ -407,6 +409,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
             if (status == TaxiOrderStatusEnum.None.getCode() || status == TaxiOrderStatusEnum.Cancel.getCode() || status == TaxiOrderStatusEnum.JourneyCompleted.getCode()) {
                 isHaveBeingOrder(false);
                 mCurrentOrder = null;
+                mDistanceAndTime2.setText("距离 - - 公里，用时 - - 分");
+                mDistanceAndTime3.setText("距离 - - 公里，用时 - - 分");
             } else {
                 isHaveBeingOrder(true);
             }