From 8fdd10d1c2723ead1d2c3b232f64f292ba3ce1cc Mon Sep 17 00:00:00 2001
From: che_shuai <che_shuai@massclouds>
Date: 星期一, 24 七月 2023 14:10:46 +0800
Subject: [PATCH] 修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java | 111 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 66 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java
index 60418f2..07176f2 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java
@@ -1,78 +1,99 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import javax.sip.RequestEvent;
+import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
+
import javax.sip.header.*;
-import javax.sip.message.Request;
public class SubscribeInfo {
- public SubscribeInfo() {
- }
- public SubscribeInfo(RequestEvent evt, String id) {
+ public SubscribeInfo(SIPRequest request, String id) {
this.id = id;
- Request request = evt.getRequest();
- CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME);
- this.callId = callIdHeader.getCallId();
- FromHeader fromHeader = (FromHeader)request.getHeader(FromHeader.NAME);
- this.fromTag = fromHeader.getTag();
- ExpiresHeader expiresHeader = (ExpiresHeader)request.getHeader(ExpiresHeader.NAME);
- this.expires = expiresHeader.getExpires();
- this.event = ((EventHeader)request.getHeader(EventHeader.NAME)).getName();
+ this.request = request;
+ this.expires = request.getExpires().getExpires();
+ EventHeader eventHeader = (EventHeader)request.getHeader(EventHeader.NAME);
+ this.eventId = eventHeader.getEventId();
+ this.eventType = eventHeader.getEventType();
+
}
private String id;
+
+ private SIPRequest request;
private int expires;
- private String callId;
- private String event;
- private String fromTag;
- private String toTag;
+ private String eventId;
+ private String eventType;
+ private SIPResponse response;
+
+ /**
+ * 浠ヤ笅涓哄彲閫夊瓧娈�
+ * @return
+ */
+ private String sn;
+ private int gpsInterval;
public String getId() {
return id;
- }
-
- public int getExpires() {
- return expires;
- }
-
- public String getCallId() {
- return callId;
- }
-
- public String getFromTag() {
- return fromTag;
- }
-
- public void setToTag(String toTag) {
- this.toTag = toTag;
- }
-
- public String getToTag() {
- return toTag;
}
public void setId(String id) {
this.id = id;
}
+ public SIPRequest getRequest() {
+ return request;
+ }
+
+ public void setRequest(SIPRequest request) {
+ this.request = request;
+ }
+
+ public int getExpires() {
+ return expires;
+ }
+
public void setExpires(int expires) {
this.expires = expires;
}
- public void setCallId(String callId) {
- this.callId = callId;
+ public String getEventId() {
+ return eventId;
}
- public void setFromTag(String fromTag) {
- this.fromTag = fromTag;
+ public void setEventId(String eventId) {
+ this.eventId = eventId;
}
- public String getEvent() {
- return event;
+ public String getEventType() {
+ return eventType;
}
- public void setEvent(String event) {
- this.event = event;
+ public void setEventType(String eventType) {
+ this.eventType = eventType;
+ }
+
+ public SIPResponse getResponse() {
+ return response;
+ }
+
+ public void setResponse(SIPResponse response) {
+ this.response = response;
+ }
+
+ public String getSn() {
+ return sn;
+ }
+
+ public void setSn(String sn) {
+ this.sn = sn;
+ }
+
+ public int getGpsInterval() {
+ return gpsInterval;
+ }
+
+ public void setGpsInterval(int gpsInterval) {
+ this.gpsInterval = gpsInterval;
}
}
--
Gitblit v1.8.0