From f45316ebcc834b828ee4b3940eafb02820b90db7 Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Wed, 21 Jul 2021 18:33:36 +0800
Subject: [PATCH] =?UTF-8?q?och=5Ftaxi=20=E4=BF=AE=E5=A4=8D=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=BB=91=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/MogoOCHTaxiModel.java    | 18 +++++++++---------
 .../com/mogo/och/taxi/ui/OCHTaxiFragment.java  |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

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 7f5b1c62b1..1ded643d76 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
@@ -117,14 +117,14 @@ class MogoOCHTaxiModel {
         if (mOCHTaxiServiceApi == null){
             mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi().create(OCHTaxiServiceApi.class, HostConst.OCH_DOMAIN);
         }
-//        MogoApisHandler.getInstance()
-//                .getApis()
-//                .getSocketManagerApi( context )
-//                .registerOnMessageListener( 401016, mOrderMsgListener = new OrderMsgListener() );
-//        MogoApisHandler.getInstance()
-//                .getApis()
-//                .getSocketManagerApi( context )
-//                .registerOnMessageListener( 401019, mOrderStatusMsgListener = new OrderStatusMsgListener() );
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getSocketManagerApi( context )
+                .registerOnMessageListener( 401016, mOrderMsgListener = new OrderMsgListener() );
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getSocketManagerApi( context )
+                .registerOnMessageListener( 401019, mOrderStatusMsgListener = new OrderStatusMsgListener() );
         MogoApisHandler.getInstance()
                 .getApis()
                 .getAdasControllerApi()
@@ -300,7 +300,7 @@ class MogoOCHTaxiModel {
                         mIsArriveAtEndStation = false;
                         mIsOnTheWay2EndStation = false;
 //                        mIsUserArriveAtStartStation = false;
-//                        mOrderMsgListener.onMsgReceived( mCurrentOCHOrder );
+                        mOrderMsgListener.onMsgReceived( mCurrentOCHOrder );
                         break;
                 }
             }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
index 428524960f..34dea5c9c6 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
@@ -232,7 +232,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
             @Override
             public void onSuccess( Object data ) {
                 Logger.d( TAG, "更新状态成功" );
-                onOrderStatusChanged(OCHOrderStatus.ArriveAtEndStation.getCode());
+//                onOrderStatusChanged(OCHOrderStatus.ArriveAtEndStation.getCode());
             }
 
             @Override
@@ -296,7 +296,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
                     Logger.d( TAG, "更新状态成功" );
                     MogoOCHTaxiModel.getInstance().clearCurrentOCHOrder();
                     MogoOCHTaxiModel.getInstance().cancelAutopilot();
-                    OCHTaxiUiController.getInstance().onOrderStatusChanged(0);
+//                    OCHTaxiUiController.getInstance().onOrderStatusChanged(0);
                 }
 
                 @Override
@@ -336,7 +336,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
             @Override
             public void onSuccess( Object data ) {
                 Logger.d( TAG, "更新状态成功" );
-                onOrderStatusChanged(OCHOrderStatus.OnTheWayToEndStation.getCode());
+//                onOrderStatusChanged(OCHOrderStatus.OnTheWayToEndStation.getCode());
             }
 
             @Override