From 6732ed9a0086fddf0936a7011d8ba815d6aae117 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 9 Nov 2022 16:46:14 +0800
Subject: [PATCH] =?UTF-8?q?[2.12.0]=201=E3=80=81taxi=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E8=A7=A3=E5=86=B3=E5=8F=96=E6=B6=88=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=96=B0=E8=AE=A2=E5=8D=95=E9=87=8C=E7=A8=8B?=
 =?UTF-8?q?=E5=92=8C=E6=97=B6=E9=97=B4=E9=97=AA=E4=B8=80=E4=B8=8B=E6=97=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/ui/TaxiBeingServerdOrdersFragment.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 83eecfc45d..e3ec7b298c 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
@@ -461,8 +461,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
             if (status == TaxiOrderStatusEnum.None.getCode() || status == TaxiOrderStatusEnum.Cancel.getCode() || status == TaxiOrderStatusEnum.JourneyCompleted.getCode()) {
                 isHaveBeingOrder(false);
                 mCurrentOrder = null;
-                mDistanceAndTime2.setText("距离 - - 公里，用时 - - 分");
-                mDistanceAndTime3.setText("距离 - - 公里，用时 - - 分");
+                clearOrderTag();
             } else {
                 isHaveBeingOrder(true);
             }
@@ -540,6 +539,12 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
         });
     }
 
+    private void clearOrderTag() {
+        saveOrderState = -1;
+        mDistanceAndTime2.setText("距离 - - 公里，用时 - - 分");
+        mDistanceAndTime3.setText("距离 - - 公里，用时 - - 分");
+    }
+
     /**
      * 是否有正在进行的订单，进行UI显示
      *
@@ -620,7 +625,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
 
     public void onCurrentOrderCancelDone() {
         //去除起终点
-        saveOrderState = -1;
         if (mCurrentOrder != null){
             setOrRemoveMapMaker(false, TaxiConst.TAXI_START_MAP_MAKER,mCurrentOrder.startSitePoint,R.raw.star_marker);
             setOrRemoveMapMaker(false, TaxiConst.TAXI_END_MAP_MAKER,mCurrentOrder.endSitePoint,R.raw.end_marker);
@@ -631,6 +635,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
         //更新界面
         isHaveBeingOrder(false);
         showOrHideNavi(false);
+        clearOrderTag();
     }
 
     private void clearSmallMapRouteLine() {