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 = "全程 " + "" + dis + "" + " 公里"
+ ",总用时 " + "" + (int)Math.ceil( (double) duration/ 60) + "" + " 分钟";
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)
}