Merge branch 'master' into dev_robo_240612_6.5.0_tmp

libraries/mogo-adas-data/src/main/proto/message_pad.proto

@@ -201,7 +201,7 @@ message CongestionInfo
   double lon = 11;
   double lat = 12;
   // 视频地址 2024-06-03新增字段
-  string video_url = 13; 
+  string video_url = 13;
   // 来源ip 2024-06-03 新增字段
   string camera_ip = 14;
 }
@@ -251,7 +251,7 @@ message TrajectoryPoint
 // message definition for MsgTypeCloudRegulatoryWarning
 message CloudRegulatoryWarning
 {
-    repeated CloudRegulatoryWarningInner cloudRegulatoryWarnings = 1; 
+    repeated CloudRegulatoryWarningInner cloudRegulatoryWarnings = 1;
 }
 
 message CloudRegulatoryWarningInner
@@ -314,7 +314,7 @@ message TrackedObject
     AdditionalAttribute add_attribute = 17; //事件类型
     double angle = 18; //相对于自车x轴的角度，左正右负
     repeated string image_url = 19; //事件发生的原始照片
-    string video_url = 20; //事件发生的原始视频 
+    string video_url = 20; //事件发生的原始视频
     string camera_ip = 21; //来源IP
     uint64 detect_start_time = 22; //V2N事件生成UTC时间，单位毫秒
     string v2x_uuid = 23; //V2X目标uuid
@@ -428,6 +428,8 @@ message TrajectoryDownloadReq
     Line line = 1; //路线
     uint32 source = 2; //指令来源: 0: default, 1:pad, 2:aicloud
     uint32 downloadType = 3; //下载类型: 0:正常下载 1:预下载
+
+    RouteInfo routeInfo = 4; //20240523 进行自动算路，务必下单时候携带自动驾驶路径信息，否则可不填！（Line信息重复）
 }
 
 // message definition for MessageType: MsgTypeBasicInfoReq
@@ -453,6 +455,8 @@ message Location
     double latitude = 2;
     double altitude = 3;
     double heading = 4;
+
+    bool station = 5;  //20240523， 判断此点是中间站点还是途径点 ------- true：站点， false：简单的途径点
 }
 
 message RouteInfo
@@ -467,7 +471,10 @@ message RouteInfo
     bool isSpeakVoice = 8; //abandoned
     uint32 routeID = 9;
     string routeName = 10;
-    Line line = 11; //路线信息
+    Line line = 11; //路线信息，原有轨迹线路信息
+
+    repeated Location blackPoints = 12; //20240523  不让走的道路，异常线路点
+    bool isStation = 13; //20240523  用于表示判断是否是站点下单。默认false：起点下单，接管下单； true: 中间站点下单
 }
 
 message SetAutopilotModeReq