From 89a2e62702b47f163b37aa465a9873a471b5aa34 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 八月 2022 23:01:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java b/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
index 10a2759..af86196 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java
@@ -4,14 +4,18 @@
import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import javax.sip.RequestEvent;
+import java.util.EventObject;
+
+/**
+ * @author lin
+ */
public class PlayBackResult<T> {
- private int code;
- private T data;
- private MediaServerItem mediaServerItem;
+ private int code;
+ private T data;
+ private MediaServerItem mediaServerItem;
private JSONObject response;
- private SipSubscribe.EventResult event;
+ private SipSubscribe.EventResult<EventObject> event;
public int getCode() {
return code;
@@ -45,11 +49,11 @@
this.response = response;
}
- public SipSubscribe.EventResult getEvent() {
+ public SipSubscribe.EventResult<EventObject> getEvent() {
return event;
}
- public void setEvent(SipSubscribe.EventResult event) {
+ public void setEvent(SipSubscribe.EventResult<EventObject> event) {
this.event = event;
}
}
--
Gitblit v1.8.0