修复WVP作为下级平台接收DeviceStatus指令固定响应的问题

gaofw189

2023-01-10 26cd7dbaf9394ff26f5229b18cfdb72c203a6bc3

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

@@ -565,10 +565,11 @@
        if (inviteStreamCallback != null) {

            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream()));

        }



        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent, okEvent -> {

            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;

            SIPResponse response = (SIPResponse) responseEvent.getResponse();

            streamSession.put(device.getDeviceId(), channelId,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()).getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.download);

            streamSession.put(device.getDeviceId(), channelId, response.getCallIdHeader().getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.download);

        });

    }



@@ -725,8 +726,6 @@
        cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

        cmdXml.append("<GuardCmd>" + guardCmdStr + "</GuardCmd>\r\n");

        cmdXml.append("</Control>\r\n");



        


        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);

@@ -902,29 +901,6 @@
        cmdXml.append("</Control>\r\n");



        



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);

    }



    /**

     * 设备配置命令：远程启动

     *

     * @param device 视频设备

     */

    @Override

    public void deviceTeleBootCmd(Device device, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {



        StringBuffer cmdXml = new StringBuffer(200);

        String charset = device.getCharset();

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

        cmdXml.append("<Control>\r\n");

        cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");

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

        cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");

        cmdXml.append("<PTZCmd></PTZCmd>\r\n");

        cmdXml.append("<TeleBoot>Boot</PTZCmd>\r\n");

        cmdXml.append("</Control>\r\n");



        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));

        sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, errorEvent);