From bed670fce3ce727f877cd51bed8a9f68f5c68e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 10 Mar 2020 13:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/common/entity/MarkerCarInfo.java   | 64 +++++++++++++++++--
 .../module/common/entity/MarkerUserInfo.java  | 19 ++++--
 2 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
index 5ab642db01..6c890c7e6e 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
+++ b/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 + '\'' +
+                    '}';
+        }
     }
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
index e13d18d782..6e8afdce87 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
+++ b/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 + '\'' +
                 '}';
     }
 }