From 0ed148db24cb199f58506f5862aa2ca4f6b9c910 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 18 Aug 2023 12:07:30 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/bean/UnmannedTaskBean.kt  | 12 +++++++-----
 .../com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt | 10 +++++-----
 gradle.properties                                    |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

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