Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml

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

@@ -33,6 +33,19 @@ public class V2XMessageEntity<T> implements Serializable {
      */
     boolean showState;
 
+    /**
+     * 是否需要判断重复事件
+     * true-判断，false-不判断
+     * 默认需要判断
+     */
+    boolean isNeedCompareSameScenario = true;
+
+    //是否播报tts
+    private boolean onlyShow = false;
+
+    //本机与事件是否连线
+    private boolean needAddLine = true;
+
     /**
      * 场景具体的数据内容
      */
@@ -54,6 +67,14 @@ public class V2XMessageEntity<T> implements Serializable {
         this.showState = showState;
     }
 
+    public boolean isNeedCompareSameScenario() {
+        return isNeedCompareSameScenario;
+    }
+
+    public void setNeedCompareSameScenario(boolean needCompareSameScenario) {
+        isNeedCompareSameScenario = needCompareSameScenario;
+    }
+
     public T getContent() {
         return content;
     }
@@ -76,6 +97,22 @@ public class V2XMessageEntity<T> implements Serializable {
         return Objects.hash(type, content);
     }
 
+    public boolean isOnlyShow() {
+        return onlyShow;
+    }
+
+    public void setOnlyShow(boolean onlyShow) {
+        this.onlyShow = onlyShow;
+    }
+
+    public boolean isNeedAddLine() {
+        return needAddLine;
+    }
+
+    public void setNeedAddLine(boolean needAddLine) {
+        this.needAddLine = needAddLine;
+    }
+
     /**
      * V2X 场景类型
      */

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

@@ -24,6 +24,7 @@ public class V2XRoadEventEntity implements Serializable {
     private MarkerExploreWay noveltyInfo;
     // tts 提示
     private String tts;
+
     // ADAS 展示文案
     private String alarmContent;
     // 距离当前车辆的距离