diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt index 7a8a8ce957..075e2a06b0 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/bean/Station.kt @@ -5,3 +5,5 @@ package com.magic.mogo.och.charter.bean * @date: 2023/2/23 */ data class Station(var siteId: Int, var siteName: String, var seq: Int) + +data class ArriveDestRequest(val sn:String, val lineId:Long,val writtenVersion:Long) diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt index 16aa1f5f76..d4362392fd 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt @@ -10,6 +10,7 @@ import com.magic.mogo.och.charter.R import com.magic.mogo.och.charter.base.CharterBaseFragment import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVED +import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse.Result.Companion.ARRIVING import com.magic.mogo.och.charter.constant.CharterConst.Companion.LOOP_PERIOD_60S import com.magic.mogo.och.charter.net.login.LoginDriverM1Impl import com.magic.mogo.och.charter.presenter.DriverM1Presenter @@ -91,7 +92,7 @@ class DriverM1Fragment : CharterBaseFragment?){ + mDriverM1ServiceApi.arriveDest(MoGoAiCloudClientConfig.getInstance().serviceAppId, + MoGoAiCloudClientConfig.getInstance().token, + ArriveDestRequest(MoGoAiCloudClientConfig.getInstance().sn,lindId,writtenVersion) + ).transformTry() + .subscribe(OchCommonSubscribeImpl(context!!, callback, "arriveDest")) + } + fun checkoutContrail(context: Context?,lineId: Int, callback: OchCommonServiceCallback?){ mDriverM1ServiceApi.checkoutContrail(MoGoAiCloudClientConfig.getInstance().serviceAppId, diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt index f6f919a0dc..6c2a45b380 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/net/IDriverM1Service.kt @@ -1,6 +1,7 @@ package com.magic.mogo.och.charter.net import com.magic.mogo.och.charter.bean.* +import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.data.BaseData import io.reactivex.Observable import retrofit2.http.* @@ -56,4 +57,13 @@ interface IDriverM1Service { @Query("sn") sn: String? ,@Query("lineId") lineId:Int): Observable? + /** + * 到达目的地 + */ + @POST("/och-rental-cabin/api/flow/v1/driver/arriveDest") + fun arriveDest( + @Header("appId") appId: String, + @Header("ticket") ticket: String, + @Body request: ArriveDestRequest + ): Observable } \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt index a531fe2cc2..26f52b5a4e 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DPMsgType.kt @@ -6,7 +6,7 @@ package com.mogo.och.common.module.bean.dpmsg */ enum class DPMsgType(val type: Int) { TYPE_COMMON(0), //常规 - TYPE_CHANGE_DEST(1),// 变更目的地确认 + TYPE_CHANGE_DEST(1),// 变更目的地确认/到站 TYPE_OPEN_CLOSE_DOOR(2),//开关门 TYPE_ORDER_CLOSED(3), // 订单结束 TYPE_TASK_DETAILS(4), //路线任务详情 diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt index 81b6a30fa8..9522317355 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt @@ -28,18 +28,6 @@ data class ChangeDestMsg( var writtenVersion:Long?, //版本标记 ): BaseDPMsg(DPMsgType.TYPE_CHANGE_DEST.type) -data class ArriveDestMsg( - var orderNo: String, //订单id - var lineId: Int, //线路id - var lineName: String = "", //线路名称 - var startSiteId: Int= 0, //当前站点 - var startSiteName: String = "", - var destSiteId: Int= 0, //目的地 - var destSiteName: String = "", - var arriveStatus:Int?, //1:未到达 2:到达 - var writtenVersion:Long?, //版本标记 -): BaseDPMsg(DPMsgType.TYPE_ARRIVEDEST_STATUS.type) - data class EndOrderMsg( var orderNo: String, //订单id ): BaseDPMsg(DPMsgType.TYPE_ORDER_CLOSED_BY_M1_STATUS.type) @@ -53,7 +41,7 @@ data class DPOperateDoorMsg( ): BaseDPMsg(DPMsgType.TYPE_OPEN_CLOSE_DOOR.type) data class DPOrderClosedMsg( - var closed: Boolean = true // true: 开门, false: 关门 + var closed: Boolean = true // true: 结束 ): BaseDPMsg(DPMsgType.TYPE_ORDER_CLOSED.type) data class AppConnectMsg(var isViewShow: Boolean, var isPlay: Boolean, var msg: String,