Merge branch 'refs/heads/dev_robotaxi-d_240729_6.6.0' into dev_robotaxi-d_240807_6.6.0

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
@@ -808,6 +808,8 @@ message SetOneParam
                      // 16: 超车的最大速度阈值(double, m/s) T1/T2: 范围[3, 12.5], 默认值10
                      // 17: 故障模拟指令(int) default:0, 1:线控失效
                      // 18: 碰撞上报(null)
+                     // 19: 会车开关(bool) 0: off 1:on 默认0
+                     // 20: 超车开关(bool) 0: off 1:on 默认0
     string value = 2; // 转成字符串的值
 }
 

libraries/mogo-adas-data/src/main/proto/personal/adas_constants.proto

@@ -23,6 +23,8 @@ enum MapSystemParamType{
   OVERTAKE_MAX_SPEED = 16;//16: 超车的最大速度阈值(double, m/s, 范围[3, 12.5])
   FAULT_SIMULATION_CMD = 17;//17: 故障模拟指令(int) default:0(do nothing), 1:线控失效
   COLLISION_REPORTING = 18;//18: 碰撞上报(null)
+  PARK_VEH_CROSS = 19;//19: 会车开关(bool) 0: off 1:on 默认0
+  PARK_VEH_OVERTAKE = 20;//20: 超车开关(bool) 0: off 1:on 默认0
 }
 
 /**