From 1e1364e51a66614469b91e396d33a54bdf8f6e98 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 14:33:25 +0800
Subject: [PATCH] 修复开始点播功能接口调用返回参数与定义的不符 #635
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
index 69529b0..e5b995e 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
@@ -10,6 +10,7 @@
import javax.sip.*;
import javax.sip.header.CallIdHeader;
import javax.sip.message.Response;
+import java.text.ParseException;
import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -56,8 +57,7 @@
logger.debug("errorSubscribes.size:{}",errorSubscribes.size());
}
- public interface Event {
- void response(EventResult eventResult);
+ public interface Event { void response(EventResult eventResult) ;
}
/**
@@ -81,18 +81,13 @@
public EventResultType type;
public String msg;
public String callId;
- public Dialog dialog;
public EventObject event;
-
- public EventResult() {
- }
public EventResult(EventObject event) {
this.event = event;
if (event instanceof ResponseEvent) {
ResponseEvent responseEvent = (ResponseEvent)event;
Response response = responseEvent.getResponse();
- this.dialog = responseEvent.getDialog();
this.type = EventResultType.response;
if (response != null) {
this.msg = response.getReasonPhrase();
@@ -127,12 +122,10 @@
this.statusCode = -1024;
this.callId = dialogTerminatedEvent.getDialog().getCallId().getCallId();
}else if (event instanceof DeviceNotFoundEvent) {
- DeviceNotFoundEvent deviceNotFoundEvent = (DeviceNotFoundEvent)event;
this.type = EventResultType.deviceNotFoundEvent;
this.msg = "璁惧鏈壘鍒�";
this.statusCode = -1024;
- this.dialog = deviceNotFoundEvent.getDialog();
- this.callId = this.dialog != null ?deviceNotFoundEvent.getDialog().getCallId().getCallId() : null;
+ this.callId = ((DeviceNotFoundEvent) event).getCallId();
}
}
}
--
Gitblit v1.8.0