增加了在线车辆的数据字段

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

@@ -11,6 +11,8 @@ public class MarkerCarInfo implements Serializable {
 
     private String carBrandLogoUrl;
     private String carTypeName;
+    private String carType;
+    private CarLive carLive;
 
     public String getCarBrandLogoUrl() {
         if (TextUtils.isEmpty(carBrandLogoUrl)) {
@@ -34,11 +36,61 @@ public class MarkerCarInfo implements Serializable {
         this.carTypeName = carTypeName;
     }
 
-    @Override
-    public String toString() {
-        return "MarkerCarInfo{" +
-                "carBrandLogoUrl='" + carBrandLogoUrl + '\'' +
-                ", carTypeName='" + carTypeName + '\'' +
-                '}';
+    public String getCarType() {
+        return carType;
+    }
+
+    public void setCarType(String carType) {
+        this.carType = carType;
+    }
+
+    public CarLive getCarLive() {
+        return carLive;
+    }
+
+    public void setCarLive(CarLive carLive) {
+        this.carLive = carLive;
+    }
+
+    class CarLive implements Serializable {
+        //rtmp视频直播地址rtmp://
+        private String videoUrl;
+        //直播频道【直播心跳接口参数】C_1
+        private String videoChannel;
+        //直播源sn【直播心跳接口参数】XTCBA90740400625
+        private String videoSn;
+
+        public String getVideoUrl() {
+            return videoUrl;
+        }
+
+        public void setVideoUrl(String videoUrl) {
+            this.videoUrl = videoUrl;
+        }
+
+        public String getVideoChannel() {
+            return videoChannel;
+        }
+
+        public void setVideoChannel(String videoChannel) {
+            this.videoChannel = videoChannel;
+        }
+
+        public String getVideoSn() {
+            return videoSn;
+        }
+
+        public void setVideoSn(String videoSn) {
+            this.videoSn = videoSn;
+        }
+
+        @Override
+        public String toString() {
+            return "CarLive{" +
+                    "videoUrl='" + videoUrl + '\'' +
+                    ", videoChannel='" + videoChannel + '\'' +
+                    ", videoSn='" + videoSn + '\'' +
+                    '}';
+        }
     }
 }

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

@@ -16,6 +16,9 @@ public class MarkerUserInfo implements Serializable {
     private String gender;//gender": "男｜女｜无（也可以0｜1｜2根据实际库存返回即可）
     private Integer age;// 年龄段，可以为空，与车聊聊一致
 
+    // TODO V2X临时字段，接口出好后进行修改
+    private String userDrivingLevel;//用户驾驶级别，老司机、安全驾驶、危险驾驶
+
     public void setAge(Integer age) {
         this.age = age;
     }
@@ -150,16 +153,24 @@ public class MarkerUserInfo implements Serializable {
         this.userName = userName;
     }
 
+    public String getUserDrivingLevel() {
+        return userDrivingLevel;
+    }
+
+    public void setUserDrivingLevel(String userDrivingLevel) {
+        this.userDrivingLevel = userDrivingLevel;
+    }
 
     @Override
     public String toString() {
         return "MarkerUserInfo{" +
-                "age=" + age +
-                ", gender='" + gender + '\'' +
-                ", sn='" + sn + '\'' +
-                ", userHead='" + userHead + '\'' +
+                "sn='" + sn + '\'' +
                 ", userId=" + userId +
                 ", userName='" + userName + '\'' +
+                ", userHead='" + userHead + '\'' +
+                ", gender='" + gender + '\'' +
+                ", age=" + age +
+                ", userDrivingLevel='" + userDrivingLevel + '\'' +
                 '}';
     }
 }