yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.0.0] 查询订单接口返回值修改

Browse Source
This commit is contained in:
wangmingjun
2023-08-18 12:07:30 +08:00
committed by zhongchao
parent a860ea5445
commit 0ed148db24
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt
View File

@@ -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<Result>?) //轨迹路线集合
: BaseData() {

10
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
View File

@@ -367,18 +367,18 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
queryCarOrderByOrderNo(mContext,orderNo,
object : OchCommonServiceCallback<QueryCarOrderByNoRespBean>{
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)

4
gradle.properties
View File

@@ -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