Merge branch 'wvp-28181-2.0'

648540858

2022-09-26 2ff3cdb6a1550941dbd36585749499064db4f8d5

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -48,7 +48,9 @@
import javax.sip.message.Response;

import java.lang.reflect.Field;

import java.text.ParseException;

import java.util.ArrayList;

import java.util.HashSet;

import java.util.List;



/**

 * @description:设备能力接口，用于定义设备的控制、查询能力

@@ -618,16 +620,6 @@
    /**

     * 语音广播

     *

     * @param device    视频设备

     * @param channelId 预览通道

     */

    @Override

    public void audioBroadcastCmd(Device device, String channelId) {

    }



    /**

     * 语音广播

     *

     * @param device 视频设备

     */

    @Override

@@ -642,6 +634,23 @@
        broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

        broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");

        broadcastXml.append("</Notify>\r\n");

   /**

    * 语音广播

    *

    * @param device  视频设备

    */

   @Override

   public boolean audioBroadcastCmd(Device device,String channelId, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {

      try {

         StringBuffer broadcastXml = new StringBuffer(200);

         String charset = device.getCharset();

         broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");

         broadcastXml.append("<Notify>\r\n");

         broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");

         broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");

         broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");

         broadcastXml.append("<TargetID>" + channelId + "</TargetID>\r\n");

         broadcastXml.append("</Notify>\r\n");



        CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()

                : udpSipProvider.getNewCallId();