Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

sc.dm

2022-03-10 4abbf4df07f02c0c94baa2787fdcf4a14dcb3463

 src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java

@@ -18,15 +18,21 @@
        this.fromTag = fromHeader.getTag();
        ExpiresHeader expiresHeader = (ExpiresHeader)request.getHeader(ExpiresHeader.NAME);
        this.expires = expiresHeader.getExpires();
        this.event = (EventHeader)request.getHeader(EventHeader.NAME);
        EventHeader eventHeader = (EventHeader)request.getHeader(EventHeader.NAME);
        this.eventId = eventHeader.getEventId();
        this.eventType = eventHeader.getEventType();
        ViaHeader viaHeader = (ViaHeader)request.getHeader(ViaHeader.NAME);
        this.branch = viaHeader.getBranch();
    }

    private String id;
    private int expires;
    private String callId;
    private EventHeader event;
    private String eventId;
    private String eventType;
    private String fromTag;
    private String toTag;
    private String branch;

    public String getId() {
        return id;
@@ -38,10 +44,6 @@

    public String getCallId() {
        return callId;
    }

    public EventHeader getEvent() {
        return event;
    }

    public String getFromTag() {
@@ -68,11 +70,31 @@
        this.callId = callId;
    }

    public void setEvent(EventHeader event) {
        this.event = event;
    }

    public void setFromTag(String fromTag) {
        this.fromTag = fromTag;
    }

    public String getEventId() {
        return eventId;
    }

    public void setEventId(String eventId) {
        this.eventId = eventId;
    }

    public String getEventType() {
        return eventType;
    }

    public void setEventType(String eventType) {
        this.eventType = eventType;
    }

    public String getBranch() {
        return branch;
    }

    public void setBranch(String branch) {
        this.branch = branch;
    }
}