From e42d256d097dbc9c199cafc88b48bef2e7594f25 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 3 Nov 2022 17:35:18 +0800
Subject: [PATCH] =?UTF-8?q?[2.12.0]=20fix=20taxi=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E4=B8=8B=E5=8D=95=E6=97=A0=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E6=92=AD=E6=8A=A5=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/och/taxi/model/TaxiModel.java         | 1 +
 .../com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java     | 1 +
 2 files changed, 2 insertions(+)

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 064730a4f2..83251da14e 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
@@ -811,6 +811,7 @@ public class TaxiModel {
         }
         if (mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.getCode()){
             if (FunctionBuildConfig.isDemoMode) {
+                CallerLogger.INSTANCE.d(M_TAXI + TAG, "setIPCDemoMode：false");
                 CallerAutoPilotManager.INSTANCE.setIPCDemoMode(false);
             }
 
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 2434a7fcec..83eecfc45d 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
@@ -620,6 +620,7 @@ 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);