Merge branch 'master' into dev_robo_240612_6.5.0_tmp

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

@@ -113,7 +113,10 @@ class AutopilotControlParameters {
     var startLatLon: AutoPilotLonLat? = null
 
     @JvmField
-    var wayLatLons: List<AutoPilotLonLat>? = null
+    var wayLatLons: List<AutoPilotLonLat>? = null // Routing 给算路引擎使用的经停点列表，不是真正的要停车
+
+    @JvmField
+    var blackLatLons: List<AutoPilotLonLat>? = null // Routing 给算路引擎使用的黑名单点，目的是不参与算路
 
     @JvmField
     var endLatLon: AutoPilotLonLat? = null
@@ -139,6 +142,7 @@ class AutopilotControlParameters {
     @JvmField
     var autoPilotLine: AutoPilotLine? = null // 自动驾驶路线
 
+
     class AutoPilotLine {
         var lineId = 0L
         var lineName = ""
@@ -216,15 +220,20 @@ class AutopilotControlParameters {
     }
 
     override fun toString(): String {
-        return "AutopilotControlParameters{" +
-                "startName='" + startName + '\'' +
-                ", endName='" + endName + '\'' +
-                ", startLatLon=" + startLatLon +
-                ", wayLatLons=" + wayLatLons +
-                ", endLatLon=" + endLatLon +
-                ", speedLimit=" + speedLimit +
-                ", vehicleType=" + vehicleType +
-                ", isSpeakVoice=" + isSpeakVoice +
-                '}'
+        return "AutopilotControlParameters(" +
+                "startName='$startName', " +
+                "endName='$endName', " +
+                "startLatLon=$startLatLon, " +
+                "wayLatLons=$wayLatLons," +
+                "blackLatLons=$blackLatLons," +
+                "endLatLon=$endLatLon," +
+                "speedLimit=$speedLimit, " +
+                "vehicleType=$vehicleType, " +
+                "routeID=$routeID, " +
+                "routeName='$routeName', " +
+                "isSpeakVoice=$isSpeakVoice, " +
+                "autoPilotLine=$autoPilotLine)"
     }
+
+
 }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java

@@ -103,6 +103,12 @@ public class MogoServicePaths {
     @Keep
     public static final String PATH_VISUAL_ANGLE = "/map/angle_change";
 
+    @Keep
+    public static final String PATH_MAP_GLOBAL_TRAJECTORY = "/map/global_trajectory";
+
+    @Keep
+    public static final String PATH_MAP_ROUTE_GUIDE = "/map/route_guide";
+
     @Keep
     public static final String PATH_PATCH_UPGRADE = "/patch/api";