From bd6f1b197656c6d242cfa25c6b5720e1a60f20b3 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 23 Jul 2024 18:53:14 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fix]=20[dialog=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8m]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java  | 2 +-
 .../taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt    | 2 +-
 .../mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt   | 4 ++--
 .../mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt | 2 +-
 .../passenger/presenter/BaseTaxiPassengerPresenter.kt         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
index fdd6ca526d..6c0b279bf7 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
@@ -428,7 +428,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
 
             dis = NumberFormatUtil.formatLong( (double) distance/ 1000);
         }
-        dialog.setOrderMileage(distance/1000f);
+        dialog.setOrderMileage(distance);
 
         String strHtml2 = "<font color=\"#CAD6FF\">全程 </font>" + "<b><font color=\"#FFFFFF\">" + dis + "</font></b>" + "<font color=\"#CAD6FF\"> 公里</font>"
                 + "<font color=\"#CAD6FF\">，总用时 </font>" + "<b><font color=\"#FFFFFF\">" + (int)Math.ceil( (double) duration/ 60)  + "</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
index 6ae2bebb2c..f2239cc4a5 100644
--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
@@ -159,7 +159,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
             "到达目的地计算距离和时间",
             "距离：${distanceToEnd}  时间：${durationToEnd}"
         )
-        mView?.showDuringAndDistance(distanceToEnd,durationToEnd)
+        mView?.showDuringAndDistance(distanceToEnd.toFloat(),durationToEnd.toFloat())
     }
 
     companion object {
diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index ffebeb3895..51661ea8b8 100644
--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -490,8 +490,8 @@ class TaxiPassengerBaseFragment() :
         evaluate.visibility = View.VISIBLE
     }
 
-    fun showDuringAndDistance(distanceToEnd: Long, durationToEnd: Long) {
-        arrivedView.setMileageAndDuration(distanceToEnd/1000f,durationToEnd/60f)
+    fun showDuringAndDistance(distanceToEnd: Float, durationToEnd: Float) {
+        arrivedView.setMileageAndDuration(distanceToEnd,durationToEnd)
     }
 
 
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt
index c17806caf0..2e264384f8 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt
@@ -182,7 +182,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                     }
 
                     is TaskWithOrderUIState.UpdateOrderTripInfo -> {
-                        dialog?.setOrderMileage(taskAndOrderUiState.mileage)
+                        dialog?.setOrderMileage(taskAndOrderUiState.mileage*1000)
                         taskOtherInfo.text =
                             TaskUtils.getCurrentTaskTotalAndDurationHtml(
                                 taskAndOrderUiState.mileage,
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt
index 6557555ea1..285cf4109f 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/presenter/BaseTaxiPassengerPresenter.kt
@@ -148,7 +148,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
     override fun onCurrentOrderDistAndduration(mileage: Float, duration: Float) {
         UiThreadHandler.post({
             OchChainLogManager.writeChainLog("到达目的地计算距离和时间","距离：${mileage}  时间：${duration}")
-            mView?.showDuringAndDistance(mileage,duration)
+            mView?.showDuringAndDistance(mileage*1000,duration)
         },UiThreadHandler.MODE.QUEUE)
     }