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;
     // 距离当前车辆的距离

modules/mogo-module-common/src/main/res/drawable/module_commons_heart_ratingbar_drawable.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@android:id/background"
+        android:drawable="@drawable/icon_heart_unchoose">
+    </item>
+    <item
+        android:id="@android:id/secondaryProgress"
+        android:drawable="@drawable/icon_heart_second">
+    </item>
+    <item
+        android:id="@android:id/progress"
+        android:drawable="@drawable/icon_heart_choose">
+    </item>
+
+</layer-list>

modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="heart_ratingbar_width">17px</dimen>
+    <dimen name="heart_ratingbar_height">14px</dimen>
+</resources>

modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml

@@ -1054,5 +1054,7 @@
     <dimen name="sp_48">48px</dimen>
     <dimen name="module_common_shadow_width">-10px</dimen>
     <dimen name="module_common_shadow_width_pos">10px</dimen>
+    <dimen name="heart_ratingbar_width">31.9px</dimen>
+    <dimen name="heart_ratingbar_height">26px</dimen>
 
 </resources>

modules/mogo-module-common/src/main/res/values/dimens.xml

@@ -1045,4 +1045,6 @@
 	<dimen name="sp_48">26.2500px</dimen>
 	<dimen name="module_common_shadow_width">-8px</dimen>
 	<dimen name="module_common_shadow_width_pos">8px</dimen>
+	<dimen name="heart_ratingbar_width">16px</dimen>
+	<dimen name="heart_ratingbar_height">20px</dimen>
 </resources>

modules/mogo-module-common/src/main/res/values/styles.xml

@@ -14,4 +14,19 @@
         <item name="android:topDark">@android:color/transparent</item>
         <item name="android:borderlessButtonStyle">@android:color/transparent</item>
     </style>
+
+
+
+    <style name="customHeartHeartRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
+        <item name="android:minHeight">@dimen/heart_ratingbar_height</item>
+        <item name="android:maxHeight">@dimen/heart_ratingbar_height</item>
+        <item name="android:maxWidth">@dimen/heart_ratingbar_width</item>
+        <item name="android:minWidth">@dimen/heart_ratingbar_width</item>
+        <item name="android:numStars">5</item>
+        <item name="android:rating">1</item>
+        <item name="android:stepSize">0.5</item>
+        <item name="android:progressDrawable">@drawable/module_commons_heart_ratingbar_drawable</item>
+    </style>
+
+
 </resources>