From f2f70fce980a961e11a7d521403089473a9d282b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 二月 2024 20:53:13 +0800
Subject: [PATCH] 修复合并错误
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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
old mode 100644
new mode 100755
index 5cc9cb9..36e5714
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
@@ -76,7 +76,11 @@
// 浼氳瘽宸茬粨鏉�
dialogTerminated,
// 璁惧鏈壘鍒�
- deviceNotFoundEvent
+ deviceNotFoundEvent,
+ // 娑堟伅鍙戦�佸け璐�
+ cmdSendFailEvent,
+ // 娑堟伅鍙戦�佸け璐�
+ failedToGetPort
}
public static class EventResult<EventObject>{
@@ -86,9 +90,7 @@
public String callId;
public EventObject event;
- public EventResult(int statusCode, String msg) {
- this.statusCode = statusCode;
- this.msg = msg;
+ public EventResult() {
}
public EventResult(EventObject event) {
--
Gitblit v1.8.0