Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9

# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java

@@ -143,6 +143,8 @@ public class V2XMessageEntity<T> implements Serializable {
         int ALERT_VOICE_CALL_FOR_LIVECAR_SHOW = 1_010;
         // 基于预判目的地道路事件的路线推荐
         int ALERT_RECOMMEND_ROUTE = 1_011;
+        // 基于预判目的地违章高发停车场推荐
+        int ALERT_RECOMMEND_PARKING = 1_012;
         // 推送VR消息展示
         int ALERT_PUSH_VR_SHOW = 2_000;
         // 自车求助
@@ -165,6 +167,7 @@ public class V2XMessageEntity<T> implements Serializable {
             V2XTypeEnum.ALERT_CAR_FOR_HELP,
             V2XTypeEnum.ALERT_VOICE_CALL_FOR_LIVECAR_SHOW,
             V2XTypeEnum.ALERT_RECOMMEND_ROUTE,
+            V2XTypeEnum.ALERT_RECOMMEND_PARKING,
             V2XTypeEnum.ALERT_PUSH_VR_SHOW,
             V2XTypeEnum.ALERT_OBU_EVENT,
     })

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XRecommendRouteEntity.java

@@ -1,9 +1,39 @@
 package com.mogo.module.common.entity;
 
+import java.util.List;
+
 /**
- * created by wujifei on 2020/12/24 15:33
+ * created by wujifei on 2020/12/31 18:45
  * describe:基于目的地预判的道路事件
  */
 public class V2XRecommendRouteEntity {
+    private List<Double> toPoint; //目的地坐标
+    private String formatAddress;  //目的地地址
+    private String tts;   //播报内容
 
+    public V2XRecommendRouteEntity(List<Double> toPoint, String formatAddress) {
+        this.toPoint = toPoint;
+        this.formatAddress = formatAddress;
+    }
+
+    public List<Double> getToPoint() {
+        return toPoint;
+    }
+
+    public void setToPoint(List<Double> toPoint) {
+        this.toPoint = toPoint;
+    }
+
+    public String getFormatAddress() {
+        return formatAddress;
+    }
+
+    public void setFormatAddress(String formatAddress) {
+        this.formatAddress = formatAddress;
+    }
+
+    public String getTts() {
+        tts = "主人，我发现前往" + formatAddress + "沿途有拥堵，推荐你导航最优路线，现在开启导航吗？";
+        return tts;
+    }
 }