对接8.10

src/main/java/com/cusc/adas/v2x/assist/dto/TrafficLightDto.java

@@ -3,6 +3,7 @@ package com.cusc.adas.v2x.assist.dto;
 import java.util.List;
 
 /**
+ * 云端辅助功能信息
  * 信号灯
  * @author huangml
  *

src/main/java/com/cusc/adas/v2x/clouddecision/dto/AutoSpeedLimitDto.java

@@ -23,5 +23,7 @@ public class AutoSpeedLimitDto {
 //	@RefNumFlag(value="laneNum")
     private List<SpeedLimitDto> speedLmt;
 
-
+    public List<SpeedLimitDto> getSpeedLmt() {
+        return speedLmt;
+    }
 }

src/main/java/com/cusc/adas/v2x/clouddecision/dto/RSISDetailDto.java

@@ -51,5 +51,7 @@ public class RSISDetailDto {
 
     private String userdefinedData;
 
-
+    public int getEventType() {
+        return eventType;
+    }
 }

src/main/java/com/cusc/adas/v2x/clouddecision/dto/RSIWarnningDto.java

 package com.cusc.adas.v2x.clouddecision.dto;
 
-import com.cusc.adas.v2x.utils.Order;
-
 /**
  * 通用 RSI 预警
  * @author huangml

src/main/java/com/cusc/adas/v2x/clouddecision/dto/SpeedLimitDto.java

@@ -11,4 +11,8 @@ public class SpeedLimitDto {
 	private short laneId;
 	//限速值
 	private short speedLimit;
+
+	public short getSpeedLimit() {
+		return speedLimit;
+	}
 }

src/main/java/com/cusc/adas/v2x/events/SelfDefineEvent.kt

+package com.cusc.adas.v2x.events
+
+import com.cusc.adas.v2x.selfdefine.dto.SelfDefineDetailDto
+
+class SelfDefineEvent {
+    var selfDefineDetailDto: SelfDefineDetailDto?=null
+}
\ No newline at end of file

src/main/java/com/cusc/adas/v2x/events/VehAdviceEvent.kt

@@ -5,4 +5,5 @@ import com.cusc.adas.v2x.clouddecision.dto.VehAdviceDto
 class VehAdviceEvent {
     var vehAdviceDto: VehAdviceDto<Any>? = null
 
+
 }
\ No newline at end of file

src/main/java/com/cusc/adas/v2x/selfdefine/dto/SelfDefineDetailDto.java

 package com.cusc.adas.v2x.selfdefine.dto;
 
 import com.cusc.adas.v2x.dto.PositionDto;
-import com.cusc.adas.v2x.utils.FieldDef;
-import com.cusc.adas.v2x.utils.Order;
-import com.cusc.adas.v2x.vo.Position;
 
 /**
- * 
  * @author huangml
- *
  */
 public class SelfDefineDetailDto {
-	
-	@Order(1)
-	@FieldDef(type="BYTE",isArray=true,length=8)
-	private String rvVehicleId;
-	
-	//预警类型
-	@Order(2)
-	private short type;
-	
-	//GNSS时间戳
-	@Order(3)
-    @FieldDef(type = "TIMESTAMP", isArray = false, length = 8)
+
+    private String rvVehicleId;
+
+    //预警类型
+    private short type;
+
+    //GNSS时间戳
     private long timestampGNSS;
-	
-	//主车经纬度
-	@Order(4)
-	private PositionDto location;
-	
-	//主车速度
-	@Order(5)
-	private int speed;
-	
-	//主车航向角
-	@Order(6)
-	private int heading;
-
-	//RV远车经纬度
-	@Order(7)
-	private PositionDto rvLocation;
-	
-	//RV方向 
-	@Order(8)
-	private  int rvHeading;
-	
-	//预警级别
-	@Order(9)
-	private  short level;
-	
-	//预警距离
-	@Order(10)
-	private  int  distance;
+
+    //主车经纬度
+    private PositionDto location;
+
+    //主车速度
+    private float speed;
+
+    //主车航向角
+    private float heading;
+
+    //RV远车经纬度
+    private PositionDto rvLocation;
+
+    //RV方向
+    private float rvHeading;
+
+    //预警级别
+    private short level;
+
+    //预警距离
+    private int distance;
 }

src/main/java/com/cusc/adas/v2x/selfdefine/dto/SelfDefineMessageBodyDto.java

 package com.cusc.adas.v2x.selfdefine.dto;
 
-import java.util.List;
-
-import com.cusc.adas.v2x.utils.FieldDef;
-import com.cusc.adas.v2x.utils.Order;
-
 public class SelfDefineMessageBodyDto<T> {
 	//车辆编号
-	@Order(1)
-	@FieldDef(type="BYTE",isArray=true,length=8)
 	private String vehicleId;
 	
 	//消息标识
-	@Order(2)
-	@FieldDef(type="BYTE",isArray=true,length=8)
 	private long seq;
 	
 	//数据长度
 	private int dataLen;
 	
 	//数据内容
-	private List<T> data;
-	
-	
+	private SelfDefineDetailDto data;
+
+	public int getDataLen() {
+		return dataLen;
+	}
 }

src/main/java/com/cusc/adas/v2x/selfdefine/vo/SelfDefineDetail.java

 package com.cusc.adas.v2x.selfdefine.vo;
 
 import com.cusc.adas.v2x.utils.FieldDef;
+import com.cusc.adas.v2x.utils.OffsetDef;
 import com.cusc.adas.v2x.utils.Order;
 import com.cusc.adas.v2x.vo.Position;
 
 /**
- * 
  * @author huangml
- *
  */
 public class SelfDefineDetail {
-	
-	@Order(1)
-	@FieldDef(type="BYTE",isArray=true,length=8)
-	private String rvVehicleId;
-	
-	//预警类型
-	@Order(2)
-	private short type;
-	
-	//GNSS时间戳
-	@Order(3)
+
+    @Order(1)
+    @FieldDef(type = "BYTE", isArray = true, length = 8)
+    private String rvVehicleId;
+
+    //预警类型
+    @Order(2)
+    private short type;
+
+    //GNSS时间戳
+    @Order(3)
     @FieldDef(type = "TIMESTAMP", isArray = false, length = 8)
     private long timestampGNSS;
-	
-	//主车经纬度
-	@Order(4)
-	private Position location;
-	
-	//主车速度
-	@Order(5)
-	private int speed;
-	
-	//主车航向角
-	@Order(6)
-	private long heading;
-
-	//RV远车经纬度
-	@Order(7)
-	private Position rvLocation;
-	
-	//RV方向 
-	@Order(8)
-	private  long rvHeading;
-	
-	//预警级别
-	@Order(9)
-	private  short level;
-	
-	//预警距离
-	@Order(10)
-	private  int  distance;
+
+    //主车经纬度
+    @Order(4)
+    private Position location;
+
+    //主车速度
+    @Order(5)
+    @OffsetDef(value = 0.01)
+    private int speed;
+
+    //主车航向角
+    @Order(6)
+    @OffsetDef(value=0.0001,minValidLength=7)
+    private long heading;
+
+    //RV远车经纬度
+    @Order(7)
+    private Position rvLocation;
+
+    //RV方向
+    @Order(8)
+    private long rvHeading;
+
+    //预警级别
+    @Order(9)
+    private short level;
+
+    //预警距离
+    @Order(10)
+    private int distance;
 }

src/main/java/com/cusc/adas/v2x/selfdefine/vo/SelfDefineMessage.java

@@ -4,9 +4,8 @@ import com.cusc.adas.v2x.utils.Order;
 import com.cusc.adas.v2x.vo.MessageHeadInfo;
 
 /**
- * 自定义功能信息
+ * 自定义功能信息 8.10
  * @author huangml
- *
  */
 public class SelfDefineMessage {
 	//报文头
@@ -15,4 +14,8 @@ public class SelfDefineMessage {
 	
 	@Order(2)
 	private SelfDefineMessageBody selfDefineMessageBody;
+
+	public SelfDefineMessageBody getSelfDefineMessageBody() {
+		return selfDefineMessageBody;
+	}
 }

src/main/java/com/cusc/adas/v2x/selfdefine/vo/SelfDefineMessageBody.java

 package com.cusc.adas.v2x.selfdefine.vo;
 
-import java.util.List;
-
 import com.cusc.adas.v2x.utils.FieldDef;
 import com.cusc.adas.v2x.utils.Order;
 
+/***8.10.4  数据结构及定义**/
 public class SelfDefineMessageBody<T> {
-	//车辆编号
-	@Order(1)
-	@FieldDef(type="BYTE",isArray=true,length=8)
-	private String vehicleId;
-	
-	//消息标识
-	@Order(2)
-	@FieldDef(type="BYTE",isArray=true,length=8)
-	private long seq;
-	
-	//数据长度
-	@Order(3)
-	private int dataLen;
-	
-	//数据内容
-	@Order(4)
-	private SelfDefineDetail data;
-	
-	
+    //车辆编号
+    @Order(1)
+    @FieldDef(type = "BYTE", isArray = true, length = 8)
+    private String vehicleId;
+
+    //消息标识
+    @Order(2)
+    @FieldDef(type = "BYTE", isArray = true, length = 8)
+    private long seq;
+
+    //数据长度
+    @Order(3)
+    private int dataLen;
+
+    //数据内容
+    @Order(4)
+    private SelfDefineDetail data;
+
+    public SelfDefineDetail getData() {
+        return data;
+    }
 }