diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index 397415d193..33515d6cb1 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -481,6 +481,8 @@ public class BusOrderModel { // } AutopilotControlParameters currentAutopilot = new AutopilotControlParameters(); currentAutopilot.isSpeakVoice = !isRestart; + currentAutopilot.routeID = busRoutesResult.getLineId(); + currentAutopilot.routeName = busRoutesResult.getName(); currentAutopilot.startName = PinYinUtil.getPinYinHeadChar(currentStation.getName()); currentAutopilot.endName = PinYinUtil.getPinYinHeadChar(nextStation.getName()); currentAutopilot.startLatLon = new AutopilotControlParameters 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 8fda6801ab..4c7f594317 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 @@ -50,6 +50,10 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo{ locBuilder.longitude = it.lon routeInfo.addWayPoints(locBuilder.build()) } + if (this.routeID > 0) { + routeInfo.routeID = this.routeID + } + routeInfo.routeName = this.routeName routeInfo.startName = this.startName routeInfo.endName = this.endName routeInfo.vehicleType = this.vehicleType @@ -76,6 +80,10 @@ class AutopilotControlParameters { @JvmField var vehicleType // 运营类型 = 0 + @JvmField + var routeID = 0 //线路id(bus用) + @JvmField + var routeName = "" //线路名称(bus用) /** * 是否播放adas的 开始自动驾驶 语音