修复合并错误

648540858

2024-02-07 f2f70fce980a961e11a7d521403089473a9d282b

 src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java

old mode 100644
new mode 100755
@@ -60,7 +60,7 @@
        logger.debug("errorSubscribes.size:{}",errorSubscribes.size());
    }

    public interface Event { void response(EventResult eventResult) ;
    public interface Event { void response(EventResult eventResult);
    }

    /**
@@ -76,7 +76,11 @@
        // 会话已结束
        dialogTerminated,
        // 设备未找到
        deviceNotFoundEvent
        deviceNotFoundEvent,
        // 消息发送失败
        cmdSendFailEvent,
        // 消息发送失败
        failedToGetPort
    }

    public static class EventResult<EventObject>{
@@ -86,6 +90,9 @@
        public String callId;
        public EventObject event;

        public EventResult() {
        }

        public EventResult(EventObject event) {
            this.event = event;
            if (event instanceof ResponseEvent) {