Merge branch 'gbt2818_0226' into 'master_dev'

fix: 摄像头多通道同步问题修复

See merge request yunteng/thingskit!349

@@ -48,7 +48,8 @@ public class VideoChanelDTO extends TenantDTO {
 
 
   @ApiModelProperty(value = "是否有子设备:0没有 1有")
   @ApiModelProperty(value = "是否有子设备:0没有 1有")
   private Integer parental;
   private Integer parental;
-
+  @ApiModelProperty(value = "摄像头总通道数")
+  private Integer sumNum;
   @ApiModelProperty(value = "信令安全模式缺省为0; 0:不采用;2:S/MIME 签名方式;3:S/\n" + "MIME加密签名同时采用方式;4:数字摘要方式")
   @ApiModelProperty(value = "信令安全模式缺省为0; 0:不采用;2:S/MIME 签名方式;3:S/\n" + "MIME加密签名同时采用方式;4:数字摘要方式")
   private Integer safetyWay;
   private Integer safetyWay;
 
 

@@ -84,7 +84,6 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
   private final UserSetting userSetting;
   private final UserSetting userSetting;
   private final TKSipCommanderService commanderService;
   private final TKSipCommanderService commanderService;
   private final DataDecodingEncodingService encodingService;
   private final DataDecodingEncodingService encodingService;
-  private final VideoStreamSessionManager videoStreamSessionManager;
   private TransportService transportService;
   private TransportService transportService;
   private DigestServerAuthenticationHelper authenticationHelper;
   private DigestServerAuthenticationHelper authenticationHelper;
 
 
@@ -94,7 +93,7 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
 
 
   @Getter
   @Getter
   private final ConcurrentHashMap<DeviceId, String> onlineDevice = new ConcurrentHashMap<>();
   private final ConcurrentHashMap<DeviceId, String> onlineDevice = new ConcurrentHashMap<>();
-
+  private final ConcurrentHashMap<String, List<VideoChanelDTO>> deviceNewChanel = new ConcurrentHashMap<>();
   private static final Map<String, ISIPRequestProcessor> requestProcessorMap =
   private static final Map<String, ISIPRequestProcessor> requestProcessorMap =
       new ConcurrentHashMap<>();
       new ConcurrentHashMap<>();
   private static final Map<String, ISIPResponseProcessor> responseProcessorMap =
   private static final Map<String, ISIPResponseProcessor> responseProcessorMap =
@@ -521,8 +520,23 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
         break;
         break;
       case Catalog:
       case Catalog:
         List<VideoChanelDTO> channelDTO = TKXmlUtil.channelInfoBuilder(devSession, rootElement);
         List<VideoChanelDTO> channelDTO = TKXmlUtil.channelInfoBuilder(devSession, rootElement);
-        byte[] channaelMsgBytes = encodingService.encode(channelDTO);
-        msgBuilder.setContext(ByteString.copyFrom(channaelMsgBytes));
+        String cameraCode = devSession.getCameraCode();
+         int channelNum =1;
+         if(!channelDTO.isEmpty()){
+           channelNum = channelDTO.get(0).getSumNum();
+           List<VideoChanelDTO> itemChanel = new ArrayList<>();
+           if(deviceNewChanel.containsKey(cameraCode)){
+             itemChanel =deviceNewChanel.get(cameraCode);
+           }else{
+             deviceNewChanel.put(cameraCode,itemChanel);
+           }
+           itemChanel.addAll(channelDTO);
+         }
+        if(channelNum == deviceNewChanel.get(cameraCode).size()){
+          byte[] channaelMsgBytes = encodingService.encode(deviceNewChanel.get(cameraCode));
+          msgBuilder.setContext(ByteString.copyFrom(channaelMsgBytes));
+          deviceNewChanel.remove(cameraCode);
+        }
         break;
         break;
       default:
       default:
     }
     }

@@ -208,6 +208,7 @@ public class TKXmlUtil {
           Optional.ofNullable(deviceChannel).ifPresent(c->{
           Optional.ofNullable(deviceChannel).ifPresent(c->{
             TKSipUtils.updateGps(deviceChannel, device.getGeoCoordSys());
             TKSipUtils.updateGps(deviceChannel, device.getGeoCoordSys());
             deviceChannel.setCameraCode(device.getCameraCode());
             deviceChannel.setCameraCode(device.getCameraCode());
+            deviceChannel.setSumNum(sumNum);
             result.add(deviceChannel);
             result.add(deviceChannel);
           });
           });
         }
         }