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 e50a17f0b3..404483b968 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 @@ -1081,6 +1081,8 @@ object TaxiTaskModel { mCurrentTaskTrajectory = it.first { currentTaskLineId == it.lineId } mCurrentTaskTrajectory?.let {traj-> LineManager.setLineInfo(LineInfo(traj.lineId,traj.lineName, orderId = mCurrentTaskWithOrder?.order?.orderNo?:"")) + traj.blackPoints?.clear() + traj.passPoints?.clear() LineManager.setContraiInfo(traj.toCommonContraiInfo()) } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt index 9ebc7395fa..25d3c0caac 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt @@ -155,6 +155,12 @@ object AutopilotManager : IOchAutopilotStatusListener { AutopilotControlParameters.AutoPilotLonLat(startWgsLat, startWgsLon) parameters.endLatLon = AutopilotControlParameters.AutoPilotLonLat(endWgsLat, endWgsLon) + val startSiteId = TaxiPassengerModel.currentOCHOrder?.orderStartSite?.siteId?:0L + val endSiteId = TaxiPassengerModel.currentOCHOrder?.orderEndSite?.siteId?:0L + val orderNo = TaxiPassengerModel.currentOCHOrder?.orderNo?:0L + val lineId = TaxiPassengerModel.currentOCHOrder?.orderLine?:"" + parameters.orderId = "${lineId}_${startSiteId}_${endSiteId}_${orderNo}" + // TODO 这里需要增加传入 白名单点列表、黑名单点列表,顺序按照服务端传入顺序为准。 //parameters.wayLatLons //parameters.blackLatLons