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