From a77976b07281638bf72a17e1cd259201e2e52914 Mon Sep 17 00:00:00 2001
From: pangfan <pangfan@zhidao.com>
Date: Sat, 30 Apr 2022 00:09:26 +0800
Subject: [PATCH] =?UTF-8?q?[Bus/Taxi=20d=20v2.6.6]=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E5=8F=82=E6=95=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0routeId=E3=80=81routeName=EF=BC=88=E5=90=8E=E7=BB=AD?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81BusMAP240=E5=A4=9A=E8=BD=A8=E8=BF=B9=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/bus/model/BusOrderModel.java   | 2 ++
 .../core/data/autopilot/AutopilotControlParameters.kt     | 8 ++++++++
 2 files changed, 10 insertions(+)

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的 开始自动驾驶 语音