From f35fb9a15e8be65600dafad92ee840e76d0cceca Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 24 Jun 2022 14:55:19 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi-d=20280,=20Taxi-p=20130]=20Taxi=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E5=90=AF=E5=8A=A8=E8=87=AA=E5=8A=A8=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6aciton=20=E5=A2=9E=E5=8A=A0=E8=BD=A8=E8=BF=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/bean/TaxiPassengerOrderQueryRespBean.java  | 7 +++++++
 .../och/taxi/passenger/model/TaxiPassengerModel.java     | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java
index c26eec8f05..0ea164e3bf 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java
@@ -50,6 +50,13 @@ public class TaxiPassengerOrderQueryRespBean extends BaseData {
         //订单多少乘客
         public String passengerNum;
 
+        public long lineId = -1; //路线id，默认-1
+        public String csvFileUrl = ""; //轨迹文件下载的cos url，默认“”
+        public String csvFileMd5 = ""; //轨迹文件md5，默认“”
+        public String txtFileUrl = ""; //打点文件下载的cos url，默认“”
+        public String txtFileMd5 = ""; //轨迹文件md5，默认“”
+        public long contrailSaveTime; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖
+        public String carModel = ""; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题
 
         // !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km
         public double travelDistance;
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
index 038e27f978..120bf0fae9 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
@@ -869,6 +869,15 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
         parameters.endName = PinYinUtil.getPinYinHeadChar(mCurrentOCHOrder.endSiteAddr); // 终点名称拼音首字母大写：科学城C区三号门（KXCCQSHM）
         parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(startWgsLat, startWgsLon);
         parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(endWgsLat, endWgsLon);
+
+        if (parameters.autoPilotLine == null) {
+            parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine(
+                    mCurrentOCHOrder.lineId,
+                    mCurrentOCHOrder.csvFileUrl, mCurrentOCHOrder.csvFileMd5,
+                    mCurrentOCHOrder.txtFileUrl, mCurrentOCHOrder.txtFileMd5,
+                    mCurrentOCHOrder.contrailSaveTime, mCurrentOCHOrder.carModel);
+        }
+
         CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters);
         CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "start autopilot with parameter: %s"
                 , GsonUtil.jsonFromObject(parameters)