From 0cced718cf5add4825b8c29095362e9edd5b9615 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 17 Mar 2023 22:19:08 +0800
Subject: [PATCH] =?UTF-8?q?[M2]=20=E6=8E=A5=E9=A9=B3/M2=E5=89=A9=E4=BD=99?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97=E5=B9=B3=E5=9D=87=E8=BD=A6?=
 =?UTF-8?q?=E9=80=9F=E8=AE=BE=E4=B8=BA10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/model/BusPassengerModel.java    | 11 ++++++++++-
 .../mogo/och/bus/passenger/model/PM2DrivingModel.kt   |  2 +-
 .../och/bus/passenger/constant/BusPassengerConst.kt   |  2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
index 1dab9a42e5..7c3188a307 100644
--- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -494,7 +494,8 @@ public class BusPassengerModel {
                 }else {
                     lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints);
                 }
-                double lastTime = lastSumLength / BusPassengerConst.BUS_AVERAGE_SPEED * 3.6 ; //秒
+
+                double lastTime = lastSumLength / getAverageSpeed() * 3.6 ; //秒
                 CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==lastSumLength = " + lastSumLength);
                 if (mAutopilotPlanningCallback != null){
                     mAutopilotPlanningCallback.routePlanningToNextStationChanged((long)lastSumLength,(long) lastTime);
@@ -503,6 +504,14 @@ public class BusPassengerModel {
         }
     }
 
+    public int getAverageSpeed(){
+        if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
+            return BusPassengerConst.SHUTTLE_AVERAGE_SPEED;
+        }else {
+            return BusPassengerConst.BUS_AVERAGE_SPEED;
+        }
+    }
+
     public void startRemainRouteInfo() {
         //开启实时计算剩余距离，剩余时间，预计时间
         startOrStopCalculateRouteInfo(true);
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
index 49643dc157..9435100f7f 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -443,7 +443,7 @@ class PM2DrivingModel private constructor() {
                 } else {
                     CoordinateCalculateRouteUtil.calculateRouteSumLength(lastPoints)
                 }
-                val lastTime = lastSumLength / BusPassengerConst.BUS_AVERAGE_SPEED * 3.6 //秒
+                val lastTime = lastSumLength / BusPassengerConst.SHUTTLE_AVERAGE_SPEED * 3.6 //秒
                 d(SceneConstant.M_BUS_P + TAG, "och-rotting==lastSumLength = $lastSumLength")
                 mDrivingInfoCallback?.updateRemainMT(
                         lastSumLength.toLong(),
diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
index f2f8552625..88fbdc0127 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
@@ -27,6 +27,8 @@ class BusPassengerConst {
 
         //bus平均速度 bus的平均里程：25km/h
         const val BUS_AVERAGE_SPEED = 25
+        //接驳/B2平均速度 bus的平均里程：10km/h
+        const val SHUTTLE_AVERAGE_SPEED = 10
 
         // 订单总里程
         const val BUS_SP_KEY_ORDER_SUM_DIS = "BUS_SP_KEY_ORDER_SUM_DIS"