From 1553b39b4547418774ab2bd6da72f75bfd14b972 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期二, 29 三月 2022 10:04:28 +0800
Subject: [PATCH] 修复级联的国标通道无经纬度问题
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java | 53 ++++++++++++++++++++++-------------------------------
1 files changed, 22 insertions(+), 31 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 e9d4167..434a639 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,28 +1,28 @@
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();
- ViaHeader viaHeader = (ViaHeader)request.getHeader(ViaHeader.NAME);
- this.branch = viaHeader.getBranch();
+ this.transaction = evt.getServerTransaction();
+ this.dialog = evt.getDialog();
+ CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
+ this.callId = callIdHeader.getCallId();
}
private String id;
@@ -30,9 +30,8 @@
private String callId;
private String eventId;
private String eventType;
- private String fromTag;
- private String toTag;
- private String branch;
+ private ServerTransaction transaction;
+ private Dialog dialog;
public String getId() {
return id;
@@ -46,18 +45,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;
}
@@ -68,10 +55,6 @@
public void setCallId(String callId) {
this.callId = callId;
- }
-
- public void setFromTag(String fromTag) {
- this.fromTag = fromTag;
}
public String getEventId() {
@@ -90,11 +73,19 @@
this.eventType = eventType;
}
- public String getBranch() {
- return branch;
+ public ServerTransaction getTransaction() {
+ return transaction;
}
- public void setBranch(String branch) {
- this.branch = branch;
+ public void setTransaction(ServerTransaction transaction) {
+ this.transaction = transaction;
+ }
+
+ public Dialog getDialog() {
+ return dialog;
+ }
+
+ public void setDialog(Dialog dialog) {
+ this.dialog = dialog;
}
}
--
Gitblit v1.8.0