diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusCloseTaskRequest.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusCloseTaskRequest.java deleted file mode 100644 index eea31805d6..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusCloseTaskRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.commons.storage.SharedPrefsMgr; -import com.mogo.och.common.module.utils.DateTimeUtil; - -/** - * 中止/结束任务请求 - */ -public class BusCloseTaskRequest { - - private String sn; - private int taskId; - private long writeVersion; - public BusCloseTaskRequest(int taskId) { - this.sn = SharedPrefsMgr.getInstance().getSn(); - this.taskId = taskId; - this.writeVersion = DateTimeUtil.getCurrentTimeStamp(); - } - - public String getSn() { - return sn; - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusOrderBean.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusOrderBean.java deleted file mode 100644 index fc3170d41f..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusOrderBean.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.mogo.och.offline.bean; - -/** - * @author congtaowang - * @since 2021/3/23 - *

- * 小巴订单 - */ -public class BusOrderBean { - - /** - * orderNo number - * passengerPhone string 下单用户电话 - * startStationId integer 开始站点 - * startStationName string - * endStationId integer 结束站点 - * endStationName string - */ - - private String orderNo; - private String passengerPhone; - private int startStationId;//乘客上车点 - private String startStationName; - private String endStationName; - private int endStationId;//乘客下车点 - - public void setOrderNo(String orderNo) { - this.orderNo = orderNo; - } - - public void setPassengerPhone(String passengerPhone) { - this.passengerPhone = passengerPhone; - } - - public void setStartStationId(int startStationId) { - this.startStationId = startStationId; - } - - public void setStartStationName(String startStationName) { - this.startStationName = startStationName; - } - - public void setEndStationName(String endStationName) { - this.endStationName = endStationName; - } - - public void setEndStationId(int endStationId) { - this.endStationId = endStationId; - } - - public String getOrderNo() { - return orderNo; - } - - public String getPassengerPhone() { - return passengerPhone; - } - - public int getStartStationId() { - return startStationId; - } - - public String getStartStationName() { - return startStationName; - } - - public String getEndStationName() { - return endStationName; - } - - public int getEndStationId() { - return endStationId; - } - - @Override - public String toString() { - return "BusOrderBean{" + - "orderNo=" + orderNo + - ", passengerPhone='" + passengerPhone + '\'' + - ", startStationId=" + startStationId + - ", startStationName='" + startStationName + '\'' + - ", endStationName='" + endStationName + '\'' + - ", endStationId=" + endStationId + - '}'; - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusOrdersResponse.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusOrdersResponse.java deleted file mode 100644 index 56aba7dad9..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusOrdersResponse.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.eagle.core.data.BaseData; - -import java.util.List; - -/** - * @author: wangmingjun - * @date: 2021/10/19 - */ -public class BusOrdersResponse extends BaseData { - public Result data; - public static class Result{ - public List orders; - } - - @Override - public String toString() { - return "BusOrdersResponse{" + - "data=" + data + - '}'; - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusQueryLineStationsRequest.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusQueryLineStationsRequest.java deleted file mode 100644 index c78836bf1a..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusQueryLineStationsRequest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.commons.storage.SharedPrefsMgr; - -/** - * @author congtaowang - * @since 2021/3/22 - * - * 根据车机行驶线路站点信息 - */ -public class BusQueryLineStationsRequest { - - private String sn; - public BusQueryLineStationsRequest() { - this.sn = SharedPrefsMgr.getInstance().getSn(); - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusQueryLineTaskResponse.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusQueryLineTaskResponse.java deleted file mode 100644 index 0681099262..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusQueryLineTaskResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.eagle.core.data.BaseData; - -import java.util.List; - -/** - * @author: wangmingjun - * @date: 2022/2/9 - */ -public class BusQueryLineTaskResponse extends BaseData { - - public List data; - - public static class Result { - public int id; - public long taskStartTime; - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusQueryLinesResponse.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusQueryLinesResponse.java deleted file mode 100644 index 9d8d36a934..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusQueryLinesResponse.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.eagle.core.data.BaseData; - -import java.util.List; - -/** - * @author: wangmingjun - * @date: 2022/2/9 - */ -public class BusQueryLinesResponse extends BaseData { - public List data; - - public static class Result { - - public int lineId;//线路id - public String name;//线路名字 - public int choose; // 1:绑定 2:未被绑定 - public String startSiteName;//始发站名称 - public String endSiteName;//终点名称 - - public boolean open;//true 打开状态 false - public boolean haveTask; - - public List taskList; - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusResetDrivingLineRequest.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusResetDrivingLineRequest.java deleted file mode 100644 index 793c7e2eb8..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusResetDrivingLineRequest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.commons.storage.SharedPrefsMgr; -import com.mogo.och.common.module.utils.DateTimeUtil; - -/** - * @author: wangmingjun - * @date: 2021/10/18 - */ -public class BusResetDrivingLineRequest { - public String sn; - public int taskId; //切换到的线路id - public long writeVersion; //更新时间戳 - - public BusResetDrivingLineRequest(int taskId) { - this.sn = SharedPrefsMgr.getInstance().getSn(); - this.taskId = taskId; - this.writeVersion = DateTimeUtil.getCurrentTimeStamp(); - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusRoutesResponse.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusRoutesResponse.java deleted file mode 100644 index 83dd7cdf40..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusRoutesResponse.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.eagle.core.data.BaseData; -import com.mogo.och.data.bean.BusRoutesResult; - -/** - * 网约车小巴路线接口请求响应结果 - * - * @author tongchenfei - */ -public class BusRoutesResponse extends BaseData { - private BusRoutesResult data; - - public BusRoutesResult getResult() { - return data; - } - - public void setResult(BusRoutesResult data) { - this.data = data; - } - - @Override - public String toString() { - return "BusRoutesResponse{" + - "data=" + data + - '}'; - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusUpdateSiteStatusRequest.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusUpdateSiteStatusRequest.java deleted file mode 100644 index edfc699be5..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BusUpdateSiteStatusRequest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.commons.storage.SharedPrefsMgr; - -/** - * @author congtaowang - * @since 2021/3/22 - * - * 小巴车运营状态请求参数 - */ -public class BusUpdateSiteStatusRequest { - - public String sn; - public int taskId; - public int seq;//站点序号 - public int siteId;//站点id - public long writeVersion; //更新时间戳 - - public BusUpdateSiteStatusRequest(int taskId,int siteId,int seq, long writeVersion) { - this.sn = SharedPrefsMgr.getInstance().getSn(); - this.seq = seq; - this.siteId = siteId; - this.taskId = taskId; - this.writeVersion = writeVersion; - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/QueryLeaveAwayPassengersRequest.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/QueryLeaveAwayPassengersRequest.java deleted file mode 100644 index c1bb4a1654..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/QueryLeaveAwayPassengersRequest.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.commons.storage.SharedPrefsMgr; - -/** - * 查询下车乘客请求参数 - * - * @author tongchenfei - */ -public class QueryLeaveAwayPassengersRequest { - private String sn; - private int seq; //站点在线路中的序号 - private int siteId; //站点id - - public QueryLeaveAwayPassengersRequest(int seq, int siteId) { - this.sn = SharedPrefsMgr.getInstance().getSn(); - this.seq = seq; - this.siteId = siteId; - } - - public void setSeq(int seq) { - this.seq = seq; - } - - public void setSiteId(int siteId) { - this.siteId = siteId; - } - - public int getSeq() { - return seq; - } - - public int getSiteId() { - return siteId; - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/QueryLeaveAwayPassengersResponse.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/QueryLeaveAwayPassengersResponse.java deleted file mode 100644 index 365409625a..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/QueryLeaveAwayPassengersResponse.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.eagle.core.data.BaseData; - -import java.util.List; - -public -/** - * @author congtaowang - * @since 2021/3/26 - * - * 到站查询下车乘客 - */ -class QueryLeaveAwayPassengersResponse extends BaseData { - - public Result data; - - public static class Result { - - public List< LeaveAwayPassenger > orders; - } - - public static class LeaveAwayPassenger { - /** - * orderNo: 订单no - * orderStatus: 订单状态 - * orderType：订单类型：0及时，1预约 - * bookingTime：预计用车时间 - * businessType：订单运营类型 9:taxi，10:bus - * startSiteId： 起点站点id - * userPhone: 乘客联系方式 - * startSitePoint：开始站点坐标 - * startSiteAddr：开始地址 - * endSiteId：结束站点id - * endSitePoint：结束站点坐标 - * carNumber：车牌号 - * createTime: 创建时间 - * startTime：开始时间 - * startSiteGcjPoint：高精坐标 - * endSiteGcjPoint： - */ -//todo 目前是需要乘客电话来通知乘客下车 目前后台没有乘客信息userPhone - public String orderNo; - public int orderStatus; - public int orderType; - public long bookingTime; - public int businessType; - public int startSiteId; - public String passengerPhone; - public List startSitePoint; - public String startSiteAddr; - public int endSiteId; - public List endSitePoint; - public String carNumber; - public long createTime; - public long startTime; - public List< Double > startSiteGcjPoint; - public List< Double > endSiteGcjPoint; - } -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/WriteOffCountResponse.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/WriteOffCountResponse.java deleted file mode 100644 index 5316701e4c..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/WriteOffCountResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mogo.och.offline.bean; - -import com.mogo.eagle.core.data.BaseData; - -import java.util.List; - -/** - * @author: wangmingjun - * @date: 2022/2/9 - */ -public class WriteOffCountResponse extends BaseData { - - public Integer data; - -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/WriteOffPassenger.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/WriteOffPassenger.java deleted file mode 100644 index 8e2e7f6532..0000000000 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/WriteOffPassenger.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mogo.och.offline.bean; - -import java.io.Serializable; - -/** - * @author: wangmingjun - * @date: 2022/9/23 - */ -public class WriteOffPassenger implements Serializable { - public String phone; - public String orderNo; - public String ticketName; - public int passengerSize; - public long writeOffTime; -} diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/BusLineModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/BusLineModel.java index 4c38a2d1a9..0c2b062dbe 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/BusLineModel.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/BusLineModel.java @@ -8,12 +8,8 @@ import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.offline.R; import com.mogo.och.offline.bean.BindLineListResponse; -import com.mogo.och.offline.bean.BusRoutesResponse; import com.mogo.och.offline.callback.IBusLinesCallback; import com.mogo.och.offline.net.OrderServiceManager; -import com.mogo.och.offline.ui.BusSwitchLineActivity; -import com.mogo.och.offline.bean.BusQueryLineTaskResponse; -import com.mogo.och.offline.bean.BusQueryLinesResponse; import com.mogo.och.common.module.network.OchCommonServiceCallback; /** diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/net/IBascApiService.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/net/IBascApiService.java index 95968ac326..a395e2916e 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/net/IBascApiService.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/net/IBascApiService.java @@ -1,21 +1,9 @@ package com.mogo.och.offline.net; -import com.mogo.eagle.core.data.BaseData; import com.mogo.och.offline.bean.BindLineListResponse; -import com.mogo.och.offline.bean.BusCloseTaskRequest; -import com.mogo.och.offline.bean.BusRoutesResponse; -import com.mogo.och.offline.bean.BusQueryLineTaskResponse; -import com.mogo.och.offline.bean.BusQueryLinesResponse; -import com.mogo.och.offline.bean.BusQueryLineStationsRequest; -import com.mogo.och.offline.bean.BusResetDrivingLineRequest; -import com.mogo.och.offline.bean.BusUpdateSiteStatusRequest; -import com.mogo.och.offline.bean.WriteOffCountResponse; import io.reactivex.Observable; -import retrofit2.http.Body; import retrofit2.http.GET; import retrofit2.http.Header; -import retrofit2.http.Headers; -import retrofit2.http.POST; import retrofit2.http.Query; /** @@ -26,89 +14,6 @@ import retrofit2.http.Query; * wiki: http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48970072 */ public interface IBascApiService { - /** - * 查询当前运行任务 - * - * @param request 请求参数 - * @return 接口返回数据 - */ - @Headers( {"Content-Type:application/json;charset=UTF-8"} ) - @POST( "/och-shuttle-cabin/api/business/v1/driver/lineDataWithDriver/query" ) - Observable queryBusRoutes(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusQueryLineStationsRequest request); - - /** - * @param request 请求参数{"destLine":1,"sn":"F803EB2046PZD00229"} 这个接口是重置bus线路的， 不是重置线路中站点的 - * @return 返回值是重置后的车站列表 - * 开始路线 - */ - @Headers( {"Content-Type:application/json;charset=UTF-8"} ) - @POST( "/och-shuttle-cabin/api/flow/v1/driver/startTask" ) - Observable switchLine(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusResetDrivingLineRequest request); - - /** - * 离站，通知服务器 - * @param request - * @return - */ - @Headers({"Content-Type:application/json;charset=UTF-8"}) - @POST("/och-shuttle-cabin/api/flow/v1/driver/leave") - Observable leaveStation(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusUpdateSiteStatusRequest request); - - /** - * 到站 更新到站信息 - * @param request - * @return - */ - @Headers({"Content-type:application/json;charset=UTF-8"}) - @POST("/och-shuttle-cabin/api/flow/v1/driver/arrive") - Observable arriveSiteStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body BusUpdateSiteStatusRequest request); - - /** - * 查询车辆配置的所有路线 - * @param appId - * @param ticket - * @param sn - * @return - */ - @GET("/och-shuttle-cabin/api/business/v1/driver/bindLine/query") - Observable queryBusLines(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn); - - /** - * 查询线路的任务 - * @param appId - * @param ticket - * @param lineId 线路id - * @return - */ - @GET("/och-shuttle-cabin/api/business/v1/driver/task/query") - Observable queryBusTaskByLineId(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("lineId") String lineId); - - /** - * 中止任务 - * @param appId - * @param ticket - * @param data - * @return - */ - @POST("/och-shuttle-cabin/api/flow/v1/driver/abortTask") - Observable abortTask(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusCloseTaskRequest data); - - /** - * 任务正常跑完结束 - * @param appId - * @param ticket - * @param data - * @return - */ - @Headers( {"Content-type:application/json;charset=UTF-8"} ) - @POST("/och-shuttle-cabin/api/flow/v1/driver/endTask") - Observable endTask(@Header ("appId") String appId, @Header("ticket") String ticket, @Body BusCloseTaskRequest data); - - - @Headers( {"Content-type:application/json;charset=UTF-8"} ) - @GET("och-shuttle-cabin/api/business/v1/task/writeOffCount") - Observable writeOffCount(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("taskId") String taskId, @Query("siteId") String siteId); - /** * 查询车辆配置的所有路线 diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/net/OrderServiceManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/net/OrderServiceManager.kt index 5bfc326b03..d101523eac 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/net/OrderServiceManager.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/net/OrderServiceManager.kt @@ -1,25 +1,14 @@ package com.mogo.och.offline.net -import android.content.Context import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.AbsMogoApplication -import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl import com.mogo.och.common.module.network.interceptor.transformIoTry -import com.mogo.och.common.module.network.interceptor.transformTry import com.mogo.och.offline.bean.BindLineListResponse -import com.mogo.och.offline.bean.BusCloseTaskRequest -import com.mogo.och.offline.bean.BusQueryLineStationsRequest -import com.mogo.och.offline.bean.BusQueryLineTaskResponse -import com.mogo.och.offline.bean.BusQueryLinesResponse -import com.mogo.och.offline.bean.BusResetDrivingLineRequest -import com.mogo.och.offline.bean.BusRoutesResponse -import com.mogo.och.offline.bean.BusUpdateSiteStatusRequest -import com.mogo.och.offline.bean.WriteOffCountResponse /** * @author: wangmingjun