From 76e71c75e774557f4bed1ce305ba47b74eef0f9c Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Mon, 27 Jun 2022 20:21:20 +0800
Subject: [PATCH] =?UTF-8?q?[Bus/Taxi=20driver=20v2.8.0]Taxi=E5=90=8C?=
 =?UTF-8?q?=E4=B8=80=E8=AE=A2=E5=8D=95=E5=8F=AA=E7=8A=B6=E6=80=81=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E6=97=B6=E4=B8=8D=E9=87=8D=E5=A4=8D=E5=8F=91'?=
 =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E4=B8=8B=E5=8F=91request'=EF=BC=88=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E6=9C=AA=E6=8E=A5=E6=94=B6=E5=88=B0=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E5=8F=AF?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8F=91=EF=BC=89=EF=BC=88=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E5=9C=A8=E4=B9=98=E5=AE=A2=E7=AB=AF=E8=A7=A6=E5=8F=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4=E6=97=B6=E5=87=BA=E7=8E=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/utils/TaxiTrajectoryManager.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
index c65e1a4de4..d436061208 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
@@ -39,6 +39,7 @@ public class TaxiTrajectoryManager {
 
     private AutopilotControlParameters.AutoPilotLine mAutoPilotLine = null;
     private Disposable mSendReqDisposable = null;
+    private String mPrevOrderNo = "";
 
     public TaxiTrajectoryManager() {
         mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(
@@ -55,8 +56,13 @@ public class TaxiTrajectoryManager {
             CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() stop.");
             stopTrajReqLoop();
         } else {
-            CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() start.");
-            startTrajReqLoop();
+            if (mPrevOrderNo.equals(orderInfo.orderNo)) {
+                CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() 重复订单.");
+            } else {
+                mPrevOrderNo = orderInfo.orderNo;
+                CallerLogger.INSTANCE.d(M_TAXI + TAG, "syncTrajectoryInfo() start.");
+                startTrajReqLoop();
+            }
         }
     }
 
@@ -140,6 +146,7 @@ public class TaxiTrajectoryManager {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(aLong -> {
                     if (aLong > TaxiConst.LOOP_SEND_TRAJ_TIMES) {
+                        mPrevOrderNo = ""; //重发超时后将mPrevOrderNo置空，这样订单进入下个状态时还可以重发
                         stopTrajReqLoop();
                         return;
                     }