From 5a586935667d0d7d47565fe3156fef6d3f71280b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 19 Jul 2024 18:19:37 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fix]=20[dialog=20=E4=B8=BAnull=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/ui/TaxiBeingServerdOrdersFragment.java   |  2 +-
 .../taxi/passenger/ui/TaxiPassengerBaseFragment.kt    |  2 +-
 .../mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt | 11 +++++++++++
 .../passenger/ui/TaxiPassengerBaseFragment.kt         |  2 +-
 4 files changed, 14 insertions(+), 3 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 6c0b279bf7..fdd6ca526d 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);
+        dialog.setOrderMileage(distance/1000f);
 
         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/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index 29efd5497c..3628846a00 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
@@ -491,7 +491,7 @@ class TaxiPassengerBaseFragment() :
     }
 
     fun showDuringAndDistance(distanceToEnd: Long, durationToEnd: Long) {
-        arrivedView.dialog?.setOrderMileage(distanceToEnd.toFloat())
+        arrivedView.setMileageAndDuration(distanceToEnd/1000f,durationToEnd/60f)
     }
 
 
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt
index 9ecce7d4be..a08a393697 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt
@@ -51,6 +51,9 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback {
 
     var dialog:ItinerarySummaryDialog? = null
 
+    private var mileage:Float = 0f
+    private var duration:Float = 0f
+
 
     private fun initView() {
         d(SceneConstant.M_TAXI_P + TAG, "initView")
@@ -76,6 +79,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback {
             ZhiViewmanager.showListeningAni(ZhiViewmanager.loveAni)
             if(dialog==null) {
                 dialog = ItinerarySummaryDialog(context, false, R.style.summary_dialog_p)
+                dialog?.setOrderMileage(mileage)
             }
             dialog?.show()
         } else {
@@ -87,6 +91,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback {
             ZhiViewmanager.showListeningAni(ZhiViewmanager.normalAni)
             dialog?.dismiss()
             dialog = null
+            mileage = 0f
         }
         arrivedVisilityChangeListenr?.isShow(isVisible)
     }
@@ -180,6 +185,12 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback {
         animatorSet.start()
     }
 
+    fun setMileageAndDuration(mileage: Float, duration: Float) {
+        this.mileage = mileage
+        this.duration = duration
+        dialog?.setOrderMileage(mileage)
+    }
+
     interface ArrivedVisilityChangeListenr{
         fun isShow(show: Boolean)
     }
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
index 247f4932cb..e947b157c0 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -499,7 +499,7 @@ class TaxiPassengerBaseFragment() :
     }
 
     fun showDuringAndDistance(mileage: Float, duration: Float) {
-        arrivedView.dialog?.setOrderMileage(mileage)
+        arrivedView.setMileageAndDuration(mileage,duration)
     }