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 29618d99cd..76b0986708 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 @@ -64,6 +64,7 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo { val line = MessagePad.Line.newBuilder() this.autoPilotLine?.let { line.lineId = it.lineId + line.lineName = it.lineName line.trajMd5 = it.trajMd5 line.trajUrl = it.trajUrl line.stopMd5 = it.stopMd5 @@ -85,6 +86,7 @@ fun AutopilotControlParameters.toRouteInfo(): MessagePad.RouteInfo { fun AutopilotControlParameters.AutoPilotLine.toAutoPilotLine(): MessagePad.Line { val line = MessagePad.Line.newBuilder() line.lineId = this.lineId + line.lineName = this.lineName line.trajMd5 = this.trajMd5 line.trajUrl = this.trajUrl line.stopMd5 = this.stopMd5 @@ -139,6 +141,7 @@ class AutopilotControlParameters { class AutoPilotLine { var lineId = 0L + var lineName = "" var trajUrl = "" var trajMd5 = "" var stopUrl = "" @@ -164,7 +167,9 @@ 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) { + 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 @@ -179,8 +184,29 @@ class AutopilotControlParameters { 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) { + this.lineId = lineId + this.lineName = lineName + 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', trajUrl_dpqp='$trajUrl_dpqp', trajMd5_dpqp='$trajMd5_dpqp', stopUrl_dpqp='$stopUrl_dpqp', stopMd5_dpqp='$stopMd5_dpqp', timestamp_dpqp=$timestamp_dpqp)" + return "AutoPilotLine(lineId=$lineId, lineName=$lineName, 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)" } }