[1078] 支持语音对讲 中心广播模式

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDevice.java

@@ -12,89 +12,48 @@ public class JTDevice {
 
     private int id;
 
-    /**
-     * 省域ID
-     */
     @Schema(description = "省域ID")
     private String provinceId;
 
-    /**
-     * 省域文字描述
-     */
     @Schema(description = "省域文字描述")
     private String provinceText;
 
-    /**
-     * 市县域ID
-     */
     @Schema(description = "市县域ID")
     private String cityId;
 
-    /**
-     * 市县域文字描述
-     */
     @Schema(description = "市县域文字描述")
     private String cityText;
 
-    /**
-     * 制造商ID
-     */
     @Schema(description = "制造商ID")
     private String makerId;
 
-    /**
-     * 终端型号
-     */
     @Schema(description = "终端型号")
     private String model;
 
-    /**
-     * 终端手机号
-     */
     @Schema(description = "终端手机号")
     private String phoneNumber;
 
-    /**
-     * 终端ID
-     */
     @Schema(description = "终端ID")
     private String terminalId;
 
-    /**
-     * 车牌颜色
-     */
     @Schema(description = "车牌颜色")
     private int plateColor;
 
-    /**
-     * 车牌
-     */
     @Schema(description = "车牌")
     private String plateNo;
 
-    /**
-     * 鉴权码
-     */
     @Schema(description = "鉴权码")
     private String authenticationCode;
 
-    /**
-     * 经度
-     */
     @Schema(description = "经度")
     private Double longitude;
 
-    /**
-     * 纬度
-     */
     @Schema(description = "纬度")
     private Double latitude;
 
-
     @Schema(description = "注册时间")
     private String registerTime;
 
-
     @Schema(description = "创建时间")
     private String createTime;
 
@@ -104,6 +63,15 @@ public class JTDevice {
     @Schema(description = "状态")
     private boolean status;
 
+    @Schema(description = "设备使用的媒体id, 默认为null")
+    private String mediaServerId;
+
+    @Schema(description = "地理坐标系， 目前支持 WGS84,GCJ02")
+    private String geoCoordSys;
+
+    @Schema(description = "收流IP")
+    private String sdpIp;
+
     @Override
     public String toString() {
         return "JTDevice{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTChanelConfig.java

@@ -5,14 +5,12 @@ import io.netty.buffer.Unpooled;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Stack;
-
 /**
  * 音视频通道
  */
 @Setter
 @Getter
-public class JTChanel implements JTDeviceSubConfig{
+public class JTChanelConfig implements JTDeviceSubConfig{
 
     /**
      * 物理通道号 单独
@@ -47,8 +45,8 @@ public class JTChanel implements JTDeviceSubConfig{
         return byteBuf;
     }
 
-    public static JTChanel decode(ByteBuf byteBuf) {
-        JTChanel jtChanel = new JTChanel();
+    public static JTChanelConfig decode(ByteBuf byteBuf) {
+        JTChanelConfig jtChanel = new JTChanelConfig();
         jtChanel.setPhysicalChannelId(byteBuf.readUnsignedByte());
         jtChanel.setLogicChannelId(byteBuf.readUnsignedByte());
         jtChanel.setChannelType(byteBuf.readUnsignedByte());

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTChannelListParam.java

@@ -30,7 +30,7 @@ public class JTChannelListParam implements JTDeviceSubConfig{
      */
     private int videoCount;
 
-    private List<JTChanel> chanelList;
+    private List<JTChanelConfig> chanelList;
 
 
     @Override
@@ -39,7 +39,7 @@ public class JTChannelListParam implements JTDeviceSubConfig{
         byteBuf.writeByte(videoAndAudioCount);
         byteBuf.writeByte(audioCount);
         byteBuf.writeByte(videoCount);
-        for (JTChanel jtChanel : chanelList) {
+        for (JTChanelConfig jtChanel : chanelList) {
             byteBuf.writeBytes(jtChanel.encode());
         }
         return byteBuf;
@@ -51,9 +51,9 @@ public class JTChannelListParam implements JTDeviceSubConfig{
         channelListParam.setAudioCount(byteBuf.readUnsignedByte());
         channelListParam.setVideoCount(byteBuf.readUnsignedByte());
         int total = channelListParam.getVideoAndAudioCount() + channelListParam.getVideoCount() + channelListParam.getAudioCount();
-        List<JTChanel> chanelList = new ArrayList<>(total);
+        List<JTChanelConfig> chanelList = new ArrayList<>(total);
         for (int i = 0; i < total; i++) {
-            chanelList.add(JTChanel.decode(byteBuf));
+            chanelList.add(JTChanelConfig.decode(byteBuf));
         }
         channelListParam.setChanelList(chanelList);
         return channelListParam;