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

Merge branch 'dev_robobus-d_241202_6.8.4_autopilot' into dev_robotaxi-d_250117_6.10.0

Browse Source 
# Conflicts:
#	OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
#	OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt
This commit is contained in:
yangyakun
2025-02-19 10:33:59 +08:00
parent 1a7d44eeb3 792e2d26b9
commit fed9d1d1b0
5 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt
View File

@@ -160,8 +160,7 @@ object BusTrajectoryManager : ITrajectoryListListener {
"轨迹监控",
"sendTrajectoryReq() 下发轨迹 轨迹id:${it.autoPilotLine!!.lineId}"
)
CallerAutoPilotControlManager.sendTrajectoryDownloadReq(it.autoPilotLine!!, 0,
it.orderId)
CallerAutoPilotControlManager.sendTrajectoryDownloadReq(it, 0)
}
d(TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutopilotControlParameters))

2
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt
View File

@@ -278,7 +278,7 @@ data class TrajectoryListRespBean(var data: MutableList<Result>?) : BaseData() {
}
val tempblackPoints = mutableListOf<BusStationBean>()
blackPoints?.forEach {
tempPassPoints.add(it.toBusStationBean())
tempblackPoints.add(it.toBusStationBean())
}
val result = ContraiInfo(lineId,csvFileUrl,csvFileMd5,txtFileUrl,txtFileMd5,contrailSaveTime,tempPassPoints,tempblackPoints,source)
return result

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

@@ -1094,8 +1094,6 @@ object TaxiTaskModel {
siteInfos = temp
)
)
traj.blackPoints?.clear()
traj.passPoints?.clear()
LineManager.setContraiInfo(traj.toCommonContraiInfo())
}
}

6
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt
View File

@@ -238,9 +238,8 @@ object TaxiTrajectoryManager : ITrajectoryListListener {
"sendTrajectoryReq() 下发轨迹 轨迹id：${mAutopilotControlParameters?.autoPilotLine?.lineId}"
)
CallerAutoPilotControlManager.sendTrajectoryDownloadReq(
mAutopilotControlParameters!!.autoPilotLine!!,
mAutopilotControlParameters!!,
COMMON_LOADING,
mAutopilotControlParameters!!.orderId
)
} else {
e(TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!")
@@ -249,9 +248,8 @@ object TaxiTrajectoryManager : ITrajectoryListListener {
if (mPreAutopilotControlParameters != null && mPreAutopilotControlParameters?.autoPilotLine != null) {
printInfoMsg("[下发预加载轨迹] sendTrajectoryDownloadReq, lindId=" + mPreAutopilotControlParameters?.autoPilotLine?.lineId + ", lineName=" + mPreAutopilotControlParameters?.autoPilotLine?.lineName)
CallerAutoPilotControlManager.sendTrajectoryDownloadReq(
mPreAutopilotControlParameters!!.autoPilotLine!!,
mPreAutopilotControlParameters!!,
PRE_LOADING,
mPreAutopilotControlParameters!!.orderId
)
} else {
e(TAG, "sendTrajectoryReq(): mPreAutoPilotLine is null!!!")

16
gradle.properties
View File

@@ -64,21 +64,21 @@ bytex.ASM_API=ASM7
LOGLIB_VERSION=1.10.18
######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION
MOGO_NETWORK_VERSION=1.4.7.59
MOGO_NETWORK_VERSION=1.4.7.58
# 鉴权
MOGO_PASSPORT_VERSION=1.4.7.59
MOGO_PASSPORT_VERSION=1.4.7.58
# 长链接
MOGO_SOCKET_VERSION=1.4.7.59
MOGO_SOCKET_VERSION=1.4.7.58
# 数据采集
MOGO_REALTIME_VERSION=1.4.7.59
MOGO_REALTIME_VERSION=1.4.7.58
# 直播推流
MOGO_LIVE_VERSION=1.4.7.59
MOGO_LIVE_VERSION=1.4.7.58
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.4.7.59
MOGO_TRAFFICLIVE_VERSION=1.4.7.58
# 定位服务
MOGO_LOCATION_VERSION=1.4.7.59
MOGO_LOCATION_VERSION=1.4.7.58
# 远程通讯模块
MOGO_TELEMATIC_VERSION=1.4.7.59
MOGO_TELEMATIC_VERSION=1.4.7.58
# 动态换肤SDK
MOGO_SKIN_VERSION=1.4.7.50
######## MogoAiCloudSDK Version ########