yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.0.0/5.0.0]MessagePad.Line新增lineName字段:各业务更新接口（原Taxi）

Browse Source
This commit is contained in:
pangfan
2023-08-21 20:29:08 +08:00
committed by zhongchao
parent abec893d92
commit c32eeee0b2
6 changed files with 8 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrderQueryRespBean.java
View File

@@ -51,6 +51,7 @@ public class TaxiPassengerOrderQueryRespBean extends BaseData {
public String passengerNum;
public long lineId = -1; //路线id，默认-1
public String lineName = ""; //路线名称，默认""
public String csvFileUrl = ""; //轨迹文件下载的cos url，默认“”
public String csvFileMd5 = ""; //轨迹文件md5，默认“”
public String txtFileUrl = ""; //打点文件下载的cos url，默认“”

1
OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
View File

@@ -108,6 +108,7 @@ object AutopilotManager : IMoGoAutopilotStatusListener {
if (parameters.autoPilotLine == null) {
parameters.autoPilotLine = AutopilotControlParameters.AutoPilotLine(
TaxiPassengerModel.currentOCHOrder!!.lineId,
TaxiPassengerModel.currentOCHOrder!!.lineName,
TaxiPassengerModel.currentOCHOrder!!.csvFileUrl,
TaxiPassengerModel.currentOCHOrder!!.csvFileMd5,
TaxiPassengerModel.currentOCHOrder!!.txtFileUrl,

1
OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java
View File

@@ -52,6 +52,7 @@ public class OrderQueryRespBean extends BaseData {
//线路轨迹相关字段
public long lineId = -1; //路线id，默认-1
public String lineName = ""; //路线名称，默认""
public String csvFileUrl = ""; //轨迹文件下载的cos url，默认“”
public String csvFileMd5 = ""; //轨迹文件md5，默认“”
public String txtFileUrl = ""; //打点文件下载的cos url，默认“”

2
OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -1001,7 +1001,7 @@ public class TaxiModel {
parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(endWgsLat, endWgsLon);
if (parameters.autoPilotLine == null) {
parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine(
mCurrentOCHOrder.lineId,
mCurrentOCHOrder.lineId, mCurrentOCHOrder.lineName,
mCurrentOCHOrder.csvFileUrl, mCurrentOCHOrder.csvFileMd5,
mCurrentOCHOrder.txtFileUrl, mCurrentOCHOrder.txtFileMd5,
mCurrentOCHOrder.contrailSaveTime, mCurrentOCHOrder.carModel,

25
OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java
View File

@@ -41,7 +41,7 @@ public class TaxiTrajectoryManager {
private String mPrevOrderNo = "";
public TaxiTrajectoryManager() {
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1,
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(-1, "",
"", "", "", "", 0, "",
"", "", "", "", 0);
}
@@ -110,13 +110,14 @@ public class TaxiTrajectoryManager {
return;
} else {
if (mAutoPilotLine == null) {
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(order.lineId,
mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(order.lineId, order.lineName,
order.csvFileUrl, order.csvFileMd5, order.txtFileUrl, order.txtFileMd5,
order.contrailSaveTime, order.carModel,
order.csvFileUrlDPQP, order.csvFileMd5DPQP, order.txtFileUrlDPQP, order.txtFileMd5DPQP,
order.contrailSaveTimeDPQP);
} else {
mAutoPilotLine.setLineId(order.lineId);
mAutoPilotLine.setLineName(order.lineName);
mAutoPilotLine.setTrajUrl(order.csvFileUrl);
mAutoPilotLine.setTrajMd5(order.csvFileMd5);
mAutoPilotLine.setStopUrl(order.txtFileUrl);
@@ -135,6 +136,7 @@ public class TaxiTrajectoryManager {
private void clearAutoPilotLine() {
if (mAutoPilotLine == null) return;
mAutoPilotLine.setLineId(-1);
mAutoPilotLine.setLineName("");
mAutoPilotLine.setTrajUrl("");
mAutoPilotLine.setTrajMd5("");
mAutoPilotLine.setStopUrl("");
@@ -185,25 +187,6 @@ public class TaxiTrajectoryManager {
return;
}
// TODO: 2022/6/24
// test1
// mAutoPilotLine.setLineId(148);
// mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/e27c20c2da32481021d934c3ef084536/traj_148.csv");
// mAutoPilotLine.setTrajMd5("e27c20c2da32481021d934c3ef084536");
// mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/6224c9dd2c0e2bd990c6482c0464de45/stop_148.txt");
// mAutoPilotLine.setStopMd5("6224c9dd2c0e2bd990c6482c0464de45");
// mAutoPilotLine.setTimestamp(1654596000000L); //20220607 18:00
// mAutoPilotLine.setVehicleModel("红旗H9");
// test2
// mAutoPilotLine.setLineId(148);
// mAutoPilotLine.setTrajUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/8654497cf918be461a59c7ad8e22920d/traj_148.csv");
// mAutoPilotLine.setTrajMd5("8654497cf918be461a59c7ad8e22920d");
// mAutoPilotLine.setStopUrl("http://file-qa.zhidaozhixing.com/fileServer/upload/downloadFileStream?key=fileServer/online_car_hailing/1bb098b244922649bf3e7bada0d3950f/stop_148.txt");
// mAutoPilotLine.setStopMd5("1bb098b244922649bf3e7bada0d3950f");
// mAutoPilotLine.setTimestamp(1654761600000L); //20220609 16:00
// mAutoPilotLine.setVehicleModel("红旗H9");
CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine);
CallerLogger.INSTANCE.d(M_TAXI + TAG, "sendTrajectoryReq(): "
+ GsonUtils.toJson(mAutoPilotLine));

17
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt
View File

@@ -167,23 +167,6 @@ class AutopilotControlParameters {
this.vehicleModel = vehicleModel
}
constructor(lineId: Long, trajUrl: String, trajMd5: String, stopUrl: String, stopMd5: String,
timestamp: Long, vehicleModel: String, trajUrl_dpqp: String, trajMd5_dpqp: String,
stopUrl_dpqp: String, stopMd5_dpqp: String, timestamp_dpqp: Long) {
this.lineId = lineId
this.trajUrl = trajUrl
this.trajMd5 = trajMd5
this.stopUrl = stopUrl
this.stopMd5 = stopMd5
this.timestamp = timestamp
this.vehicleModel = vehicleModel
this.trajUrl_dpqp = trajUrl_dpqp
this.trajMd5_dpqp = trajMd5_dpqp
this.stopUrl_dpqp = stopUrl_dpqp
this.stopMd5_dpqp = stopMd5_dpqp
this.timestamp_dpqp = timestamp_dpqp
}
constructor(lineId: Long, lineName: String, trajUrl: String,
trajMd5: String, stopUrl: String, stopMd5: String, timestamp: Long, vehicleModel: String,
trajUrl_dpqp: String, trajMd5_dpqp: String, stopUrl_dpqp: String, stopMd5_dpqp: String, timestamp_dpqp: Long) {