From 3e25ee30c4f28eb04ff24b0c8cb24a73dd13c945 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 16 Aug 2023 19:49:23 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E8=8E=B7=E5=8F=96=E6=80=BB=E9=87=8C?=
 =?UTF-8?q?=E7=A8=8B=E5=92=8C=E6=80=BB=E7=94=A8=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt     | 4 ++++
 .../main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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 db880b22dc..fb491f31c7 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
@@ -304,6 +304,10 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
 
                         mCurrentTaskAndOrder = result
 
+                        if (result.order != null && result.order!!.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code){
+                            queryCurrentOrderStatusByNo(mCurrentTaskAndOrder!!.order!!.orderNo) //查询全程里程和用时
+                        }
+
                         //根据lineId集合去查轨迹集合
                         if (result.order != null && result.taskType == TaskTypeEnum.ToOrderStartTask.code){
                             queryOrderPickUpConertrail(result.order!!.planningLines)
diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
index 53ce1ed42f..953c2c9ac7 100644
--- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
+++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt
@@ -148,8 +148,8 @@ class TaxiBeingTaskFragment : BaseFragment(),
     @RequiresApi(Build.VERSION_CODES.N)
     private fun updateOrderTotalMilAndDur(mileage: Float, duration: Int) {
         val strHtml2 =
-            ("<font color=\"#CAD6FF\">里程 </font>" + "<font color=\"#FFFFFF\"> $mileage </font>" + "<font color=\"#CAD6FF\"> 公里 </font>"
-                    + "<font color=\"#CAD6FF\">，剩余 </font>" + "<font color=\"#FFFFFF\"> $duration </font>" + "<font color=\"#CAD6FF\"> 分钟</font>")
+            ("<font color=\"#CAD6FF\">总里程 </font>" + "<font color=\"#FFFFFF\"> $mileage </font>" + "<font color=\"#CAD6FF\"> 公里 </font>"
+                    + "<font color=\"#CAD6FF\">，总用时 </font>" + "<font color=\"#FFFFFF\"> $duration </font>" + "<font color=\"#CAD6FF\"> 分钟</font>")
         taskOtherInfo.text = Html.fromHtml(strHtml2,Html.FROM_HTML_MODE_LEGACY)
     }