From 32f5aa22ec4179ce4afd31610932bd6fc669de18 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 22 Sep 2022 19:01:09 +0800 Subject: [PATCH] =?UTF-8?q?[2.11.0/1.6.0]=20bus=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/bean/BusPassengerOperationStatusResponse.java | 4 ++-- .../com/mogo/och/bus/passenger/model/BusPassengerModel.java | 2 +- .../och/bus/passenger/network/BusPassengerServiceApi.java | 6 ++++-- .../main/java/com/mogo/och/bus/presenter/BusPresenter.java | 6 ------ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java index 1d2068e4af..c559d22368 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/bean/BusPassengerOperationStatusResponse.java @@ -14,8 +14,8 @@ public class BusPassengerOperationStatusResponse extends BaseData { public static class Result { private String sn; //司机屏sn + private String phone; //司机手机号 public String plateNumber; //车牌号 - public int serviceStatus;//0:已收车，1:已出车 - public int businessType;// 车辆类型： taxi/bus + public int driverStatus;//0:已收车，1:已出车 } } diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index b6409196ea..6d6be9bf00 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -135,7 +135,7 @@ public class BusPassengerModel { public void onSuccess(BusPassengerOperationStatusResponse data) { if (data == null || data.data == null) return; if(mDriverStatusCallback != null){ - mDriverStatusCallback.changeOperationStatus(data.data.serviceStatus == 1); + mDriverStatusCallback.changeOperationStatus(data.data.driverStatus == 1); mDriverStatusCallback.updatePlateNumber(data.data.plateNumber); } } diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java index c9ddbd8b26..a7512971dc 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceApi.java @@ -27,12 +27,14 @@ interface BusPassengerServiceApi { Observable queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Body BusPassengerQueryLineRequest request); /** - * 查询司机端出车/收车状态 + * 查询司机端的登陆状态 * @param sn * @return */ @Headers({"Content-type:application/json;charset=UTF-8"}) - @GET("/autopilot-car-hailing/car/v2/driver/bus/passenger/takeOrderStatus/query") +// @GET("/autopilot-car-hailing/car/v2/driver/bus/passenger/takeOrderStatus/query") + @GET("/autopilot-car-hailing/operation/v1/driver/bus/passenger/loginStatus") Observable queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); + } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index cff599cca5..005b9a08fc 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -90,12 +90,6 @@ public class BusPresenter extends Presenter BusOrderModel.getInstance().queryBusRoutes(); } - public void resetCurrentLineStatus() { - BusOrderModel.getInstance().resetCurrentLineStatus(); - public void queryOperationStatus(){ - BusOrderModel.getInstance().queryOperationStatus(); - } - public void abortTask() { BusOrderModel.getInstance().abortTask(); }