From 3bb93ccffde3978db65c53a479799def7ea60c6e Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 22 Jun 2022 15:44:34 +0800 Subject: [PATCH] =?UTF-8?q?[Bus/Taxi=20driver=20v2.8.0]=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6action=E5=A2=9E=E5=8A=A0"?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E5=8F=82=E6=95=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/bean/BusRoutesResult.java | 16 ++++++---- .../com/mogo/och/bus/model/BusOrderModel.java | 30 ++++++++++++------- .../och/taxi/bean/OrderQueryRespBean.java | 12 ++++---- .../com/mogo/och/taxi/model/TaxiModel.java | 7 +++++ 4 files changed, 43 insertions(+), 22 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java index b2b722d02a..9d2f0e6657 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/BusRoutesResult.java @@ -16,12 +16,12 @@ public class BusRoutesResult { private int status; //线路轨迹相关字段 - public String csvFileUrl; //轨迹文件下载的cos url，默认“” - public String csvFileMd5; //轨迹文件md5，默认“” - public String txtFileUrl; //打点文件下载的cos url，默认“” - public String txtFileMd5; //轨迹文件md5，默认“” + 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），默认“”，暂不加入校验逻辑、用于人工排查问题 + public String carModel = ""; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题 public int getLineId() { return lineId; @@ -48,6 +48,12 @@ public class BusRoutesResult { ", lineType=" + lineType + ", description='" + description + '\'' + ", status=" + status + + ", csvFileUrl='" + csvFileUrl + '\'' + + ", csvFileMd5='" + csvFileMd5 + '\'' + + ", txtFileUrl='" + txtFileUrl + '\'' + + ", txtFileMd5='" + txtFileMd5 + '\'' + + ", contrailSaveTime=" + contrailSaveTime + + ", carModel='" + carModel + '\'' + '}'; } } 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 6f5eb5fea6..f82ab6af69 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 @@ -15,6 +15,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import com.amap.api.maps.model.LatLng; +import com.elegant.network.utils.GsonUtil; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.voice.AIAssist; @@ -508,20 +509,27 @@ public class BusOrderModel { // == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) { // ToastUtils.showShort("自动驾驶状态为不可用！"); // } - 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 + AutopilotControlParameters parameters = new AutopilotControlParameters(); + parameters.isSpeakVoice = !isRestart; + parameters.routeID = busRoutesResult.getLineId(); + parameters.routeName = busRoutesResult.getName(); + parameters.startName = PinYinUtil.getPinYinHeadChar(currentStation.getName()); + parameters.endName = PinYinUtil.getPinYinHeadChar(nextStation.getName()); + parameters.startLatLon = new AutopilotControlParameters .AutoPilotLonLat( currentStation.getLat(), currentStation.getLon() ); - currentAutopilot.endLatLon = new AutopilotControlParameters + parameters.endLatLon = new AutopilotControlParameters .AutoPilotLonLat( nextStation.getLat(), nextStation.getLon() ); - currentAutopilot.vehicleType = VEHICLE_TYPE; - CallerLogger.INSTANCE.d( M_BUS + TAG, "开启自动驾驶====" + currentAutopilot.toString() + parameters.vehicleType = VEHICLE_TYPE; + if (parameters.autoPilotLine == null) { + parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine( + busRoutesResult.getLineId(), + busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5, + busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5, + busRoutesResult.contrailSaveTime, busRoutesResult.carModel); + } + CallerLogger.INSTANCE.d( M_BUS + TAG, "开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) +" startLatLon="+currentStation.getName()+"，endLatLon="+nextStation.getName()); - CallerAutoPilotManager.INSTANCE.startAutoPilot(currentAutopilot); + CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters); triggerStartServiceEvent(isRestart, false); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java index 22c969090e..0c164b143a 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java @@ -51,13 +51,13 @@ public class OrderQueryRespBean extends BaseData { public String passengerNum; //线路轨迹相关字段 - public long lineId; //路线id，默认-1 - public String csvFileUrl; //轨迹文件下载的cos url，默认“” - public String csvFileMd5; //轨迹文件md5，默认“” - public String txtFileUrl; //打点文件下载的cos url，默认“” - public String txtFileMd5; //轨迹文件md5，默认“” + 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），默认“”，暂不加入校验逻辑、用于人工排查问题 + public String carModel = ""; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题 // !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km public double travelDistance; diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 2047065e57..79ab714604 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -872,6 +872,13 @@ public class TaxiModel { 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 + TAG, "start autopilot with parameter: %s", GsonUtil.jsonFromObject(parameters) + " ,startSiteName=" + mCurrentOCHOrder.startSiteAddr + " ,endSiteName=" + mCurrentOCHOrder.endSiteAddr);