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 2345c60145..29618d99cd 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 @@ -69,7 +69,12 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo { line.stopMd5 = it.stopMd5 line.stopUrl = it.stopUrl line.timestamp = it.timestamp - line.setVehicleModel(it.vehicleModel) + line.vehicleModel = it.vehicleModel + line.trajUrlDpqp = it.trajUrl_dpqp + line.trajMd5Dpqp = it.trajMd5_dpqp + line.stopUrlDpqp = it.stopUrl_dpqp + line.stopMd5Dpqp = it.stopMd5_dpqp + line.timestampDpqp = it.timestamp_dpqp } routeInfo.line = line.build() @@ -86,6 +91,11 @@ fun AutopilotControlParameters.AutoPilotLine.toAutoPilotLine(): MessagePad.Line line.stopUrl = this.stopUrl line.timestamp = this.timestamp line.vehicleModel = this.vehicleModel + line.trajUrlDpqp = this.trajUrl_dpqp + line.trajMd5Dpqp = this.trajMd5_dpqp + line.stopUrlDpqp = this.stopUrl_dpqp + line.stopMd5Dpqp = this.stopMd5_dpqp + line.timestampDpqp = this.timestamp_dpqp return line.build() } @@ -135,6 +145,11 @@ class AutopilotControlParameters { var stopMd5 = "" var timestamp = 0L var vehicleModel = "" + var trajUrl_dpqp = ""//轨迹文件下载的cos url,默认“” + var trajMd5_dpqp = ""//轨迹文件md5,默认“” + var stopUrl_dpqp = "" //打点文件下载的cos url,默认“” + var stopMd5_dpqp = "" //轨迹文件md5,默认“” + var timestamp_dpqp = 0L //上传轨迹完成时间戳(ms):用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖 constructor(lineId: Long, trajUrl: String, trajMd5: String, stopUrl: String, @@ -149,8 +164,23 @@ 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 + } + override fun toString(): String { - return "AutoPilotLine(lineId=$lineId, trajUrl='$trajUrl', trajMd5='$trajMd5', stopUrl='$stopUrl', stopMd5='$stopMd5', timestamp=$timestamp, vehicleModel='$vehicleModel')" + return "AutoPilotLine(lineId=$lineId, trajUrl='$trajUrl', trajMd5='$trajMd5', stopUrl='$stopUrl', stopMd5='$stopMd5', timestamp=$timestamp, vehicleModel='$vehicleModel', trajUrl_dpqp='$trajUrl_dpqp', trajMd5_dpqp='$trajMd5_dpqp', stopUrl_dpqp='$stopUrl_dpqp', stopMd5_dpqp='$stopMd5_dpqp', timestamp_dpqp=$timestamp_dpqp)" } }