yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[8.1.0]

Browse Source 
[fix]
[平均速度变更]
This commit is contained in:
yangyakun
2025-06-17 17:54:11 +08:00
parent f566104228
commit 27a4c4b125
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
View File

@@ -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",

9
OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt
View File

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

3
OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt
View File

@@ -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) {

3
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningModel.kt
View File

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

3
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
View File

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

3
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt
View File

@@ -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(