From d138d33c2fd7e43c3197fe02b6127be0be0c099b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 23 May 2024 17:12:18 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.4]=20[bean=20=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/BusDriverProvider.kt | 1 - .../{ => request}/BusCloseTaskRequest.java | 2 +- .../BusQueryLineStationsRequest.java | 2 +- .../BusResetDrivingLineRequest.java | 2 +- .../BusRoutePlanningUpdateReqBean.java | 2 +- .../BusUpdateSiteStatusRequest.java | 2 +- .../{ => request}/CarHeartbeatReqBean.java | 2 +- .../BusQueryLineTaskResponse.java | 2 +- .../{ => response}/BusQueryLinesResponse.java | 2 +- .../{ => response}/BusRoutesResponse.java | 2 +- .../bean/{ => response}/BusRoutesResult.java | 2 +- .../bean/{ => response}/BusStationBean.java | 2 +- .../IBusControllerStatusCallback.java | 2 -- .../och/bus/callback/IBusLinesCallback.java | 4 ++-- .../callback/IRefreshBusStationsCallback.java | 2 +- .../com/mogo/och/bus/constant/BusConst.kt | 2 -- .../com/mogo/och/bus/fragment/BusFragment.kt | 2 +- .../com/mogo/och/bus/model/BusLineModel.java | 6 +++--- .../com/mogo/och/bus/model/OrderModel.java | 6 +++--- .../com/mogo/och/bus/net/IBascApiService.java | 19 ++++++++++--------- .../com/mogo/och/bus/net/ISAASApiService.java | 14 +++++++------- .../mogo/och/bus/net/OrderServiceManager.kt | 10 +++++++++- .../och/bus/presenter/BusLinePresenter.java | 4 ++-- .../mogo/och/bus/presenter/BusPresenter.java | 2 +- .../mogo/och/bus/ui/BusSwitchLineActivity.kt | 6 +++--- .../mogo/och/bus/ui/BusSwitchLineView.java | 4 ++-- .../och/bus/ui/adapter/SwitchLineAdapter.kt | 2 +- .../bus/ui/adapter/SwitchLineTaskAdapter.kt | 2 +- .../och/bus/util/BusTrajectoryManager.java | 2 +- .../network/PassengerSAASServiceApi.java | 2 -- .../network/PassengerServiceApi.java | 1 - 31 files changed, 58 insertions(+), 57 deletions(-) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => request}/BusCloseTaskRequest.java (90%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => request}/BusQueryLineStationsRequest.java (89%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => request}/BusResetDrivingLineRequest.java (90%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => request}/BusRoutePlanningUpdateReqBean.java (94%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => request}/BusUpdateSiteStatusRequest.java (92%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => request}/CarHeartbeatReqBean.java (94%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => response}/BusQueryLineTaskResponse.java (88%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => response}/BusQueryLinesResponse.java (94%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => response}/BusRoutesResponse.java (92%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => response}/BusRoutesResult.java (98%) rename OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/{ => response}/BusStationBean.java (98%) diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/BusDriverProvider.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/BusDriverProvider.kt index f2f6608ef9..1e6ef2d3e3 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/BusDriverProvider.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/BusDriverProvider.kt @@ -6,7 +6,6 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.bus.fragment.BusFragment import com.mogo.och.common.module.constant.OchCommonConst -import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.biz.provider.CommonServiceImpl /** diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusCloseTaskRequest.java similarity index 90% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusCloseTaskRequest.java index 38fcd59b86..1a9053b04e 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusCloseTaskRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusCloseTaskRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.request; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusQueryLineStationsRequest.java similarity index 89% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusQueryLineStationsRequest.java index f6c9828873..3c6d48268d 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineStationsRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusQueryLineStationsRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.request; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusResetDrivingLineRequest.java similarity index 90% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusResetDrivingLineRequest.java index 5edd0e8574..0ed1d27039 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusResetDrivingLineRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusResetDrivingLineRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.request; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusRoutePlanningUpdateReqBean.java similarity index 94% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusRoutePlanningUpdateReqBean.java index 080e7d47bd..f14151bded 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutePlanningUpdateReqBean.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusRoutePlanningUpdateReqBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.request; import java.util.List; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusUpdateSiteStatusRequest.java similarity index 92% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusUpdateSiteStatusRequest.java index e513b18f3c..26d26a1351 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusUpdateSiteStatusRequest.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/BusUpdateSiteStatusRequest.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.request; import com.mogo.commons.storage.SharedPrefsMgr; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/CarHeartbeatReqBean.java similarity index 94% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/CarHeartbeatReqBean.java index dcacb5e380..f255254b83 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/CarHeartbeatReqBean.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/request/CarHeartbeatReqBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.request; import com.mogo.och.bus.constant.BusConst; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusQueryLineTaskResponse.java similarity index 88% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusQueryLineTaskResponse.java index 4911c3cf99..b316f52947 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLineTaskResponse.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusQueryLineTaskResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.response; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusQueryLinesResponse.java similarity index 94% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusQueryLinesResponse.java index 17540e3eed..27f98cc34b 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusQueryLinesResponse.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusQueryLinesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.response; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusRoutesResponse.java similarity index 92% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusRoutesResponse.java index 2c9bad3e3c..5bb65d797c 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResponse.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusRoutesResponse.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.response; import com.mogo.eagle.core.data.BaseData; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusRoutesResult.java similarity index 98% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusRoutesResult.java index 66b7189524..cc60623e81 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusRoutesResult.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.response; import java.util.List; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusStationBean.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusStationBean.java similarity index 98% rename from OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusStationBean.java rename to OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusStationBean.java index 43cfd8c9d9..69e3541862 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/BusStationBean.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/bean/response/BusStationBean.java @@ -1,4 +1,4 @@ -package com.mogo.och.bus.bean; +package com.mogo.och.bus.bean.response; /** * 单个网约车小巴车站信息 diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java index d93441aedd..34fdba2b70 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusControllerStatusCallback.java @@ -1,7 +1,5 @@ package com.mogo.och.bus.callback; -import com.mogo.eagle.core.data.map.MogoLocation; - /** * Created on 2021/9/10 * diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java index 8250b337c5..fed8821eef 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IBusLinesCallback.java @@ -1,7 +1,7 @@ package com.mogo.och.bus.callback; -import com.mogo.och.bus.bean.BusQueryLineTaskResponse; -import com.mogo.och.bus.bean.BusQueryLinesResponse; +import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse; +import com.mogo.och.bus.bean.response.BusQueryLinesResponse; /** * @author: wangmingjun diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java index 95292ef6a6..b29157321e 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java @@ -1,6 +1,6 @@ package com.mogo.och.bus.callback; -import com.mogo.och.bus.bean.BusStationBean; +import com.mogo.och.bus.bean.response.BusStationBean; import java.util.List; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt index 84ea0cf753..658e68a68b 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt @@ -1,7 +1,5 @@ package com.mogo.och.bus.constant -import com.mogo.commons.debug.DebugConfig - /** * Created on 2021/12/6 */ diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.kt index c7d68826bd..961467a3c5 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.kt @@ -19,7 +19,7 @@ import com.mogo.map.MogoMap import com.mogo.map.overlay.core.Level import com.mogo.map.overlay.point.Point import com.mogo.och.bus.R -import com.mogo.och.bus.bean.BusStationBean +import com.mogo.och.bus.bean.response.BusStationBean import com.mogo.och.bus.constant.BusConst import com.mogo.och.bus.presenter.BusPresenter import com.mogo.och.bus.ui.BusSwitchLineActivity diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java index fe08e545f2..0b04bef6b9 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java @@ -7,9 +7,9 @@ import com.mogo.commons.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.bus.R; -import com.mogo.och.bus.bean.BusQueryLineTaskResponse; -import com.mogo.och.bus.bean.BusQueryLinesResponse; -import com.mogo.och.bus.bean.BusRoutesResponse; +import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse; +import com.mogo.och.bus.bean.response.BusQueryLinesResponse; +import com.mogo.och.bus.bean.response.BusRoutesResponse; import com.mogo.och.bus.callback.IBusLinesCallback; import com.mogo.och.bus.net.OrderServiceManager; import com.mogo.och.bus.ui.BusSwitchLineActivity; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index 10de5108f3..2adf4a71d6 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -31,9 +31,9 @@ import com.mogo.eagle.core.utilcode.util.StringUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.och.bus.R; -import com.mogo.och.bus.bean.BusRoutesResponse; -import com.mogo.och.bus.bean.BusRoutesResult; -import com.mogo.och.bus.bean.BusStationBean; +import com.mogo.och.bus.bean.response.BusRoutesResponse; +import com.mogo.och.bus.bean.response.BusRoutesResult; +import com.mogo.och.bus.bean.response.BusStationBean; import com.mogo.och.bus.bean.WriteOffPassenger; import com.mogo.och.bus.callback.IBusADASStatusCallback; import com.mogo.och.bus.callback.IBusControllerStatusCallback; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java index 680cac21dc..70a22de0ed 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/IBascApiService.java @@ -1,14 +1,15 @@ package com.mogo.och.bus.net; + import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.bus.bean.BusCloseTaskRequest; -import com.mogo.och.bus.bean.BusQueryLineTaskResponse; -import com.mogo.och.bus.bean.BusQueryLinesResponse; -import com.mogo.och.bus.bean.BusRoutePlanningUpdateReqBean; -import com.mogo.och.bus.bean.BusRoutesResponse; -import com.mogo.och.bus.bean.CarHeartbeatReqBean; -import com.mogo.och.bus.bean.BusQueryLineStationsRequest; -import com.mogo.och.bus.bean.BusResetDrivingLineRequest; -import com.mogo.och.bus.bean.BusUpdateSiteStatusRequest; +import com.mogo.och.bus.bean.request.BusCloseTaskRequest; +import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse; +import com.mogo.och.bus.bean.response.BusQueryLinesResponse; +import com.mogo.och.bus.bean.request.BusRoutePlanningUpdateReqBean; +import com.mogo.och.bus.bean.response.BusRoutesResponse; +import com.mogo.och.bus.bean.request.CarHeartbeatReqBean; +import com.mogo.och.bus.bean.request.BusQueryLineStationsRequest; +import com.mogo.och.bus.bean.request.BusResetDrivingLineRequest; +import com.mogo.och.bus.bean.request.BusUpdateSiteStatusRequest; import io.reactivex.Observable; import retrofit2.http.Body; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/ISAASApiService.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/ISAASApiService.java index aef687e7da..6a931ebe96 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/ISAASApiService.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/ISAASApiService.java @@ -1,13 +1,13 @@ package com.mogo.och.bus.net; import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.bus.bean.BusCloseTaskRequest; -import com.mogo.och.bus.bean.BusQueryLineTaskResponse; -import com.mogo.och.bus.bean.BusQueryLinesResponse; -import com.mogo.och.bus.bean.BusResetDrivingLineRequest; -import com.mogo.och.bus.bean.BusRoutePlanningUpdateReqBean; -import com.mogo.och.bus.bean.BusRoutesResponse; -import com.mogo.och.bus.bean.BusUpdateSiteStatusRequest; +import com.mogo.och.bus.bean.request.BusCloseTaskRequest; +import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse; +import com.mogo.och.bus.bean.response.BusQueryLinesResponse; +import com.mogo.och.bus.bean.request.BusResetDrivingLineRequest; +import com.mogo.och.bus.bean.request.BusRoutePlanningUpdateReqBean; +import com.mogo.och.bus.bean.response.BusRoutesResponse; +import com.mogo.och.bus.bean.request.BusUpdateSiteStatusRequest; import io.reactivex.Observable; import retrofit2.http.Body; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt index 8f885ed0f5..663fdb4406 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt @@ -7,7 +7,15 @@ import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.map.MogoLocation -import com.mogo.och.bus.bean.* +import com.mogo.och.bus.bean.request.BusCloseTaskRequest +import com.mogo.och.bus.bean.request.BusQueryLineStationsRequest +import com.mogo.och.bus.bean.request.BusResetDrivingLineRequest +import com.mogo.och.bus.bean.request.BusRoutePlanningUpdateReqBean +import com.mogo.och.bus.bean.request.BusUpdateSiteStatusRequest +import com.mogo.och.bus.bean.request.CarHeartbeatReqBean +import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse +import com.mogo.och.bus.bean.response.BusQueryLinesResponse +import com.mogo.och.bus.bean.response.BusRoutesResponse import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java index 8a54250475..2e395b5be5 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java @@ -7,8 +7,8 @@ import androidx.lifecycle.LifecycleOwner; import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.bus.bean.BusQueryLineTaskResponse; -import com.mogo.och.bus.bean.BusQueryLinesResponse; +import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse; +import com.mogo.och.bus.bean.response.BusQueryLinesResponse; import com.mogo.och.bus.callback.IBusLinesCallback; import com.mogo.och.bus.model.BusLineModel; import com.mogo.och.bus.model.OrderModel; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index aa229d58a7..3d27e1af42 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -14,7 +14,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.bus.bean.BusStationBean; +import com.mogo.och.bus.bean.response.BusStationBean; import com.mogo.och.bus.bean.WriteOffPassenger; import com.mogo.och.bus.callback.IBusADASStatusCallback; import com.mogo.och.bus.callback.IBusControllerStatusCallback; diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt index fd6f7b874e..e85c5aea90 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt @@ -15,12 +15,12 @@ import com.mogo.commons.mvp.MvpActivity import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.bus.presenter.BusLinePresenter import com.mogo.och.bus.ui.adapter.SwitchLineAdapter -import com.mogo.och.bus.bean.BusQueryLinesResponse +import com.mogo.och.bus.bean.response.BusQueryLinesResponse import com.mogo.och.bus.ui.adapter.OpenItemAnimator import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.R -import com.mogo.och.bus.bean.BusQueryLineTaskResponse +import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse import java.util.ArrayList /** @@ -146,7 +146,7 @@ class BusSwitchLineActivity : MvpActivity finish() } - override fun onBusLineTasks(lineTaskInfo: BusQueryLineTaskResponse?, position: Int,autoRefresh:Boolean) { + override fun onBusLineTasks(lineTaskInfo: BusQueryLineTaskResponse?, position: Int, autoRefresh:Boolean) { val result = mData[position] if (result.taskList == null) { result.taskList = ArrayList() diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java index 6646068909..9b84e36e43 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineView.java @@ -1,8 +1,8 @@ package com.mogo.och.bus.ui; import com.mogo.commons.mvp.IView; -import com.mogo.och.bus.bean.BusQueryLineTaskResponse; -import com.mogo.och.bus.bean.BusQueryLinesResponse; +import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse; +import com.mogo.och.bus.bean.response.BusQueryLinesResponse; /** * @author: wangmingjun diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt index 6038793be4..98e8702189 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt @@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.mogo.och.bus.R -import com.mogo.och.bus.bean.BusQueryLinesResponse +import com.mogo.och.bus.bean.response.BusQueryLinesResponse import com.mogo.och.bus.ui.adapter.SwitchLineAdapter.SwitchLineViewHolder import java.lang.Exception import kotlin.text.StringBuilder diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt index 8183e0efd4..3c018a2389 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineTaskAdapter.kt @@ -8,7 +8,7 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.och.bus.R -import com.mogo.och.bus.bean.BusQueryLineTaskResponse +import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse import com.mogo.och.bus.ui.adapter.SwitchLineTaskAdapter.SwitchLineTaskViewHolder /** diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index e58f203c0a..ab0f19bb04 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -6,7 +6,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; -import com.mogo.och.bus.bean.BusRoutesResult; +import com.mogo.och.bus.bean.response.BusRoutesResult; import com.mogo.och.bus.constant.BusConst; import com.mogo.och.bus.model.OrderModel; import com.mogo.och.common.module.biz.login.LoginStatusManager; diff --git a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java index 577a72524c..09de1cb2f2 100644 --- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java +++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/PassengerSAASServiceApi.java @@ -23,7 +23,6 @@ public interface PassengerSAASServiceApi { * @return 接口返回数据 */ @Headers( {"Content-Type:application/json;charset=UTF-8"} ) -// @POST( "/autopilot-car-hailing/line/v2/driver/bus/passenger/lineDataWithDriver/query" ) @GET( "/och-bus-cabin/api/business/v1/driver/bus/lineDataWithDriver/query" ) Observable queryDriverSiteByCoordinate(@Header("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); @@ -33,7 +32,6 @@ public interface PassengerSAASServiceApi { * @return */ @Headers({"Content-type:application/json;charset=UTF-8"}) -// @GET("/autopilot-car-hailing/operation/v1/driver/bus/passenger/loginStatus") @GET("/och-bus-cabin/api/business/v1/loginStatus") Observable queryDriverOperationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); diff --git a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java index 00b312ee2d..828db4afda 100644 --- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java +++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/PassengerServiceApi.java @@ -32,7 +32,6 @@ public interface PassengerServiceApi { * @return */ @Headers({"Content-type:application/json;charset=UTF-8"}) -// @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);