整合了推送消息的展示到统一的V2XRoadEventAdapter.java

修复了测试推送的展示

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

@@ -1,7 +1,13 @@
 package com.mogo.module.common.entity;
 
 
+import androidx.annotation.IntDef;
+
 import java.io.Serializable;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.List;
 import java.util.Objects;
 
@@ -14,7 +20,8 @@ import java.util.Objects;
  */
 public class V2XEventShowEntity implements Serializable {
 
-    // 0---默认展示详情，1--直播，4--道路事件详情
+    // 0---默认展示详情，1--直播，
+    @ViewType
     private int viewType;
 
     // 道路事件详情
@@ -23,6 +30,8 @@ public class V2XEventShowEntity implements Serializable {
     private V2XLiveCarInfoEntity v2XLiveCarInfoRes;
     // 直播车机列表
     private List<V2XLiveCarInfoEntity> v2XLiveCarList;
+    // 推送信息展示
+    private V2XPushMessageEntity v2XPushMessageEntity;
 
     public int getViewType() {
         return viewType;
@@ -56,6 +65,14 @@ public class V2XEventShowEntity implements Serializable {
         this.v2XLiveCarList = v2XLiveCarList;
     }
 
+    public V2XPushMessageEntity getV2XPushMessageEntity() {
+        return v2XPushMessageEntity;
+    }
+
+    public void setV2XPushMessageEntity(V2XPushMessageEntity v2XPushMessageEntity) {
+        this.v2XPushMessageEntity = v2XPushMessageEntity;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -76,13 +93,23 @@ public class V2XEventShowEntity implements Serializable {
         return Objects.hash(viewType, v2XRoadEventEntity, v2XLiveCarInfoRes, v2XLiveCarList);
     }
 
-    @Override
-    public String toString() {
-        return "V2XEventShowEntity{" +
-                "viewType=" + viewType +
-                ", v2XRoadEventEntity=" + v2XRoadEventEntity +
-                ", v2XLiveCarInfoRes=" + v2XLiveCarInfoRes +
-                ", v2XLiveCarList=" + v2XLiveCarList +
-                '}';
+
+    @IntDef(value = {
+            V2XWindowTypeEnum.DEFAULT_WINDOW,
+            V2XWindowTypeEnum.LIVE_CAR_WINDOW,
+            V2XWindowTypeEnum.ROAD_EVENT_WINDOW,
+            V2XWindowTypeEnum.PUSH_EVENT_WINDOW,
+            V2XWindowTypeEnum.ANIMATION_WINDOW,
+            V2XWindowTypeEnum.FATIGUE_DRIVING_WINDOW,
+            V2XWindowTypeEnum.SEEK_HELP_WINDOW,
+            V2XWindowTypeEnum.ILLEGAL_PARK_WINDOW,
+    })
+    @Target({
+            ElementType.PARAMETER,
+            ElementType.FIELD,
+            ElementType.METHOD,
+    }) //表示注解作用范围，参数注解，成员注解，方法注解
+    @Retention(RetentionPolicy.SOURCE) //表示注解所存活的时间,在运行时,而不会存在 .class 文件中
+    public @interface ViewType { //接口，定义新的注解类型
     }
 }