Commit 22deb206ba0c07949523d2c355b23a05a2d51007
1 parent
5c3c3e6a
补充上一个修复的内容
Showing
2 changed files
with
6 additions
and
29 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/bean/CmdSendFailEvent.java deleted
100644 → 0
| 1 | -package com.genersoft.iot.vmp.gb28181.bean; | ||
| 2 | - | ||
| 3 | -import javax.sip.Dialog; | ||
| 4 | -import java.util.EventObject; | ||
| 5 | - | ||
| 6 | -public class CmdSendFailEvent extends EventObject { | ||
| 7 | - | ||
| 8 | - private String callId; | ||
| 9 | - | ||
| 10 | - /** | ||
| 11 | - * Constructs a prototypical Event. | ||
| 12 | - * | ||
| 13 | - * @param dialog | ||
| 14 | - * @throws IllegalArgumentException if source is null. | ||
| 15 | - */ | ||
| 16 | - public CmdSendFailEvent(Dialog dialog) { | ||
| 17 | - super(dialog); | ||
| 18 | - } | ||
| 19 | - | ||
| 20 | - public String getCallId() { | ||
| 21 | - return callId; | ||
| 22 | - } | ||
| 23 | - | ||
| 24 | - public void setCallId(String callId) { | ||
| 25 | - this.callId = callId; | ||
| 26 | - } | ||
| 27 | -} |
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
| @@ -649,7 +649,9 @@ public class PlayServiceImpl implements IPlayService { | @@ -649,7 +649,9 @@ public class PlayServiceImpl implements IPlayService { | ||
| 649 | } catch (InvalidArgumentException | SipException | ParseException e) { | 649 | } catch (InvalidArgumentException | SipException | ParseException e) { |
| 650 | logger.error("[命令发送失败] 回放: {}", e.getMessage()); | 650 | logger.error("[命令发送失败] 回放: {}", e.getMessage()); |
| 651 | 651 | ||
| 652 | - SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new CmdSendFailEvent(null)); | 652 | + SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(); |
| 653 | + eventResult.type = SipSubscribe.EventResultType.cmdSendFailEvent; | ||
| 654 | + eventResult.statusCode = -1; | ||
| 653 | eventResult.msg = "命令发送失败"; | 655 | eventResult.msg = "命令发送失败"; |
| 654 | errorEvent.response(eventResult); | 656 | errorEvent.response(eventResult); |
| 655 | } | 657 | } |
| @@ -807,7 +809,9 @@ public class PlayServiceImpl implements IPlayService { | @@ -807,7 +809,9 @@ public class PlayServiceImpl implements IPlayService { | ||
| 807 | } catch (InvalidArgumentException | SipException | ParseException e) { | 809 | } catch (InvalidArgumentException | SipException | ParseException e) { |
| 808 | logger.error("[命令发送失败] 录像下载: {}", e.getMessage()); | 810 | logger.error("[命令发送失败] 录像下载: {}", e.getMessage()); |
| 809 | 811 | ||
| 810 | - SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new CmdSendFailEvent(null)); | 812 | + SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(); |
| 813 | + eventResult.type = SipSubscribe.EventResultType.cmdSendFailEvent; | ||
| 814 | + eventResult.statusCode = -1; | ||
| 811 | eventResult.msg = "命令发送失败"; | 815 | eventResult.msg = "命令发送失败"; |
| 812 | errorEvent.response(eventResult); | 816 | errorEvent.response(eventResult); |
| 813 | } | 817 | } |