dialog去除以及异常情况处理优化

src/main/java/com/genersoft/iot/vmp/gb28181/bean/CmdSendFailEvent.java

@@ -0,0 +1,27 @@
+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;
+    }
+}

src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceNotFoundEvent.java

@@ -4,6 +4,9 @@ import javax.sip.Dialog;
 import java.util.EventObject;
 
 public class DeviceNotFoundEvent extends EventObject {
+
+    private String callId;
+
     /**
      * Constructs a prototypical Event.
      *
@@ -14,8 +17,11 @@ public class DeviceNotFoundEvent extends EventObject {
         super(dialog);
     }
 
+    public String getCallId() {
+        return callId;
+    }
 
-    public Dialog getDialog() {
-        return (Dialog)super.getSource();
+    public void setCallId(String callId) {
+        this.callId = callId;
     }
 }

src/main/java/com/genersoft/iot/vmp/gb28181/bean/SipTransactionInfo.java

@@ -1,6 +1,7 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
 import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
 
 public class SipTransactionInfo {
 
@@ -9,11 +10,11 @@ public class SipTransactionInfo {
     private String toTag;
     private String viaBranch;
 
-    public SipTransactionInfo(SIPRequest request) {
-        this.callId = request.getCallIdHeader().getCallId();
-        this.fromTag = request.getFromTag();
-        this.toTag = request.getToTag();
-        this.viaBranch = request.getTopmostViaHeader().getBranch();
+    public SipTransactionInfo(SIPResponse response) {
+        this.callId = response.getCallIdHeader().getCallId();
+        this.fromTag = response.getFromTag();
+        this.toTag = response.getToTag();
+        this.viaBranch = response.getTopmostViaHeader().getBranch();
     }
 
     public SipTransactionInfo() {

src/main/java/com/genersoft/iot/vmp/gb28181/bean/SsrcTransaction.java

@@ -8,10 +8,11 @@ public class SsrcTransaction {
     private String channelId;
     private String callId;
     private String stream;
-    private byte[] transaction;
-    private byte[] dialog;
     private String mediaServerId;
     private String ssrc;
+
+    private SipTransactionInfo sipTransactionInfo;
+
     private VideoStreamSessionManager.SessionType type;
 
     public String getDeviceId() {
@@ -46,22 +47,6 @@ public class SsrcTransaction {
         this.stream = stream;
     }
 
-    public byte[] getTransaction() {
-        return transaction;
-    }
-
-    public void setTransaction(byte[] transaction) {
-        this.transaction = transaction;
-    }
-
-    public byte[] getDialog() {
-        return dialog;
-    }
-
-    public void setDialog(byte[] dialog) {
-        this.dialog = dialog;
-    }
-
     public String getMediaServerId() {
         return mediaServerId;
     }
@@ -85,4 +70,12 @@ public class SsrcTransaction {
     public void setType(VideoStreamSessionManager.SessionType type) {
         this.type = type;
     }
+
+    public SipTransactionInfo getSipTransactionInfo() {
+        return sipTransactionInfo;
+    }
+
+    public void setSipTransactionInfo(SipTransactionInfo sipTransactionInfo) {
+        this.sipTransactionInfo = sipTransactionInfo;
+    }
 }

src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeInfo.java

@@ -1,15 +1,10 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
-import com.genersoft.iot.vmp.utils.SerializeUtils;
 import gov.nist.javax.sip.message.SIPRequest;
 import gov.nist.javax.sip.message.SIPResponse;
 
-import javax.sip.ClientTransaction;
-import javax.sip.Dialog;
-import javax.sip.RequestEvent;
 import javax.sip.ServerTransaction;
 import javax.sip.header.*;
-import javax.sip.message.Request;
 
 public class SubscribeInfo {