From 22deb206ba0c07949523d2c355b23a05a2d51007 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Fri, 21 Apr 2023 14:42:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/gb28181/bean/CmdSendFailEvent.java    | 27 -------------------
 .../iot/vmp/service/impl/PlayServiceImpl.java |  8 ++++--
 2 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 src/main/java/com/genersoft/iot/vmp/gb28181/bean/CmdSendFailEvent.java

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CmdSendFailEvent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CmdSendFailEvent.java
deleted file mode 100644
index 0cd4086e3..000000000
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CmdSendFailEvent.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.genersoft.iot.vmp.gb28181.bean;
-
-import javax.sip.Dialog;
-import java.util.EventObject;
-
-public class CmdSendFailEvent extends EventObject {
-
-    private String callId;
-
-    /**
-     * Constructs a prototypical Event.
-     *
-     * @param dialog
-     * @throws IllegalArgumentException if source is null.
-     */
-    public CmdSendFailEvent(Dialog dialog) {
-        super(dialog);
-    }
-
-    public String getCallId() {
-        return callId;
-    }
-
-    public void setCallId(String callId) {
-        this.callId = callId;
-    }
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index aead66128..51574392b 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -649,7 +649,9 @@ public class PlayServiceImpl implements IPlayService {
         } catch (InvalidArgumentException | SipException | ParseException e) {
             logger.error("[命令发送失败] 回放: {}", e.getMessage());
 
-            SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new CmdSendFailEvent(null));
+            SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult();
+            eventResult.type = SipSubscribe.EventResultType.cmdSendFailEvent;
+            eventResult.statusCode = -1;
             eventResult.msg = "命令发送失败";
             errorEvent.response(eventResult);
         }
@@ -807,7 +809,9 @@ public class PlayServiceImpl implements IPlayService {
         } catch (InvalidArgumentException | SipException | ParseException e) {
             logger.error("[命令发送失败] 录像下载: {}", e.getMessage());
 
-            SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new CmdSendFailEvent(null));
+            SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult();
+            eventResult.type = SipSubscribe.EventResultType.cmdSendFailEvent;
+            eventResult.statusCode = -1;
             eventResult.msg = "命令发送失败";
             errorEvent.response(eventResult);
         }