From b94f7b617cba72fec177744309fdb3cdb0ea45a0 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 24 Aug 2022 16:57:34 +0800
Subject: [PATCH] =?UTF-8?q?[2.10.0]bus=20=E4=BE=A7=E8=BE=B9=E6=A0=8F?=
 =?UTF-8?q?=E5=87=BA=E8=BD=A6/=E6=94=B6=E8=BD=A6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/model/TaxiModel.java     | 13 +++++++++++++
 .../src/main/res/layout/view_och_bus_operation.xml  |  1 +
 2 files changed, 14 insertions(+)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 1e774098a4..5a857daf4c 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -1297,10 +1297,23 @@ public class TaxiModel {
             queryOrderRouteList(mCurrentOCHOrder.orderNo);
         }
         Logger.d(M_TAXI + TAG, "--------mRoutePoints.size---------- " + mRoutePoints.size());
+
+        if (mRoutePoints.size() > 0){
+            reportTotalDisAndTime();
+        }
         //开启实时计算剩余距离，剩余时间，预计时间
         startOrStopCalculateRouteInfo(true);
     }
 
+    private void reportTotalDisAndTime() {
+        float lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(mRoutePoints);
+        double lastTime = lastSumLength / TaxiConst.TAXI_AVERAGE_SPEED * 3.6; //秒
+        if (mOrderStatusCallback != null) {
+            mOrderStatusCallback.onCurrentOrderDistToEndChanged((long) lastSumLength, (long) lastTime);
+        }
+        reportOrderRemain((long) lastSumLength, (long) lastTime);
+    }
+
     /**
      * 实时计算当前剩余里程和时间
      */
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
index d63245339c..34d3091b0b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
@@ -6,6 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="40px"
     android:paddingBottom="40px"
+    android:visibility="gone"
     tools:ignore="DuplicateIds">
 
     <View