From e196b639b457dd2fbfa170399cdecd840bd1a5a7 Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Sun, 27 Jun 2021 18:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BA=A6=E8=BD=A6=20=E6=9C=AA?=
 =?UTF-8?q?=E5=87=BA=E8=BD=A6=E7=8A=B6=E6=80=81=E4=B8=8B=20=E4=B8=8D?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index 1a59d6bc6b..9b05c3debd 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -104,7 +104,7 @@ class MogoOCHTaxiModel {
      */
     private int mRetryCounter = 0;
 
-    private int mOCHRHCarstatus = -1;
+    private int mOCHRHCarstatus = -1; // 1 已出车
 
     private Object readResolve() {
         // 阻止反序列化，必须实现 Serializable 接口
@@ -547,6 +547,9 @@ class MogoOCHTaxiModel {
             if ( obj == null ) {
                 return;
             }
+            if (mOCHRHCarstatus != 1){
+                return;
+            }
             Logger.d( TAG, "收到新订单"  + GsonUtil.jsonFromObject(obj));
             mCurrentOCHOrder = obj;
             cacheOrderInfo2Native( mCurrentOCHOrder );
@@ -615,6 +618,9 @@ class MogoOCHTaxiModel {
             if ( obj == null ) {
                 return;
             }
+            if (mOCHRHCarstatus != 1){
+                return;
+            }
             Logger.d(TAG, "订单状态被改变:" + GsonUtil.jsonFromObject(obj));
             OCHOrderStatus status = OCHOrderStatus.valueOf( obj.orderDispatchType );
             switch ( status ) {