From a59095db0c240987028d4d05ab561665ed8fe7ea Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期五, 29 七月 2022 15:16:39 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java | 77 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 24 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 355edcc..1958b44 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,26 +1,31 @@
package com.genersoft.iot.vmp.gb28181.bean;
+import com.genersoft.iot.vmp.utils.SerializeUtils;
+
+import javax.sip.Dialog;
import javax.sip.RequestEvent;
+import javax.sip.ServerTransaction;
import javax.sip.header.*;
import javax.sip.message.Request;
public class SubscribeInfo {
- public SubscribeInfo() {
- }
public SubscribeInfo(RequestEvent evt, 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();
EventHeader eventHeader = (EventHeader)request.getHeader(EventHeader.NAME);
this.eventId = eventHeader.getEventId();
this.eventType = eventHeader.getEventType();
+ this.transaction = evt.getServerTransaction();
+ this.dialog = evt.getDialog();
+ CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
+ this.callId = callIdHeader.getCallId();
+ }
+
+ public SubscribeInfo() {
}
private String id;
@@ -28,8 +33,16 @@
private String callId;
private String eventId;
private String eventType;
- private String fromTag;
- private String toTag;
+ private ServerTransaction transaction;
+ private Dialog dialog;
+
+ /**
+ * 浠ヤ笅涓哄彲閫夊瓧娈�
+ * @return
+ */
+ private String sn;
+ private int gpsInterval;
+
public String getId() {
return id;
@@ -43,18 +56,6 @@
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;
}
@@ -65,10 +66,6 @@
public void setCallId(String callId) {
this.callId = callId;
- }
-
- public void setFromTag(String fromTag) {
- this.fromTag = fromTag;
}
public String getEventId() {
@@ -86,4 +83,36 @@
public void setEventType(String eventType) {
this.eventType = eventType;
}
+
+ public ServerTransaction getTransaction() {
+ return transaction;
+ }
+
+ public void setTransaction(ServerTransaction transaction) {
+ this.transaction = transaction;
+ }
+
+ public Dialog getDialog() {
+ return dialog;
+ }
+
+ public void setDialog(Dialog dialog) {
+ this.dialog = dialog;
+ }
+
+ 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