From 27a4c4b12501334895665a5b62c99365cde96856 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 17 Jun 2025 17:54:11 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0]=20[fix]=20[=E5=B9=B3=E5=9D=87=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/charter/passenger/model/CharterPassengerModel.kt | 3 ++- .../mogo/och/common/module/constant/OchCommonConst.kt | 9 +++++++++ .../och/shuttle/weaknet/passenger/model/CommonModel.kt | 3 ++- .../ui/routing/routingrunning/RoutingRunningModel.kt | 3 ++- .../com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt | 3 ++- .../och/unmanned/passenger/model/TaxiPassengerModel.kt | 3 ++- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index 3e2ec0ebbe..c41d5cf874 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -52,6 +52,7 @@ import com.mogo.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.common.module.manager.socket.lan.LedScreenManager import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.biz.birdge.BridgeManager +import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.PinYinUtil import com.mogo.och.common.module.voice.VoiceNotice @@ -697,7 +698,7 @@ object CharterPassengerModel { } val lastTime: Double = - lastSumLength / CharterPassengerConst.Charter_AVERAGE_SPEED * 3.6 //秒 + lastSumLength / OchCommonConst.Charter_AVERAGE_SPEED * 3.6 //秒 d( M_BUS_P + "calculateDistance", diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt index 4bfbcd21d4..6a76f7839a 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt @@ -71,5 +71,14 @@ class OchCommonConst { const val AUTOMATIC_PLANNING_MAX_DISTANCE = 15 const val ARRIVE_AT_END_STATION_DISTANCE = 10 + + + //b1 b2 平均速度 bus的平均里程：25km/h + const val BUS_AVERAGE_SPEED = 25 + + //M1的平均里程：15km/h + const val Charter_AVERAGE_SPEED = 15 + //T1T2的平均里程：38km/h + const val TAXI_AVERAGE_SPEED = 38 } } \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt index bd046843e6..d8f10eab4d 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt @@ -25,6 +25,7 @@ import com.mogo.och.bridge.autopilot.location.OchLocationManager import com.mogo.och.bridge.distance.IDistanceListener import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.biz.birdge.BridgeManager +import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.download.DownloadManager import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener @@ -164,7 +165,7 @@ object CommonModel { private val trajectoryListener: IDistanceListener = object : IDistanceListener { override fun distanceCallback(distance: Float) { - val lastTime = distance / BusPassengerConst.BUS_AVERAGE_SPEED * 3.6 //秒 + val lastTime = distance / OchCommonConst.BUS_AVERAGE_SPEED * 3.6 //秒 d(TAG, "轨迹排查==lastSumLength = $distance") if (routesResult != null) { for (site in routesResult!!.sites) { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningModel.kt index 97ea4a7e0a..96cbb97a75 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningModel.kt @@ -16,6 +16,7 @@ import com.mogo.och.bridge.autopilot.line.ILineCallback import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.bridge.distance.IDistanceListener import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.unmanned.taxi.bean.ContrailBean import com.mogo.och.unmanned.taxi.bean.EndGrayContrailTaskReq @@ -91,7 +92,7 @@ class RoutingRunningModel : ViewModel(), IDistanceListener { override fun distanceCallback(distance: Float) { - val lastTime = distance / TaxiUnmannedConst.TAXI_AVERAGE_SPEED * 3.6 //秒 + val lastTime = distance / OchCommonConst.TAXI_AVERAGE_SPEED * 3.6 //秒 this.viewCallback?.showDistance(distance.toLong(),lastTime.toLong()) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index 61df40c1d9..689769189c 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -56,6 +56,7 @@ import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil.coordinateConverte import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.biz.order.IOrderListener import com.mogo.och.common.module.biz.order.OrderManager +import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.OCHThreadPoolManager import com.mogo.och.common.module.utils.ResourcesUtils @@ -469,7 +470,7 @@ object TaxiTaskModel { private val localCalculateDistanceListener: IDistanceListener = object : IDistanceListener { override fun distanceCallback(distance: Float) { - val lastTime = distance / TaxiUnmannedConst.TAXI_AVERAGE_SPEED * 3.6 //秒 + val lastTime = distance / OchCommonConst.TAXI_AVERAGE_SPEED * 3.6 //秒 d( TAG, "dynamicCalculateRouteInfo: lastSumLength=$distance, lastTime=$lastTime, threadName=Thread.currentThread().name" diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt index a76facd3ae..75284c0202 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt @@ -23,6 +23,7 @@ import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManage import com.mogo.och.bridge.distance.IDistanceListener import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.biz.birdge.BridgeManager +import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager @@ -314,7 +315,7 @@ object TaxiPassengerModel { override fun distanceCallback(distance: Float) { - val lastTime: Double = distance / TaxiPassengerConst.TAXI_AVERAGE_SPEED * 3.6 //秒 + val lastTime: Double = distance / OchCommonConst.TAXI_AVERAGE_SPEED * 3.6 //秒 for (callback in mOrderStatusCallbackMap.values) { callback.onCurrentOrderDistToEndChanged(