Merge branch 'dev_robotaxi-d_240227_6.3.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240227_6.3.0

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/WeatherController.kt

@@ -27,9 +27,12 @@ class WeatherController(mapAutoView: MapAutoView): IWeatherController {
     // Set of rain weather conditions
     val rainSet = setOf("小雨", "中雨", "大雨", "暴雨", "大暴雨", "特大暴雨", "雨")
     // Set of snow weather conditions
-    val snowSet = setOf("小雪", "中雪", "大雪", "暴雪", "雪")
+    val snowSet = setOf("雪", "阵雪", "小雪", "中雪", "大雪", "暴雪", "小雪-中雪", "中雪-大雪", "大雪-暴雪")
     // Set of cloudy weather conditions
-    val cloudySet = setOf("阴", "多云")
+    val cloudySet = setOf("阴", "多云" ,"小雨", "中雨", "大雨", "暴雨", "大暴雨", "特大暴雨", "雨",
+        "阵雨", "雷阵雨" ,"雷阵雨并伴有冰雹", "强阵雨", "强雷阵雨", "极端降雨", "毛毛雨/细雨", "小雨-中雨", "中雨-大雨",
+        "大雨-暴雨","暴雨-大暴雨","大暴雨-特大暴雨","雨雪天气","雨夹雪","阵雨夹雪","冻雨","雾","浓雾","强浓雾","大雾","特强浓雾")
+
 
     private val mWeatherRepository by lazy { WeatherRepository() }
     private var mLastUpdateTime: Long = 0

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

@@ -17,6 +17,7 @@ enum LightState {
   STATE_YELLOW = 2;
   STATE_GREEN = 3;
   STATE_FLASH = 4;//闪烁
+  STATE_OFF_FUSION = 5;
 }
 
 message TrafficLight {
@@ -24,6 +25,7 @@ message TrafficLight {
   optional LightType type = 2 [default = TYPE_DEFAULT];//灯所处的车道类型
   optional LightState state = 3 [default = STATE_OFF];//灯态
   optional float duration = 4; // seconds since the last state changed
+  optional LightState next_state = 5 [default = STATE_OFF_FUSION];
 }
 
 //触发方式：120m以内会有信号，但远的时候可能不准，越近越准
@@ -35,4 +37,7 @@ message TrafficLights {
   optional TrafficLight left = 3;//左转灯
   optional TrafficLight right = 4;//右转灯
   optional TrafficLight u_turn = 5;//掉头灯
+
+  optional bool shield = 6 [default = false];//wheather the traffic lights are shield
+  optional uint32 source = 7 [default = 0]; // 0: vehicle, 1:V2I, 2: V2N
 }