[2.13.0-arhc-opt] merge

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoFragmentPaths.java

@@ -15,13 +15,6 @@ public class MoGoFragmentPaths {
     @Deprecated
     public static final String PATH_FRAGMENT_MAP = "/hd_map_ui/";
 
-    /**
-     * HMI Fragment
-     */
-    @Keep
-    @Deprecated
-    public static final String PATH_FRAGMENT_HMI = "/hmi_ui/";
-
     /**
      * 小地图 Fragment
      */

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java

@@ -60,6 +60,12 @@ public class MogoServicePaths {
     @Keep
     public static final String PATH_DEVA_TOOLS = "/deva/tools";
 
+    /**
+     * HMI Fragment
+     */
+    @Keep
+    public static final String PATH_FRAGMENT_HMI = "/hmi_ui/";
+
     /**
      * 地图数据更新输助类
      */

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XMessageEntity.java

@@ -27,12 +27,6 @@ public class V2XMessageEntity<T> implements Serializable {
     @MessageType
     int type;
 
-    /**
-     * 是否展示对话框
-     * true-展示，false-不展示
-     */
-    boolean showState;
-
     /**
      * 是否需要判断重复事件
      * true-判断，false-不判断
@@ -40,9 +34,6 @@ public class V2XMessageEntity<T> implements Serializable {
      */
     boolean isNeedCompareSameScenario = true;
 
-    //是否播报tts
-    private boolean onlyShow = false;
-
     //本机与事件是否连线
     private boolean needAddLine = true;
 
@@ -59,14 +50,6 @@ public class V2XMessageEntity<T> implements Serializable {
         this.type = type;
     }
 
-    public boolean isShowState() {
-        return showState;
-    }
-
-    public void setShowState(boolean showState) {
-        this.showState = showState;
-    }
-
     public boolean isNeedCompareSameScenario() {
         return isNeedCompareSameScenario;
     }
@@ -97,14 +80,6 @@ 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;
     }
@@ -202,9 +177,7 @@ public class V2XMessageEntity<T> implements Serializable {
     public String toString() {
         return "V2XMessageEntity{" +
                 "type=" + type +
-                ", showState=" + showState +
                 ", isNeedCompareSameScenario=" + isNeedCompareSameScenario +
-                ", onlyShow=" + onlyShow +
                 ", needAddLine=" + needAddLine +
                 ", content=" + content +
                 '}';