[6.5.0]

[fix]
[dialog 统一使用m]

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>";

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 {

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)
     }
 
 

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,

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)
     }