From 4e30eda32f8105dff2bc3b3beaa028af2eda2459 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 17 Oct 2022 12:00:15 +0800
Subject: [PATCH] =?UTF-8?q?[2.11.0]=201=E3=80=81bus=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=20=E8=A7=84=E8=8C=83=E7=BB=93=E6=9D=9F/=E4=B8=AD?=
 =?UTF-8?q?=E6=96=AD=E4=BB=BB=E5=8A=A1=20=E6=B8=85=E7=A9=BAtag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/model/BusOrderModel.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index 465be06f92..ac7140a5f2 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -452,7 +452,7 @@ public class BusOrderModel {
             @Override
             public void onSuccess(BaseData o) {
                 CallerLogger.INSTANCE.d(M_BUS + TAG, "abortTask success: " + o);
-                isGoingToNextStation = false;
+                clearNativeTag();
                 if (o.code == 0){ // 重置成功
                     queryBusRoutes();
                     startOrStopQueryPassengerWriteOff(false);
@@ -467,6 +467,11 @@ public class BusOrderModel {
 
     }
 
+    private void clearNativeTag() {
+        isGoingToNextStation = false;
+        backgroundCurrentStationIndex = 0;
+    }
+
     /**
      * 离站上报成功后渲染站点
      * 服务端返回的OchBusRoutesResult逻辑， 离开站为当前站， 到达下一站后才会将下一站置为当前站，
@@ -822,8 +827,7 @@ public class BusOrderModel {
                     public void onSuccess(BaseData o) {
                         CallerLogger.INSTANCE.d(M_BUS + TAG, "endTask success: " + o);
                         if (o.code == 0){
-                            isGoingToNextStation = false;
-                            backgroundCurrentStationIndex = 0;
+                            clearNativeTag();
                             queryBusRoutes();// 重新获取任务
                             startOrStopQueryPassengerWriteOff(false);
                             ttsTips(mContext.getString(R.string.bus_end_task_tip));