diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt index 6812d543db..2d728023e7 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt @@ -44,9 +44,9 @@ import kotlin.properties.Delegates object LineManager : CallerBase() { const val TAG = M_OCHCOMMON+"LineManager" - const val firstStationFirstStartAutopilotFlag = 1 - const val middleStationFirstStartAutopilotFlag = 2 - const val norFirstStartAutopilotFlag = 3 + const val firstStationFirstStartAutopilotFlag = 0 + const val middleStationFirstStartAutopilotFlag = 1 + const val norFirstStartAutopilotFlag = 2 /** * 线路信息 @@ -393,6 +393,7 @@ object LineManager : CallerBase() { parameters?.endLatLon = AutoPilotLonLat(end.lat, end.lon) parameters?.vehicleType = 10 parameters?.orderId = this.teleOrderId + parameters?.firstStationFlag = autopilotFlag parameters?.firstAutopilotFlag = teleIsFirstStartAutopilot if (parameters?.autoPilotLine == null) { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index 54c899a533..1013e929a5 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -411,15 +411,20 @@ class MoGoAutopilotControlProvider : } private fun startAutoPilot(controlParameters: AutopilotControlParameters, source: Int): Long { + val startPosType = if(controlParameters.firstStationFlag==null){ + null + }else{ + MessagePad.StartPosType.forNumber(controlParameters.firstStationFlag!!) + } if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { val invokeResult = AdasManager.getInstance() - .sendAutoPilotModeReq(1, source, controlParameters.toRouteInfo(), controlParameters.toAutoPilotCmdInfo(), null) + .sendAutoPilotModeReq(1, source, controlParameters.toRouteInfo(), controlParameters.toAutoPilotCmdInfo(), startPosType) invokeAutoPilotResult(if (invokeResult > -1) "自动驾驶调用成功:${invokeResult}" else "自动驾驶调用失败, socket 或者 rawPack 可能为空") return invokeResult } else { if (AdasManager.getInstance().ipcConnectionStatus == AdasConstants.IpcConnectionStatus.CONNECTED) { val invokeResult = AdasManager.getInstance() - .sendAutoPilotModeReq(1, source, controlParameters.toRouteInfo(), controlParameters.toAutoPilotCmdInfo(), null) + .sendAutoPilotModeReq(1, source, controlParameters.toRouteInfo(), controlParameters.toAutoPilotCmdInfo(), startPosType) invokeAutoPilotResult(if (invokeResult > -1) "自动驾驶调用成功:${invokeResult}" else "自动驾驶调用失败, socket 或者 rawPack 可能为空") return invokeResult } else { diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt index 6ea711c1bd..0920a33ac3 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt @@ -166,6 +166,9 @@ class AutopilotControlParameters { @JvmField var orderId = ""//订单号 + @JvmField + var firstStationFlag: Int? = null + class AutoPilotLine { var lineId = 0L @@ -284,6 +287,7 @@ class AutopilotControlParameters { "isSpeakVoice=$isSpeakVoice, " + "orderId=$orderId, " + "firstAutopilotFlag=$firstAutopilotFlag, " + + "firstStationFlag=$firstStationFlag, " + "autoPilotLine=$autoPilotLine)" }