优化订阅信息的发送与取消订阅

648540858

2022-04-08 f10b458fc919fbcadc4936bf3a7886088e20ac71

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

@@ -145,9 +145,9 @@
    public String keepalive(ParentPlatform parentPlatform) {
        String callId = null;
        try {

            String characterSet = parentPlatform.getCharacterSet();
            StringBuffer keepaliveXml = new StringBuffer(200);
            keepaliveXml.append("<?xml version=\"1.0\"?>\r\n");
            keepaliveXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
            keepaliveXml.append("<Notify>\r\n");
            keepaliveXml.append("<CmdType>Keepalive</CmdType>\r\n");
            keepaliveXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
@@ -371,8 +371,7 @@
            CallIdHeader callIdHeader = parentPlatform.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
                    : udpSipProvider.getNewCallId();
            callIdHeader.setCallId(subscribeInfo.getCallId());

//
            logger.info("[发送Notify-MobilePosition] {}/{}->{},{}", parentPlatform.getServerGBId(), gpsMsgInfo.getId(), gpsMsgInfo.getLng(), gpsMsgInfo.getLat());
            sendNotify(parentPlatform, deviceStatusXml.toString(), subscribeInfo, eventResult -> {
                logger.error("发送NOTIFY通知消息失败。错误：{} {}", eventResult.statusCode, eventResult.msg);
            }, null);
@@ -443,7 +442,7 @@

        SipURI sipURI = (SipURI) notifyRequest.getRequestURI();
        SIPRequest request = (SIPRequest) subscribeInfo.getTransaction().getRequest();
        sipURI.setHost(request.getRemoteAddress().getHostName());
        sipURI.setHost(request.getRemoteAddress().getHostAddress());
        sipURI.setPort(request.getRemotePort());
        ClientTransaction transaction = null;
        if ("TCP".equals(parentPlatform.getTransport())) {
@@ -654,7 +653,7 @@

                        SipURI byeURI = (SipURI) byeRequest.getRequestURI();
                        SIPRequest request = (SIPRequest) clientTransaction.getRequest();
                        byeURI.setHost(request.getRemoteAddress().getHostName());
                        byeURI.setHost(request.getRemoteAddress().getHostAddress());
                        byeURI.setPort(request.getRemotePort());
                        if ("TCP".equals(platform.getTransport())) {
                            clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);