From 41db1736ce39e1dd7814e68067bcf98b9b23eedf Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 30 Jun 2022 21:09:53 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi-d=20280,=20Taxi-p=20130]=201=E3=80=81?=
 =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E4=BC=98=E5=8C=96=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E9=A1=B5=E5=90=AF=E5=8A=A8=E6=97=B6=E6=9C=BA?=
 =?UTF-8?q?=202=E3=80=81=E7=82=B9=E5=87=BB=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E8=A1=8C=E7=A8=8B=E6=8C=89=E9=92=AE=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/passenger/model/TaxiPassengerModel.java   | 10 ++++++++++
 .../taxi/passenger/ui/TaxiPassengerBaseFragment.java   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
index fde7b354b9..c166b66f81 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
@@ -736,9 +736,19 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
                 phoneTail, new TaxiPassengerServiceCallback<TaxiPassengerBaseRespBean>() {
                     @Override
                     public void onSuccess(TaxiPassengerBaseRespBean data) {
+                        if (data != null && data.code == 0 && mCurrentOCHOrder != null){
+                            //乘客验证成功，更新订单状态为 "乘客已上车", 立马弹出乘客开始行程页面，不再等待轮询
+                            mCurrentOCHOrder.orderStatus = TaxiPassengerOrderStatusEnum.UserArriveAtStart.getCode();
+                            if (mOrderStatusCallbackMap.size() > 0) {
+                                for (IOCHTaxiPassengerOrderStatusCallback callback :mOrderStatusCallbackMap.values()){
+                                    callback.onCurrentOrderStatusChanged(mCurrentOCHOrder);
+                                }
+                            }
+                        }
                         if(commonCallback!=null) {
                             commonCallback.onCommonCallback();
                         }
+
                     }
 
                     @Override
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
index 1209858819..cb22b2dcbd 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
@@ -283,8 +283,8 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         if (isShow){
             if (mStartAutopilotView == null || mStartAutopilotView.get() == null){
                 mStartAutopilotView = new WeakReference<>(new TaxiPassengerStartAutopilotView(getContext()));
-                mStartAutopilotView.get().setOnClickStartAutopilotBtnCallback(this);
             }
+            mStartAutopilotView.get().setOnClickStartAutopilotBtnCallback(this);
             OverlayViewUtils.showOverlayView(getActivity(),mStartAutopilotView.get());
             updateStartAutopilotBtnStatus(isClickable);
         }else {