diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt index 41b225b5d7..f9bf7dd51b 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt @@ -103,11 +103,13 @@ data class JumpPassengerCheckReqBean(var sn: String, var orderNo: String) data class CancelOrderReqBean(var sn: String, var orderNo: String, var cancelType: Int) data class OrderCompletedReqBean(var sn: String, var orderNo: String) data class QueryCarOrderByNoReqBean(var sn: String, var orderNo: String) -data class QueryCarOrderByNoRespBean( - var sn: String, var orderNo: String, var orderStatus: Int, - var bookingUserPhone: String, var businessType: String, - var mileage: Float,var duration: Int -): BaseData() +data class QueryCarOrderByNoRespBean(var data: Result): BaseData(){ + data class Result( + var sn: String, var orderNo: String, var orderStatus: Int, + var bookingUserPhone: String, var businessType: String, + var mileage: Float,var duration: Int,var passengerSize: Int + ) +} data class ContrailListRespBean(var data: MutableList?) //轨迹路线集合 : BaseData() { diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt index 2e1621aaf4..f0a8fb654f 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt @@ -367,18 +367,18 @@ class TaxiUnmannedViewModel : BaseViewModel(){ queryCarOrderByOrderNo(mContext,orderNo, object : OchCommonServiceCallback{ override fun onSuccess(data: QueryCarOrderByNoRespBean?) { - if (data != null && data.code != 0) return - if (data!!.orderStatus == TaxiOrderStatusEnum.Cancel.code){ + if (data == null || data.code != 0) return + if (data.data.orderStatus == TaxiOrderStatusEnum.Cancel.code){ VoiceNotice.showNotice("乘客已经取消") mCurrentTaskAndOrder = null updateTaskAndOrderUi() return } - if (data.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){//到站 - updateOrderMileAndDur(data.mileage,data.duration) + if (data.data.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){//到站 + updateOrderMileAndDur(data.data.mileage,data.data.duration) return } - if (data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.code){//完成 + if (data.data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.code){//完成 //获取新的任务 if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.endSite != null){ startPrepareTask(mCurrentTaskAndOrder!!.endSite!!.siteId) diff --git a/gradle.properties b/gradle.properties index 207f9304f5..1403ae47f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端:2.5.1;RoboTaxi司机端:2.5.1;RoboTaxi乘客端:1.0.0 -versionCode=3030000 -versionName=3.3.0 +versionCode=6000000 +versionName=6.0.0 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10