diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt index ba11098e3f..639be5ed01 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt @@ -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)) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt index 3e5a5bc41a..c694040287 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/bean/TaxiDriverTaskWithOrderBean.kt @@ -278,7 +278,7 @@ data class TrajectoryListRespBean(var data: MutableList?) : BaseData() { } val tempblackPoints = mutableListOf() blackPoints?.forEach { - tempPassPoints.add(it.toBusStationBean()) + tempblackPoints.add(it.toBusStationBean()) } val result = ContraiInfo(lineId,csvFileUrl,csvFileMd5,txtFileUrl,txtFileMd5,contrailSaveTime,tempPassPoints,tempblackPoints,source) return result 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 f04724492d..61df40c1d9 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 @@ -1094,8 +1094,6 @@ object TaxiTaskModel { siteInfos = temp ) ) - traj.blackPoints?.clear() - traj.passPoints?.clear() LineManager.setContraiInfo(traj.toCommonContraiInfo()) } } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt index 2e9e75135a..138fdc3230 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/utils/TaxiTrajectoryManager.kt @@ -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!!!") diff --git a/gradle.properties b/gradle.properties index db35e5bc1f..433c0f1eb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 ########