From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 2897 ++++++++++++++++++++++++----------------------------------
 1 files changed, 1,197 insertions(+), 1,700 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index a80745d..b374461 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -5,9 +5,11 @@
 import com.genersoft.iot.vmp.conf.DynamicTask;
 import com.genersoft.iot.vmp.conf.SipConfig;
 import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
 import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
 import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
+import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;
 import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
@@ -21,16 +23,21 @@
 import com.genersoft.iot.vmp.service.bean.SSRCInfo;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.utils.GitUtil;
+import gov.nist.javax.sip.SIPConstants;
 import gov.nist.javax.sip.SipProviderImpl;
 import gov.nist.javax.sip.SipStackImpl;
-import gov.nist.javax.sip.message.MessageFactoryImpl;
 import gov.nist.javax.sip.message.SIPRequest;
+import gov.nist.javax.sip.message.SIPResponse;
+import gov.nist.javax.sip.stack.SIPClientTransaction;
+import gov.nist.javax.sip.stack.SIPClientTransactionImpl;
 import gov.nist.javax.sip.stack.SIPDialog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
@@ -38,1868 +45,1358 @@
 import javax.sip.address.Address;
 import javax.sip.address.SipURI;
 import javax.sip.header.*;
+import javax.sip.message.Message;
 import javax.sip.message.Request;
+import javax.sip.message.Response;
 import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.util.HashSet;
 
-/**    
- * @description:璁惧鑳藉姏鎺ュ彛锛岀敤浜庡畾涔夎澶囩殑鎺у埗銆佹煡璇㈣兘鍔�   
+/**
+ * @description:璁惧鑳藉姏鎺ュ彛锛岀敤浜庡畾涔夎澶囩殑鎺у埗銆佹煡璇㈣兘鍔�
  * @author: swwheihei
- * @date:   2020骞�5鏈�3鏃� 涓嬪崍9:22:48     
+ * @date: 2020骞�5鏈�3鏃� 涓嬪崍9:22:48
  */
 @Component
 @DependsOn("sipLayer")
 public class SIPCommander implements ISIPCommander {
 
-	private final Logger logger = LoggerFactory.getLogger(SIPCommander.class);
+    private final Logger logger = LoggerFactory.getLogger(SIPCommander.class);
 
-	@Autowired
-	private SipConfig sipConfig;
+    @Autowired
+    private SipConfig sipConfig;
 
-	@Autowired
-	private SipFactory sipFactory;
+    @Autowired
+    private SipFactory sipFactory;
 
-	@Autowired
-	@Qualifier(value="tcpSipProvider")
-	private SipProviderImpl tcpSipProvider;
+    @Autowired
+    private SIPSender sipSender;
+    
+    @Autowired
+    private SIPRequestHeaderProvider headerProvider;
 
-	@Autowired
-	@Qualifier(value="udpSipProvider")
-	private SipProviderImpl udpSipProvider;
+    @Autowired
+    private VideoStreamSessionManager streamSession;
 
-	@Autowired
-	private SIPRequestHeaderProvider headerProvider;
-	
-	@Autowired
-	private VideoStreamSessionManager streamSession;
+    @Autowired
+    private UserSetting userSetting;
 
-	@Autowired
-	private IVideoManagerStorage storager;
-
-	@Autowired
-	private IRedisCatchStorage redisCatchStorage;
-
-	@Autowired
-	private UserSetting userSetting;
-
-	@Autowired
-	private ZlmHttpHookSubscribe subscribe;
-
-	@Autowired
-	private SipSubscribe sipSubscribe;
-
-	@Autowired
-	private IMediaServerService mediaServerService;
-
-	@Autowired
-	private DynamicTask dynamicTask;
+    @Autowired
+    private ZlmHttpHookSubscribe subscribe;
 
 
-	/**
-	 * 浜戝彴鏂瑰悜鏀炬帶鍒讹紝浣跨敤閰嶇疆鏂囦欢涓殑榛樿闀滃ご绉诲姩閫熷害
-	 * 
-	 * @param device  鎺у埗璁惧
-	 * @param channelId  棰勮閫氶亾
-	 * @param leftRight  闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
-     * @param upDown     闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
-	 */
-	@Override
-	public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown) {
-		return ptzCmd(device, channelId, leftRight, upDown, 0, sipConfig.getPtzSpeed(), 0);
-	}
 
-	/**
-	 * 浜戝彴鏂瑰悜鏀炬帶鍒�
-	 * 
-	 * @param device  鎺у埗璁惧
-	 * @param channelId  棰勮閫氶亾
-	 * @param leftRight  闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
-     * @param upDown     闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
-     * @param moveSpeed  闀滃ご绉诲姩閫熷害
-	 */
-	@Override
-	public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown, int moveSpeed) {
-		return ptzCmd(device, channelId, leftRight, upDown, 0, moveSpeed, 0);
-	}
+    @Autowired
+    private IMediaServerService mediaServerService;
 
-	/**
-	 * 浜戝彴缂╂斁鎺у埗锛屼娇鐢ㄩ厤缃枃浠朵腑鐨勯粯璁ら暅澶寸缉鏀鹃�熷害
-	 * 
-	 * @param device  鎺у埗璁惧
-	 * @param channelId  棰勮閫氶亾
-     * @param inOut      闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
-	 */  
-	@Override
-	public boolean ptzZoomCmd(Device device, String channelId, int inOut) {
-		return ptzCmd(device, channelId, 0, 0, inOut, 0, sipConfig.getPtzSpeed());
-	}
 
-	/**
-	 * 浜戝彴缂╂斁鎺у埗
-	 * 
-	 * @param device  鎺у埗璁惧
-	 * @param channelId  棰勮閫氶亾
-     * @param inOut      闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
-     * @param zoomSpeed  闀滃ご缂╂斁閫熷害
-	 */ 
-	@Override
-	public boolean ptzZoomCmd(Device device, String channelId, int inOut, int zoomSpeed) {
-		return ptzCmd(device, channelId, 0, 0, inOut, 0, zoomSpeed);
-	}
-  
-   /**
-	* 浜戝彴鎸囦护鐮佽绠� 
-	*
-    * @param leftRight  闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
-    * @param upDown     闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
-    * @param inOut      闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
-    * @param moveSpeed  闀滃ご绉诲姩閫熷害 榛樿 0XFF (0-255)
-    * @param zoomSpeed  闀滃ご缂╂斁閫熷害 榛樿 0X1 (0-255)
-    */
-    public static String cmdString(int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed) {
-		int cmdCode = 0;
-		if (leftRight == 2) {
-			cmdCode|=0x01;		// 鍙崇Щ
-		} else if(leftRight == 1) {
-			cmdCode|=0x02;		// 宸︾Щ
-		}
-		if (upDown == 2) {
-			cmdCode|=0x04;		// 涓嬬Щ
-		} else if(upDown == 1) {
-			cmdCode|=0x08;		// 涓婄Щ
-		}
-		if (inOut == 2) {
-			cmdCode |= 0x10;	// 鏀惧ぇ
-		} else if(inOut == 1) {
-			cmdCode |= 0x20;	// 缂╁皬
-		}
-		StringBuilder builder = new StringBuilder("A50F01");
-		String strTmp;
-		strTmp = String.format("%02X", cmdCode);
-		builder.append(strTmp, 0, 2);
-		strTmp = String.format("%02X", moveSpeed);
-		builder.append(strTmp, 0, 2);
-		builder.append(strTmp, 0, 2);
-		strTmp = String.format("%X", zoomSpeed);
-		builder.append(strTmp, 0, 1).append("0");
-		//璁$畻鏍¢獙鐮�
-		int checkCode = (0XA5 + 0X0F + 0X01 + cmdCode + moveSpeed + moveSpeed + (zoomSpeed /*<< 4*/ & 0XF0)) % 0X100;
-		strTmp = String.format("%02X", checkCode);
-		builder.append(strTmp, 0, 2);
-		return builder.toString();
-}
+    /**
+     * 浜戝彴鏂瑰悜鏀炬帶鍒讹紝浣跨敤閰嶇疆鏂囦欢涓殑榛樿闀滃ご绉诲姩閫熷害
+     *
+     * @param device    鎺у埗璁惧
+     * @param channelId 棰勮閫氶亾
+     * @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
+     * @param upDown    闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
+     */
+    @Override
+    public void ptzdirectCmd(Device device, String channelId, int leftRight, int upDown) throws InvalidArgumentException, ParseException, SipException {
+        ptzCmd(device, channelId, leftRight, upDown, 0, sipConfig.getPtzSpeed(), 0);
+    }
 
-   /**
-	* 浜戝彴鎸囦护鐮佽绠� 
-	*
-	 * @param cmdCode 		鎸囦护鐮�
-	 * @param parameter1	鏁版嵁1
-	 * @param parameter2	鏁版嵁2
-	 * @param combineCode2	缁勫悎鐮�2
-	 */
+    /**
+     * 浜戝彴鏂瑰悜鏀炬帶鍒�
+     *
+     * @param device    鎺у埗璁惧
+     * @param channelId 棰勮閫氶亾
+     * @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
+     * @param upDown    闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
+     * @param moveSpeed 闀滃ご绉诲姩閫熷害
+     */
+    @Override
+    public void ptzdirectCmd(Device device, String channelId, int leftRight, int upDown, int moveSpeed) throws InvalidArgumentException, ParseException, SipException {
+        ptzCmd(device, channelId, leftRight, upDown, 0, moveSpeed, 0);
+    }
+
+    /**
+     * 浜戝彴缂╂斁鎺у埗锛屼娇鐢ㄩ厤缃枃浠朵腑鐨勯粯璁ら暅澶寸缉鏀鹃�熷害
+     *
+     * @param device    鎺у埗璁惧
+     * @param channelId 棰勮閫氶亾
+     * @param inOut     闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
+     */
+    @Override
+    public void ptzZoomCmd(Device device, String channelId, int inOut) throws InvalidArgumentException, ParseException, SipException {
+        ptzCmd(device, channelId, 0, 0, inOut, 0, sipConfig.getPtzSpeed());
+    }
+
+    /**
+     * 浜戝彴缂╂斁鎺у埗
+     *
+     * @param device    鎺у埗璁惧
+     * @param channelId 棰勮閫氶亾
+     * @param inOut     闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
+     * @param zoomSpeed 闀滃ご缂╂斁閫熷害
+     */
+    @Override
+    public void ptzZoomCmd(Device device, String channelId, int inOut, int zoomSpeed) throws InvalidArgumentException, ParseException, SipException {
+        ptzCmd(device, channelId, 0, 0, inOut, 0, zoomSpeed);
+    }
+
+    /**
+     * 浜戝彴鎸囦护鐮佽绠�
+     *
+     * @param cmdCode      鎸囦护鐮�
+     * @param parameter1   鏁版嵁1
+     * @param parameter2   鏁版嵁2
+     * @param combineCode2 缁勫悎鐮�2
+     */
     public static String frontEndCmdString(int cmdCode, int parameter1, int parameter2, int combineCode2) {
-		StringBuilder builder = new StringBuilder("A50F01");
-		String strTmp;
-		strTmp = String.format("%02X", cmdCode);
-		builder.append(strTmp, 0, 2);
-		strTmp = String.format("%02X", parameter1);
-		builder.append(strTmp, 0, 2);
-		strTmp = String.format("%02X", parameter2);
-		builder.append(strTmp, 0, 2);
-		strTmp = String.format("%X", combineCode2);
-		builder.append(strTmp, 0, 1).append("0");
-		//璁$畻鏍¢獙鐮�
-		int checkCode = (0XA5 + 0X0F + 0X01 + cmdCode + parameter1 + parameter2 + (combineCode2 & 0XF0)) % 0X100;
-		strTmp = String.format("%02X", checkCode);
-		builder.append(strTmp, 0, 2);
-		return builder.toString();
-	}
+        StringBuilder builder = new StringBuilder("A50F01");
+        String strTmp;
+        strTmp = String.format("%02X", cmdCode);
+        builder.append(strTmp, 0, 2);
+        strTmp = String.format("%02X", parameter1);
+        builder.append(strTmp, 0, 2);
+        strTmp = String.format("%02X", parameter2);
+        builder.append(strTmp, 0, 2);
+        strTmp = String.format("%X", combineCode2);
+        builder.append(strTmp, 0, 1).append("0");
+        //璁$畻鏍¢獙鐮�
+        int checkCode = (0XA5 + 0X0F + 0X01 + cmdCode + parameter1 + parameter2 + (combineCode2 & 0XF0)) % 0X100;
+        strTmp = String.format("%02X", checkCode);
+        builder.append(strTmp, 0, 2);
+        return builder.toString();
+    }
 
-	/**
-	 * 浜戝彴鎺у埗锛屾敮鎸佹柟鍚戜笌缂╂斁鎺у埗
-	 * 
-	 * @param device  	鎺у埗璁惧
-	 * @param channelId	棰勮閫氶亾
-	 * @param leftRight	闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
-     * @param upDown	闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
-     * @param inOut		闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
-     * @param moveSpeed	闀滃ご绉诲姩閫熷害
-     * @param zoomSpeed	闀滃ご缂╂斁閫熷害
-	 */
-	@Override
-	public boolean ptzCmd(Device device, String channelId, int leftRight, int upDown, int inOut, int moveSpeed,
-			int zoomSpeed) {
-		try {
-			String cmdStr= cmdString(leftRight, upDown, inOut, moveSpeed, zoomSpeed);
-			StringBuffer ptzXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			ptzXml.append("<Control>\r\n");
-			ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>\r\n");
-			ptzXml.append("<Info>\r\n");
-			ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");
-			ptzXml.append("</Info>\r\n");
-			ptzXml.append("</Control>\r\n");
+    /**
+     * 浜戝彴鎺у埗锛屾敮鎸佹柟鍚戜笌缂╂斁鎺у埗
+     *
+     * @param device    鎺у埗璁惧
+     * @param channelId 棰勮閫氶亾
+     * @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
+     * @param upDown    闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
+     * @param inOut     闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
+     * @param moveSpeed 闀滃ご绉诲姩閫熷害
+     * @param zoomSpeed 闀滃ご缂╂斁閫熷害
+     */
+    @Override
+    public void ptzCmd(Device device, String channelId, int leftRight, int upDown, int inOut, int moveSpeed,
+                       int zoomSpeed) throws InvalidArgumentException, SipException, ParseException {
+        String cmdStr = SipUtils.cmdString(leftRight, upDown, inOut, moveSpeed, zoomSpeed);
+        StringBuffer ptzXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        ptzXml.append("<Control>\r\n");
+        ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        ptzXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>\r\n");
+        ptzXml.append("<Info>\r\n");
+        ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");
+        ptzXml.append("</Info>\r\n");
+        ptzXml.append("</Control>\r\n");
+        
+        Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, sipSender.getNewCallIdHeader(device.getTransport()));
 
-			CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        sipSender.transmitRequest( request);
+    }
 
-			Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
-			
-			transmitRequest(device, request);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		} 
-		return false;
-	}
+    /**
+     * 鍓嶇鎺у埗锛屽寘鎷琍TZ鎸囦护銆丗I鎸囦护銆侀缃綅鎸囦护銆佸贰鑸寚浠ゃ�佹壂鎻忔寚浠ゅ拰杈呭姪寮�鍏虫寚浠�
+     *
+     * @param device       鎺у埗璁惧
+     * @param channelId    棰勮閫氶亾
+     * @param cmdCode      鎸囦护鐮�
+     * @param parameter1   鏁版嵁1
+     * @param parameter2   鏁版嵁2
+     * @param combineCode2 缁勫悎鐮�2
+     */
+    @Override
+    public void frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) throws SipException, InvalidArgumentException, ParseException {
 
-	/**
-	 * 鍓嶇鎺у埗锛屽寘鎷琍TZ鎸囦护銆丗I鎸囦护銆侀缃綅鎸囦护銆佸贰鑸寚浠ゃ�佹壂鎻忔寚浠ゅ拰杈呭姪寮�鍏虫寚浠�
-	 * 
-	 * @param device  		鎺у埗璁惧
-	 * @param channelId		棰勮閫氶亾
-	 * @param cmdCode		鎸囦护鐮�
-     * @param parameter1	鏁版嵁1
-     * @param parameter2	鏁版嵁2
-     * @param combineCode2	缁勫悎鐮�2
-	 */
-	@Override
-	public boolean frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) {
-		try {
-			String cmdStr= frontEndCmdString(cmdCode, parameter1, parameter2, combineCode2);
-			logger.debug("鎺у埗瀛楃涓诧細" + cmdStr);
-			StringBuffer ptzXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			ptzXml.append("<Control>\r\n");
-			ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>\r\n");
-			ptzXml.append("<Info>\r\n");
-			ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");
-			ptzXml.append("</Info>\r\n");
-			ptzXml.append("</Control>\r\n");
-			
+        String cmdStr = frontEndCmdString(cmdCode, parameter1, parameter2, combineCode2);
+        StringBuffer ptzXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        ptzXml.append("<Control>\r\n");
+        ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        ptzXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        ptzXml.append("<PTZCmd>" + cmdStr + "</PTZCmd>\r\n");
+        ptzXml.append("<Info>\r\n");
+        ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");
+        ptzXml.append("</Info>\r\n");
+        ptzXml.append("</Control>\r\n");
 
-			CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
 
-			Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		} 
-		return false;
-	}
 
-	/**
-	 * 鍓嶇鎺у埗鎸囦护锛堢敤浜庤浆鍙戜笂绾ф寚浠わ級
-	 * @param device		鎺у埗璁惧
-	 * @param channelId		棰勮閫氶亾
-	 * @param cmdString		鍓嶇鎺у埗鎸囦护涓�
-	 */
-	@Override
-	public boolean fronEndCmd(Device device, String channelId, String cmdString, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) {
-		try {
-			StringBuffer ptzXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			ptzXml.append("<Control>\r\n");
-			ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			ptzXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			ptzXml.append("<PTZCmd>" + cmdString + "</PTZCmd>\r\n");
-			ptzXml.append("<Info>\r\n");
-			ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");
-			ptzXml.append("</Info>\r\n");
-			ptzXml.append("</Control>\r\n");
-			
 
-			CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        SIPRequest request = (SIPRequest) headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest(request);
 
-			Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent, okEvent);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		} 
-		return false;
-	}
-	
-	 /**
-	 * 	璇锋眰棰勮瑙嗛娴�
-	  * @param device  瑙嗛璁惧
-	  * @param channelId  棰勮閫氶亾
-	  * @param event hook璁㈤槄
-	  * @param errorEvent sip閿欒璁㈤槄
-	*/
-	@Override
-	public void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
-							  ZlmHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {
-		String stream = ssrcInfo.getStream();
-		try {
-			if (device == null) {
-				return;
-			}
-//			String streamMode = device.getStreamMode().toUpperCase();
+    }
 
-			logger.info("{} 鍒嗛厤鐨刏LM涓�: {} [{}:{}]", stream, mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
-			HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", stream, true, "rtsp", mediaServerItem.getId());
-			subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json)->{
-				if (event != null) {
-					event.response(mediaServerItemInUse, json);
-					subscribe.removeSubscribe(hookSubscribe);
-				}
-			});
-			//
-			StringBuffer content = new StringBuffer(200);
-			content.append("v=0\r\n");
-			content.append("o="+ channelId+" 0 0 IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");
-			content.append("s=Play\r\n");
-			content.append("c=IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");
-			content.append("t=0 0\r\n");
+    /**
+     * 鍓嶇鎺у埗鎸囦护锛堢敤浜庤浆鍙戜笂绾ф寚浠わ級
+     *
+     * @param device    鎺у埗璁惧
+     * @param channelId 棰勮閫氶亾
+     * @param cmdString 鍓嶇鎺у埗鎸囦护涓�
+     */
+    @Override
+    public void fronEndCmd(Device device, String channelId, String cmdString, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			if (userSetting.isSeniorSdp()) {
-				if("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
-				}else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
-				}else if("UDP".equalsIgnoreCase(device.getStreamMode())) {
-					content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");
-				}
-				content.append("a=recvonly\r\n");
-				content.append("a=rtpmap:96 PS/90000\r\n");
-				content.append("a=fmtp:126 profile-level-id=42e01e\r\n");
-				content.append("a=rtpmap:126 H264/90000\r\n");
-				content.append("a=rtpmap:125 H264S/90000\r\n");
-				content.append("a=fmtp:125 profile-level-id=42e01e\r\n");
-				content.append("a=rtpmap:99 H265/90000\r\n");
-				content.append("a=rtpmap:98 H264/90000\r\n");
-				content.append("a=rtpmap:97 MPEG4/90000\r\n");
-				if("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())){ // tcp琚姩妯″紡
-					content.append("a=setup:passive\r\n");
-					content.append("a=connection:new\r\n");
-				}else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp涓诲姩妯″紡
-					content.append("a=setup:active\r\n");
-					content.append("a=connection:new\r\n");
-				}
-			}else {
-				if("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
-				}else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
-				}else if("UDP".equalsIgnoreCase(device.getStreamMode())) {
-					content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
-				}
-				content.append("a=recvonly\r\n");
-				content.append("a=rtpmap:96 PS/90000\r\n");
-				content.append("a=rtpmap:98 H264/90000\r\n");
-				content.append("a=rtpmap:97 MPEG4/90000\r\n");
-				content.append("a=rtpmap:99 H265/90000\r\n");
-				if ("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp琚姩妯″紡
-					content.append("a=setup:passive\r\n");
-					content.append("a=connection:new\r\n");
-				} else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp涓诲姩妯″紡
-					content.append("a=setup:active\r\n");
-					content.append("a=connection:new\r\n");
-				}
-			}
+        StringBuffer ptzXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        ptzXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        ptzXml.append("<Control>\r\n");
+        ptzXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        ptzXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        ptzXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        ptzXml.append("<PTZCmd>" + cmdString + "</PTZCmd>\r\n");
+        ptzXml.append("<Info>\r\n");
+        ptzXml.append("<ControlPriority>5</ControlPriority>\r\n");
+        ptzXml.append("</Info>\r\n");
+        ptzXml.append("</Control>\r\n");
+        
+        
+        Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest(request, errorEvent, okEvent);
 
-			content.append("y="+ssrcInfo.getSsrc()+"\r\n");//ssrc
-			// f瀛楁:f= v/缂栫爜鏍煎紡/鍒嗚鲸鐜�/甯х巼/鐮佺巼绫诲瀷/鐮佺巼澶у皬a/缂栫爜鏍煎紡/鐮佺巼澶у皬/閲囨牱鐜�
+    }
+
+    /**
+     * 璇锋眰棰勮瑙嗛娴�
+     *
+     * @param device     瑙嗛璁惧
+     * @param channelId  棰勮閫氶亾
+     * @param event      hook璁㈤槄
+     * @param errorEvent sip閿欒璁㈤槄
+     */
+    @Override
+    public void playStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
+                              ZlmHttpHookSubscribe.Event event, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
+        String stream = ssrcInfo.getStream();
+
+        if (device == null) {
+            return;
+        }
+
+        logger.info("{} 鍒嗛厤鐨刏LM涓�: {} [{}:{}]", stream, mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
+        HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", stream, true, "rtsp", mediaServerItem.getId());
+        subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json) -> {
+            if (event != null) {
+                event.response(mediaServerItemInUse, json);
+                subscribe.removeSubscribe(hookSubscribe);
+            }
+        });
+        //
+        StringBuffer content = new StringBuffer(200);
+        content.append("v=0\r\n");
+        content.append("o=" + channelId + " 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
+        content.append("s=Play\r\n");
+        content.append("c=IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
+        content.append("t=0 0\r\n");
+
+        if (userSetting.isSeniorSdp()) {
+            if ("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
+            } else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
+            } else if ("UDP".equalsIgnoreCase(device.getStreamMode())) {
+                content.append("m=video " + ssrcInfo.getPort() + " RTP/AVP 96 126 125 99 34 98 97\r\n");
+            }
+            content.append("a=recvonly\r\n");
+            content.append("a=rtpmap:96 PS/90000\r\n");
+            content.append("a=fmtp:126 profile-level-id=42e01e\r\n");
+            content.append("a=rtpmap:126 H264/90000\r\n");
+            content.append("a=rtpmap:125 H264S/90000\r\n");
+            content.append("a=fmtp:125 profile-level-id=42e01e\r\n");
+            content.append("a=rtpmap:99 H265/90000\r\n");
+            content.append("a=rtpmap:98 H264/90000\r\n");
+            content.append("a=rtpmap:97 MPEG4/90000\r\n");
+            if ("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp琚姩妯″紡
+                content.append("a=setup:passive\r\n");
+                content.append("a=connection:new\r\n");
+            } else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp涓诲姩妯″紡
+                content.append("a=setup:active\r\n");
+                content.append("a=connection:new\r\n");
+            }
+        } else {
+            if ("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 97 98 99\r\n");
+            } else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 97 98 99\r\n");
+            } else if ("UDP".equalsIgnoreCase(device.getStreamMode())) {
+                content.append("m=video " + ssrcInfo.getPort() + " RTP/AVP 96 97 98 99\r\n");
+            }
+            content.append("a=recvonly\r\n");
+            content.append("a=rtpmap:96 PS/90000\r\n");
+            content.append("a=rtpmap:98 H264/90000\r\n");
+            content.append("a=rtpmap:97 MPEG4/90000\r\n");
+            content.append("a=rtpmap:99 H265/90000\r\n");
+            if ("TCP-PASSIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp琚姩妯″紡
+                content.append("a=setup:passive\r\n");
+                content.append("a=connection:new\r\n");
+            } else if ("TCP-ACTIVE".equalsIgnoreCase(device.getStreamMode())) { // tcp涓诲姩妯″紡
+                content.append("a=setup:active\r\n");
+                content.append("a=connection:new\r\n");
+            }
+        }
+
+        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc
+        // f瀛楁:f= v/缂栫爜鏍煎紡/鍒嗚鲸鐜�/甯х巼/鐮佺巼绫诲瀷/鐮佺巼澶у皬a/缂栫爜鏍煎紡/鐮佺巼澶у皬/閲囨牱鐜�
 //			content.append("f=v/2/5/25/1/4000a/1/8/1" + "\r\n"); // 鏈彂鐜版敮鎸佹鐗规�х殑璁惧
 
-			CallIdHeader callIdHeader = device.getTransport().equalsIgnoreCase("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
 
-			Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(), callIdHeader);
 
-			transmitRequest(device, request, (e -> {
-				streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
-				mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
-				errorEvent.response(e);
-			}), e ->{
-				// 杩欓噷涓轰緥閬垮厤涓�涓�氶亾鐨勭偣鎾彧鏈変竴涓猚allID杩欎釜鍙傛暟浣跨敤涓�涓浐瀹氬��
-				streamSession.put(device.getDeviceId(), channelId ,"play", stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), ((ResponseEvent)e.event).getClientTransaction(), VideoStreamSessionManager.SessionType.play);
-				streamSession.put(device.getDeviceId(), channelId ,"play", e.dialog);
-				okEvent.response(e);
-			});
+        Request request = headerProvider.createInviteRequest(device, channelId, content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(),sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, (e -> {
+            streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
+            mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
+            errorEvent.response(e);
+        }), e -> {
+            // 杩欓噷涓轰緥閬垮厤涓�涓�氶亾鐨勭偣鎾彧鏈変竴涓猚allID杩欎釜鍙傛暟浣跨敤涓�涓浐瀹氬��
+            ResponseEvent responseEvent = (ResponseEvent) e.event;
+            SIPResponse response = (SIPResponse) responseEvent.getResponse();
+            streamSession.put(device.getDeviceId(), channelId, "play", stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.play);
+            okEvent.response(e);
+        });
+    }
 
-			
-		} catch ( SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * 璇锋眰鍥炴斁瑙嗛娴�
-	 * 
-	 * @param device  瑙嗛璁惧
-	 * @param channelId  棰勮閫氶亾
-	 * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
-	 * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
-	 */ 
-	@Override
-	public void playbackStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
-								  String startTime, String endTime, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,
-								  SipSubscribe.Event okEvent,SipSubscribe.Event errorEvent) {
-		try {
+    /**
+     * 璇锋眰鍥炴斁瑙嗛娴�
+     *
+     * @param device    瑙嗛璁惧
+     * @param channelId 棰勮閫氶亾
+     * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+     * @param endTime   缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+     */
+    @Override
+    public void playbackStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
+                                  String startTime, String endTime, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,
+                                  SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			logger.info("{} 鍒嗛厤鐨刏LM涓�: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
 
-			StringBuffer content = new StringBuffer(200);
-	        content.append("v=0\r\n");
-	        content.append("o="+channelId+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
-	        content.append("s=Playback\r\n");
-	        content.append("u="+channelId+":0\r\n");
-	        content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");
-	        content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" "
-					+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n");
+        logger.info("{} 鍒嗛厤鐨刏LM涓�: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
 
-			String streamMode = device.getStreamMode();
+        StringBuffer content = new StringBuffer(200);
+        content.append("v=0\r\n");
+        content.append("o=" + channelId + " 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
+        content.append("s=Playback\r\n");
+        content.append("u=" + channelId + ":0\r\n");
+        content.append("c=IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
+        content.append("t=" + DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime) + " "
+                + DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) + "\r\n");
 
-			if (userSetting.isSeniorSdp()) {
-				if("TCP-PASSIVE".equalsIgnoreCase(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
-				}else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
-				}else if("UDP".equalsIgnoreCase(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");
-				}
-				content.append("a=recvonly\r\n");
-				content.append("a=rtpmap:96 PS/90000\r\n");
-				content.append("a=fmtp:126 profile-level-id=42e01e\r\n");
-				content.append("a=rtpmap:126 H264/90000\r\n");
-				content.append("a=rtpmap:125 H264S/90000\r\n");
-				content.append("a=fmtp:125 profile-level-id=42e01e\r\n");
-				content.append("a=rtpmap:99 H265/90000\r\n");
-				content.append("a=rtpmap:98 H264/90000\r\n");
-				content.append("a=rtpmap:97 MPEG4/90000\r\n");
-				if("TCP-PASSIVE".equalsIgnoreCase(streamMode)){ // tcp琚姩妯″紡
-					content.append("a=setup:passive\r\n");
-					content.append("a=connection:new\r\n");
-				}else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) { // tcp涓诲姩妯″紡
-					content.append("a=setup:active\r\n");
-					content.append("a=connection:new\r\n");
-				}
-			}else {
-				if("TCP-PASSIVE".equalsIgnoreCase(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
-				}else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
-				}else if("UDP".equalsIgnoreCase(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
-				}
-				content.append("a=recvonly\r\n");
-				content.append("a=rtpmap:96 PS/90000\r\n");
-				content.append("a=rtpmap:97 MPEG4/90000\r\n");
-				content.append("a=rtpmap:98 H264/90000\r\n");
-				content.append("a=rtpmap:99 H265/90000\r\n");
-				if("TCP-PASSIVE".equalsIgnoreCase(streamMode)){ // tcp琚姩妯″紡
-					content.append("a=setup:passive\r\n");
-					content.append("a=connection:new\r\n");
-				}else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) { // tcp涓诲姩妯″紡
-					content.append("a=setup:active\r\n");
-					content.append("a=connection:new\r\n");
-				}
-			}
+        String streamMode = device.getStreamMode();
 
-	        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc
+        if (userSetting.isSeniorSdp()) {
+            if ("TCP-PASSIVE".equalsIgnoreCase(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
+            } else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
+            } else if ("UDP".equalsIgnoreCase(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " RTP/AVP 96 126 125 99 34 98 97\r\n");
+            }
+            content.append("a=recvonly\r\n");
+            content.append("a=rtpmap:96 PS/90000\r\n");
+            content.append("a=fmtp:126 profile-level-id=42e01e\r\n");
+            content.append("a=rtpmap:126 H264/90000\r\n");
+            content.append("a=rtpmap:125 H264S/90000\r\n");
+            content.append("a=fmtp:125 profile-level-id=42e01e\r\n");
+            content.append("a=rtpmap:99 H265/90000\r\n");
+            content.append("a=rtpmap:98 H264/90000\r\n");
+            content.append("a=rtpmap:97 MPEG4/90000\r\n");
+            if ("TCP-PASSIVE".equalsIgnoreCase(streamMode)) { // tcp琚姩妯″紡
+                content.append("a=setup:passive\r\n");
+                content.append("a=connection:new\r\n");
+            } else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) { // tcp涓诲姩妯″紡
+                content.append("a=setup:active\r\n");
+                content.append("a=connection:new\r\n");
+            }
+        } else {
+            if ("TCP-PASSIVE".equalsIgnoreCase(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 97 98 99\r\n");
+            } else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 97 98 99\r\n");
+            } else if ("UDP".equalsIgnoreCase(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " RTP/AVP 96 97 98 99\r\n");
+            }
+            content.append("a=recvonly\r\n");
+            content.append("a=rtpmap:96 PS/90000\r\n");
+            content.append("a=rtpmap:97 MPEG4/90000\r\n");
+            content.append("a=rtpmap:98 H264/90000\r\n");
+            content.append("a=rtpmap:99 H265/90000\r\n");
+            if ("TCP-PASSIVE".equalsIgnoreCase(streamMode)) { // tcp琚姩妯″紡
+                content.append("a=setup:passive\r\n");
+                content.append("a=connection:new\r\n");
+            } else if ("TCP-ACTIVE".equalsIgnoreCase(streamMode)) { // tcp涓诲姩妯″紡
+                content.append("a=setup:active\r\n");
+                content.append("a=connection:new\r\n");
+            }
+        }
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
-			HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());
-			// 娣诲姞璁㈤槄
-			subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json)->{
-						if (hookEvent != null) {
-							InviteStreamInfo inviteStreamInfo = new InviteStreamInfo(mediaServerItemInUse, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream());
-							hookEvent.call(inviteStreamInfo);
-						}
-						subscribe.removeSubscribe(hookSubscribe);
-					});
-	        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader, ssrcInfo.getSsrc());
+        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc
 
-	        transmitRequest(device, request, errorEvent, event -> {
-				ResponseEvent responseEvent = (ResponseEvent) event.event;
-	        	streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction(), VideoStreamSessionManager.SessionType.playback);
-				streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), event.dialog);
-				okEvent.response(event);
-			});
-			if (inviteStreamCallback != null) {
-				inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));
-			}
-		} catch ( SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		}
-	}
+        HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());
+        // 娣诲姞璁㈤槄
+        subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json) -> {
+            if (hookEvent != null) {
+                InviteStreamInfo inviteStreamInfo = new InviteStreamInfo(mediaServerItemInUse, json,sipSender.getNewCallIdHeader(device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream());
+                hookEvent.call(inviteStreamInfo);
+            }
+            subscribe.removeSubscribe(hookSubscribe);
+        });
+        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()), ssrcInfo.getSsrc());
 
-	/**
-	 * 璇锋眰鍘嗗彶濯掍綋涓嬭浇
-	 * 
-	 * @param device  瑙嗛璁惧
-	 * @param channelId  棰勮閫氶亾
-	 * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
-	 * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
-	 * @param downloadSpeed 涓嬭浇鍊嶉�熷弬鏁�
-	 */ 
-	@Override
-	public void downloadStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
-								  String startTime, String endTime, int downloadSpeed, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,
-								  SipSubscribe.Event errorEvent) {
-		try {
-			logger.info("{} 鍒嗛厤鐨刏LM涓�: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
+        sipSender.transmitRequest( request, errorEvent, event -> {
+            ResponseEvent responseEvent = (ResponseEvent) event.event;
+            SIPResponse response = (SIPResponse) responseEvent.getResponse();
+            streamSession.put(device.getDeviceId(), channelId,sipSender.getNewCallIdHeader(device.getTransport()).getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.playback);
+            okEvent.response(event);
+        });
+        if (inviteStreamCallback != null) {
+            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null,sipSender.getNewCallIdHeader(device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream()));
+        }
+    }
 
-			StringBuffer content = new StringBuffer(200);
-	        content.append("v=0\r\n");
-	        content.append("o="+channelId+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
-	        content.append("s=Download\r\n");
-	        content.append("u="+channelId+":0\r\n");
-	        content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");
-	        content.append("t="+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime)+" "
-					+DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) +"\r\n");
+    /**
+     * 璇锋眰鍘嗗彶濯掍綋涓嬭浇
+     *
+     * @param device        瑙嗛璁惧
+     * @param channelId     棰勮閫氶亾
+     * @param startTime     寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+     * @param endTime       缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+     * @param downloadSpeed 涓嬭浇鍊嶉�熷弬鏁�
+     */
+    @Override
+    public void downloadStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
+                                  String startTime, String endTime, int downloadSpeed, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,
+                                  SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			String streamMode = device.getStreamMode().toUpperCase();
+        logger.info("{} 鍒嗛厤鐨刏LM涓�: {} [{}:{}]", ssrcInfo.getStream(), mediaServerItem.getId(), mediaServerItem.getIp(), ssrcInfo.getPort());
 
-			if (userSetting.isSeniorSdp()) {
-				if("TCP-PASSIVE".equals(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
-				}else if ("TCP-ACTIVE".equals(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
-				}else if("UDP".equals(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 126 125 99 34 98 97\r\n");
-				}
-				content.append("a=recvonly\r\n");
-				content.append("a=rtpmap:96 PS/90000\r\n");
-				content.append("a=fmtp:126 profile-level-id=42e01e\r\n");
-				content.append("a=rtpmap:126 H264/90000\r\n");
-				content.append("a=rtpmap:125 H264S/90000\r\n");
-				content.append("a=fmtp:125 profile-level-id=42e01e\r\n");
-				content.append("a=rtpmap:99 MP4V-ES/90000\r\n");
-				content.append("a=fmtp:99 profile-level-id=3\r\n");
-				content.append("a=rtpmap:98 H264/90000\r\n");
-				content.append("a=rtpmap:97 MPEG4/90000\r\n");
-				if("TCP-PASSIVE".equals(streamMode)){ // tcp琚姩妯″紡
-					content.append("a=setup:passive\r\n");
-					content.append("a=connection:new\r\n");
-				}else if ("TCP-ACTIVE".equals(streamMode)) { // tcp涓诲姩妯″紡
-					content.append("a=setup:active\r\n");
-					content.append("a=connection:new\r\n");
-				}
-			}else {
-				if("TCP-PASSIVE".equals(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
-				}else if ("TCP-ACTIVE".equals(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
-				}else if("UDP".equals(streamMode)) {
-					content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
-				}
-				content.append("a=recvonly\r\n");
-				content.append("a=rtpmap:96 PS/90000\r\n");
-				content.append("a=rtpmap:97 MPEG4/90000\r\n");
-				content.append("a=rtpmap:98 H264/90000\r\n");
-				content.append("a=rtpmap:99 H265/90000\r\n");
-				if("TCP-PASSIVE".equals(streamMode)){ // tcp琚姩妯″紡
-					content.append("a=setup:passive\r\n");
-					content.append("a=connection:new\r\n");
-				}else if ("TCP-ACTIVE".equals(streamMode)) { // tcp涓诲姩妯″紡
-					content.append("a=setup:active\r\n");
-					content.append("a=connection:new\r\n");
-				}
-			}
-			content.append("a=downloadspeed:" + downloadSpeed + "\r\n");
+        StringBuffer content = new StringBuffer(200);
+        content.append("v=0\r\n");
+        content.append("o=" + channelId + " 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
+        content.append("s=Download\r\n");
+        content.append("u=" + channelId + ":0\r\n");
+        content.append("c=IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
+        content.append("t=" + DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(startTime) + " "
+                + DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime) + "\r\n");
 
-	        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc
+        String streamMode = device.getStreamMode().toUpperCase();
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        if (userSetting.isSeniorSdp()) {
+            if ("TCP-PASSIVE".equals(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
+            } else if ("TCP-ACTIVE".equals(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 126 125 99 34 98 97\r\n");
+            } else if ("UDP".equals(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " RTP/AVP 96 126 125 99 34 98 97\r\n");
+            }
+            content.append("a=recvonly\r\n");
+            content.append("a=rtpmap:96 PS/90000\r\n");
+            content.append("a=fmtp:126 profile-level-id=42e01e\r\n");
+            content.append("a=rtpmap:126 H264/90000\r\n");
+            content.append("a=rtpmap:125 H264S/90000\r\n");
+            content.append("a=fmtp:125 profile-level-id=42e01e\r\n");
+            content.append("a=rtpmap:99 MP4V-ES/90000\r\n");
+            content.append("a=fmtp:99 profile-level-id=3\r\n");
+            content.append("a=rtpmap:98 H264/90000\r\n");
+            content.append("a=rtpmap:97 MPEG4/90000\r\n");
+            if ("TCP-PASSIVE".equals(streamMode)) { // tcp琚姩妯″紡
+                content.append("a=setup:passive\r\n");
+                content.append("a=connection:new\r\n");
+            } else if ("TCP-ACTIVE".equals(streamMode)) { // tcp涓诲姩妯″紡
+                content.append("a=setup:active\r\n");
+                content.append("a=connection:new\r\n");
+            }
+        } else {
+            if ("TCP-PASSIVE".equals(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 97 98 99\r\n");
+            } else if ("TCP-ACTIVE".equals(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " TCP/RTP/AVP 96 97 98 99\r\n");
+            } else if ("UDP".equals(streamMode)) {
+                content.append("m=video " + ssrcInfo.getPort() + " RTP/AVP 96 97 98 99\r\n");
+            }
+            content.append("a=recvonly\r\n");
+            content.append("a=rtpmap:96 PS/90000\r\n");
+            content.append("a=rtpmap:97 MPEG4/90000\r\n");
+            content.append("a=rtpmap:98 H264/90000\r\n");
+            content.append("a=rtpmap:99 H265/90000\r\n");
+            if ("TCP-PASSIVE".equals(streamMode)) { // tcp琚姩妯″紡
+                content.append("a=setup:passive\r\n");
+                content.append("a=connection:new\r\n");
+            } else if ("TCP-ACTIVE".equals(streamMode)) { // tcp涓诲姩妯″紡
+                content.append("a=setup:active\r\n");
+                content.append("a=connection:new\r\n");
+            }
+        }
+        content.append("a=downloadspeed:" + downloadSpeed + "\r\n");
 
-			HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, null, mediaServerItem.getId());
-			// 娣诲姞璁㈤槄
-			subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json)->{
-						hookEvent.call(new InviteStreamInfo(mediaServerItem, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));
-						subscribe.removeSubscribe(hookSubscribe);
-						hookSubscribe.getContent().put("regist", false);
-						hookSubscribe.getContent().put("schema", "rtsp");
-						// 娣诲姞娴佹敞閿�鐨勮闃咃紝娉ㄩ攢浜嗗悗鍚戣澶囧彂閫乥ye
-						subscribe.addSubscribe(hookSubscribe,
-								(MediaServerItem mediaServerItemForEnd, JSONObject jsonForEnd)->{
-									ClientTransaction transaction = streamSession.getTransaction(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());
-									if (transaction != null) {
-										logger.info("[褰曞儚]涓嬭浇缁撴潫锛� 鍙戦�丅YE");
-										streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());
-									}
-								});
-					});
+        content.append("y=" + ssrcInfo.getSsrc() + "\r\n");//ssrc
+        
+        HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, null, mediaServerItem.getId());
+        // 娣诲姞璁㈤槄
+        subscribe.addSubscribe(hookSubscribe, (MediaServerItem mediaServerItemInUse, JSONObject json) -> {
+            hookEvent.call(new InviteStreamInfo(mediaServerItem, json,sipSender.getNewCallIdHeader(device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream()));
+            subscribe.removeSubscribe(hookSubscribe);
+            hookSubscribe.getContent().put("regist", false);
+            hookSubscribe.getContent().put("schema", "rtsp");
+            // 娣诲姞娴佹敞閿�鐨勮闃咃紝娉ㄩ攢浜嗗悗鍚戣澶囧彂閫乥ye
+            subscribe.addSubscribe(hookSubscribe,
+                    (MediaServerItem mediaServerItemForEnd, JSONObject jsonForEnd) -> {
+                        logger.info("[褰曞儚]涓嬭浇缁撴潫锛� 鍙戦�丅YE");
+                        try {
+                            streamByeCmd(device, channelId, ssrcInfo.getStream(),sipSender.getNewCallIdHeader(device.getTransport()).getCallId());
+                        } catch (InvalidArgumentException | ParseException | SipException |
+                                 SsrcTransactionNotFoundException e) {
+                            logger.error("[褰曞儚]涓嬭浇缁撴潫锛� 鍙戦�丅YE澶辫触 {}", e.getMessage());
+                        }
+                    });
+        });
 
-	        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader, ssrcInfo.getSsrc());
-			if (inviteStreamCallback != null) {
-				inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));
-			}
-	        transmitRequest(device, request, errorEvent, okEvent->{
-				ResponseEvent responseEvent = (ResponseEvent) okEvent.event;
-				streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), responseEvent.getClientTransaction(), VideoStreamSessionManager.SessionType.download);
-				streamSession.put(device.getDeviceId(), channelId, callIdHeader.getCallId(), okEvent.dialog);
-			});
+        Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()), ssrcInfo.getSsrc());
+        if (inviteStreamCallback != null) {
+            inviteStreamCallback.call(new InviteStreamInfo(mediaServerItem, null,sipSender.getNewCallIdHeader(device.getTransport()).getCallId(), "rtp", ssrcInfo.getStream()));
+        }
+        sipSender.transmitRequest( request, errorEvent, okEvent -> {
+            ResponseEvent responseEvent = (ResponseEvent) okEvent.event;
+            SIPResponse response = (SIPResponse) responseEvent.getResponse();
+            streamSession.put(device.getDeviceId(), channelId,sipSender.getNewCallIdHeader(device.getTransport()).getCallId(), ssrcInfo.getStream(), ssrcInfo.getSsrc(), mediaServerItem.getId(), response, VideoStreamSessionManager.SessionType.download);
+        });
+    }
 
+    /**
+     * 瑙嗛娴佸仠姝�, 涓嶄娇鐢ㄥ洖璋�
+     */
+    @Override
+    public void streamByeCmd(Device device, String channelId, String stream, String callId) throws InvalidArgumentException, ParseException, SipException, SsrcTransactionNotFoundException {
+        streamByeCmd(device, channelId, stream, callId, null);
+    }
 
-		} catch ( SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		}
-	}
+    /**
+     * 瑙嗛娴佸仠姝�
+     */
+    @Override
+    public void streamByeCmd(Device device, String channelId, String stream, String callId, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException, SsrcTransactionNotFoundException {
+        SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, callId, stream);
+        if (ssrcTransaction == null) {
+            throw new SsrcTransactionNotFoundException(device.getDeviceId(), channelId, callId, stream);
+        }
 
-	/**
-	 * 瑙嗛娴佸仠姝�, 涓嶄娇鐢ㄥ洖璋�
-	 */
-	@Override
-	public void streamByeCmd(String deviceId, String channelId, String stream, String callId) {
-		streamByeCmd(deviceId, channelId, stream, callId, null);
-	}
+        mediaServerService.releaseSsrc(ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());
+        mediaServerService.closeRTPServer(ssrcTransaction.getMediaServerId(), ssrcTransaction.getStream());
+        streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
 
-	/**
-	 * 瑙嗛娴佸仠姝�
-	 */
-	@Override
-	public void streamByeCmd(String deviceId, String channelId, String stream, String callId, SipSubscribe.Event okEvent) {
-		try {
-			SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, callId, stream);
-			ClientTransaction transaction = streamSession.getTransaction(deviceId, channelId, stream, callId);
+        Request byteRequest = headerProvider.createByteRequest(device, channelId, ssrcTransaction.getSipTransactionInfo());
+        sipSender.transmitRequest( byteRequest, null, okEvent);
+    }
 
-			if (transaction == null ) {
-				logger.warn("[ {} -> {}]鍋滄瑙嗛娴佺殑鏃跺�欏彂鐜颁簨鍔″凡涓㈠け", deviceId, channelId);
-				SipSubscribe.EventResult<Object> eventResult = new SipSubscribe.EventResult<>();
-				if (okEvent != null) {
-					okEvent.response(eventResult);
-				}
-				return;
-			}
-			SIPDialog dialog;
-			if (callId != null) {
-				dialog = streamSession.getDialogByCallId(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), callId);
-			}else {
-				if (stream == null && ssrcTransaction == null && ssrcTransaction.getStream() == null) {
-					return;
-				}
-				dialog = streamSession.getDialogByStream(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
-			}
-			mediaServerService.releaseSsrc(ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());
-			mediaServerService.closeRTPServer(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
-			streamSession.remove(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+    /**
+     * 璇煶骞挎挱
+     *
+     * @param device    瑙嗛璁惧
+     * @param channelId 棰勮閫氶亾
+     */
+    @Override
+    public void audioBroadcastCmd(Device device, String channelId) {
+    }
 
-			if (dialog == null) {
-				logger.warn("[ {} -> {}]鍋滄瑙嗛娴佺殑鏃跺�欏彂鐜板璇濆凡涓㈠け", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());
-				return;
-			}
-			SipStack sipStack = udpSipProvider.getSipStack();
-			SIPDialog sipDialog = ((SipStackImpl) sipStack).putDialog(dialog);
-			if (dialog != sipDialog) {
-				dialog = sipDialog;
-			}else {
-				dialog.setSipProvider(udpSipProvider);
-				try {
-					Field sipStackField = SIPDialog.class.getDeclaredField("sipStack");
-					sipStackField.setAccessible(true);
-					sipStackField.set(dialog, sipStack);
-					Field eventListenersField = SIPDialog.class.getDeclaredField("eventListeners");
-					eventListenersField.setAccessible(true);
-					eventListenersField.set(dialog, new HashSet<>());
-				} catch (NoSuchFieldException | IllegalAccessException e) {
-					e.printStackTrace();
-				}
-			}
+    /**
+     * 璇煶骞挎挱
+     *
+     * @param device 瑙嗛璁惧
+     */
+    @Override
+    public void audioBroadcastCmd(Device device) throws InvalidArgumentException, SipException, ParseException {
 
-			Request byeRequest = dialog.createRequest(Request.BYE);
-			SipURI byeURI = (SipURI) byeRequest.getRequestURI();
-			SIPRequest request = (SIPRequest)transaction.getRequest();
-			byeURI.setHost(request.getRemoteAddress().getHostAddress());
-			byeURI.setPort(request.getRemotePort());
-			byeURI.setUser(channelId);
-			ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME);
-			String protocol = viaHeader.getTransport().toUpperCase();
-			viaHeader.setRPort();
-			// 澧炲姞Contact header
-			Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getId(), sipConfig.getIp()+":"+sipConfig.getPort()));
-			byeRequest.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));
-			UserAgentHeader userAgentHeader = SipUtils.createUserAgentHeader(sipFactory);
-			byeRequest.addHeader(userAgentHeader);
-			ClientTransaction clientTransaction = null;
-			if("TCP".equals(protocol)) {
-				clientTransaction = tcpSipProvider.getNewClientTransaction(byeRequest);
-			} else if("UDP".equals(protocol)) {
-				clientTransaction = udpSipProvider.getNewClientTransaction(byeRequest);
-			}
+        StringBuffer broadcastXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        broadcastXml.append("<Notify>\r\n");
+        broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");
+        broadcastXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");
+        broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");
+        broadcastXml.append("</Notify>\r\n");
 
-			CallIdHeader callIdHeader = (CallIdHeader) byeRequest.getHeader(CallIdHeader.NAME);
-			if (okEvent != null) {
-				sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), okEvent);
-			}
-			CSeqHeader cSeqHeader = (CSeqHeader)byeRequest.getHeader(CSeqHeader.NAME);
-			cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());
-			dialog.sendRequest(clientTransaction);
+        
 
-		} catch (SipException | ParseException e) {
-			e.printStackTrace();
-		} catch (InvalidArgumentException e) {
-			throw new RuntimeException(e);
-		}
-	}
+        Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request);
 
-	/**
-	 * 璇煶骞挎挱
-	 * 
-	 * @param device  瑙嗛璁惧
-	 * @param channelId  棰勮閫氶亾
-	 */
-	@Override
-	public boolean audioBroadcastCmd(Device device, String channelId) {
-		// 鏀逛负鏂扮殑瀹炵幇
-		return false;
-	}
+    }
 
-	/**
-	 * 璇煶骞挎挱
-	 * 
-	 * @param device  瑙嗛璁惧
-	 */
-	@Override
-	public boolean audioBroadcastCmd(Device device) {
-		try {
-			StringBuffer broadcastXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			broadcastXml.append("<Notify>\r\n");
-			broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");
-			broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");
-			broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");
-			broadcastXml.append("</Notify>\r\n");
+    @Override
+    public void audioBroadcastCmd(Device device, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
-								
-			Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		} 
-		return false;
-	}
-	@Override
-	public void audioBroadcastCmd(Device device, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer broadcastXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			broadcastXml.append("<Notify>\r\n");
-			broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");
-			broadcastXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");
-			broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");
-			broadcastXml.append("</Notify>\r\n");
+        StringBuffer broadcastXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        broadcastXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        broadcastXml.append("<Notify>\r\n");
+        broadcastXml.append("<CmdType>Broadcast</CmdType>\r\n");
+        broadcastXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        broadcastXml.append("<SourceID>" + sipConfig.getId() + "</SourceID>\r\n");
+        broadcastXml.append("<TargetID>" + device.getDeviceId() + "</TargetID>\r\n");
+        broadcastXml.append("</Notify>\r\n");
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
-								
-			Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent);
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		} 
-	} 
-	
-	
-	/**
-	 * 闊宠棰戝綍鍍忔帶鍒�
-	 * 
-	 * @param device		瑙嗛璁惧
-	 * @param channelId  	棰勮閫氶亾
-	 * @param recordCmdStr	褰曞儚鍛戒护锛歊ecord / StopRecord
-	 */  
-	@Override
-	public boolean recordCmd(Device device, String channelId, String recordCmdStr, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Control>\r\n");
-			cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			if (ObjectUtils.isEmpty(channelId)) {
-				cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			} else {
-				cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			}
-			cmdXml.append("<RecordCmd>" + recordCmdStr + "</RecordCmd>\r\n");
-			cmdXml.append("</Control>\r\n");
+        
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        Request request = headerProvider.createMessageRequest(device, broadcastXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, errorEvent);
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
+    }
 
-	/**
-	 * 杩滅▼鍚姩鎺у埗鍛戒护
-	 * 
-	 * @param device	瑙嗛璁惧
-	 */
-	@Override
-	public boolean teleBootCmd(Device device) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Control>\r\n");
-			cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			cmdXml.append("<TeleBoot>Boot</TeleBoot>\r\n");
-			cmdXml.append("</Control>\r\n");
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+    /**
+     * 闊宠棰戝綍鍍忔帶鍒�
+     *
+     * @param device       瑙嗛璁惧
+     * @param channelId    棰勮閫氶亾
+     * @param recordCmdStr 褰曞儚鍛戒护锛歊ecord / StopRecord
+     */
+    @Override
+    public void recordCmd(Device device, String channelId, String recordCmdStr, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Control>\r\n");
+        cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        if (ObjectUtils.isEmpty(channelId)) {
+            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        } else {
+            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        }
+        cmdXml.append("<RecordCmd>" + recordCmdStr + "</RecordCmd>\r\n");
+        cmdXml.append("</Control>\r\n");
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
-	
-	/**
-	 * 鎶ヨ甯冮槻/鎾ら槻鍛戒护
-	 * 
-	 * @param device  		瑙嗛璁惧
-	 * @param guardCmdStr	"SetGuard"/"ResetGuard"
-	 */
-	@Override
-	public boolean guardCmd(Device device, String guardCmdStr, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Control>\r\n");
-			cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			cmdXml.append("<GuardCmd>" + guardCmdStr + "</GuardCmd>\r\n");
-			cmdXml.append("</Control>\r\n");
+        
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, errorEvent);
+    }
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
+    /**
+     * 杩滅▼鍚姩鎺у埗鍛戒护
+     *
+     * @param device 瑙嗛璁惧
+     */
+    @Override
+    public void teleBootCmd(Device device) throws InvalidArgumentException, SipException, ParseException {
 
-	/**
-	 * 鎶ヨ澶嶄綅鍛戒护
-	 * 
-	 * @param device  瑙嗛璁惧
-	 */  
-	@Override
-	public boolean alarmCmd(Device device, String alarmMethod, String alarmType, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Control>\r\n");
-			cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			cmdXml.append("<AlarmCmd>ResetAlarm</AlarmCmd>\r\n");
-			if (!ObjectUtils.isEmpty(alarmMethod) || !ObjectUtils.isEmpty(alarmType)) {
-				cmdXml.append("<Info>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(alarmMethod)) {
-				cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(alarmType)) {
-				cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(alarmMethod) || !ObjectUtils.isEmpty(alarmType)) {
-				cmdXml.append("</Info>\r\n");
-			}
-			cmdXml.append("</Control>\r\n");
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Control>\r\n");
+        cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        cmdXml.append("<TeleBoot>Boot</TeleBoot>\r\n");
+        cmdXml.append("</Control>\r\n");
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request);
+    }
 
-	/**
-	 * 寮哄埗鍏抽敭甯у懡浠�,璁惧鏀跺埌姝ゅ懡浠ゅ簲绔嬪埢鍙戦�佷竴涓狪DR甯�
-	 * 
-	 * @param device  瑙嗛璁惧
-	 * @param channelId  棰勮閫氶亾
-	 */ 
-	@Override
-	public boolean iFrameCmd(Device device, String channelId) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Control>\r\n");
-			cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			if (ObjectUtils.isEmpty(channelId)) {
-				cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			} else {
-				cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			}
-			cmdXml.append("<IFameCmd>Send</IFameCmd>\r\n");
-			cmdXml.append("</Control>\r\n");
+    /**
+     * 鎶ヨ甯冮槻/鎾ら槻鍛戒护
+     *
+     * @param device      瑙嗛璁惧
+     * @param guardCmdStr "SetGuard"/"ResetGuard"
+     */
+    @Override
+    public void guardCmd(Device device, String guardCmdStr, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Control>\r\n");
+        cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        cmdXml.append("<GuardCmd>" + guardCmdStr + "</GuardCmd>\r\n");
+        cmdXml.append("</Control>\r\n");
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
+        
 
-	/**
-	 * 鐪嬪畧浣嶆帶鍒跺懡浠�
-	 * 
-	 * @param device		瑙嗛璁惧
-	 * @param enabled		鐪嬪畧浣嶄娇鑳斤細1 = 寮�鍚紝0 = 鍏抽棴
-	 * @param resetTime		鑷姩褰掍綅鏃堕棿闂撮殧锛屽紑鍚湅瀹堜綅鏃朵娇鐢紝鍗曚綅:绉�(s)
-	 * @param presetIndex	璋冪敤棰勭疆浣嶇紪鍙凤紝寮�鍚湅瀹堜綅鏃朵娇鐢紝鍙栧�艰寖鍥�0~255
-	 */  
-	@Override
-	public boolean homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Control>\r\n");
-			cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			if (ObjectUtils.isEmpty(channelId)) {
-				cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			} else {
-				cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			}
-			cmdXml.append("<HomePosition>\r\n");
-			if (NumericUtil.isInteger(enabled) && (!enabled.equals("0"))) {
-				cmdXml.append("<Enabled>1</Enabled>\r\n");
-				if (NumericUtil.isInteger(resetTime)) {
-					cmdXml.append("<ResetTime>" + resetTime + "</ResetTime>\r\n");
-				} else {
-					cmdXml.append("<ResetTime>0</ResetTime>\r\n");
-				}
-				if (NumericUtil.isInteger(presetIndex)) {
-					cmdXml.append("<PresetIndex>" + presetIndex + "</PresetIndex>\r\n");
-				} else {
-					cmdXml.append("<PresetIndex>0</PresetIndex>\r\n");
-				}
-			} else {
-				cmdXml.append("<Enabled>0</Enabled>\r\n");
-			}
-			cmdXml.append("</HomePosition>\r\n");
-			cmdXml.append("</Control>\r\n");
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, errorEvent);
+    }
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+    /**
+     * 鎶ヨ澶嶄綅鍛戒护
+     *
+     * @param device 瑙嗛璁惧
+     */
+    @Override
+    public void alarmCmd(Device device, String alarmMethod, String alarmType, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Control>\r\n");
+        cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        cmdXml.append("<AlarmCmd>ResetAlarm</AlarmCmd>\r\n");
+        if (!ObjectUtils.isEmpty(alarmMethod) || !ObjectUtils.isEmpty(alarmType)) {
+            cmdXml.append("<Info>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(alarmMethod)) {
+            cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(alarmType)) {
+            cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(alarmMethod) || !ObjectUtils.isEmpty(alarmType)) {
+            cmdXml.append("</Info>\r\n");
+        }
+        cmdXml.append("</Control>\r\n");
 
-	/**
-	 * 璁惧閰嶇疆鍛戒护
-	 * 
-	 * @param device  瑙嗛璁惧
-	 */  
-	@Override
-	public boolean deviceConfigCmd(Device device) {
-		// TODO Auto-generated method stub
-		return false;
-	}
+        
 
-	/**
-	 * 璁惧閰嶇疆鍛戒护锛歜asicParam
-	 * 
-	 * @param device  			瑙嗛璁惧
-	 * @param channelId			閫氶亾缂栫爜锛堝彲閫夛級
-	 * @param name				璁惧/閫氶亾鍚嶇О锛堝彲閫夛級
-	 * @param expiration		娉ㄥ唽杩囨湡鏃堕棿锛堝彲閫夛級
-	 * @param heartBeatInterval	蹇冭烦闂撮殧鏃堕棿锛堝彲閫夛級
-	 * @param heartBeatCount	蹇冭烦瓒呮椂娆℃暟锛堝彲閫夛級
-	 */  
-	@Override
-	public boolean deviceBasicConfigCmd(Device device, String channelId, String name, String expiration, 
-										String heartBeatInterval, String heartBeatCount, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Control>\r\n");
-			cmdXml.append("<CmdType>DeviceConfig</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			if (ObjectUtils.isEmpty(channelId)) {
-				cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			} else {
-				cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			}
-			cmdXml.append("<BasicParam>\r\n");
-			if (!ObjectUtils.isEmpty(name)) {
-				cmdXml.append("<Name>" + name + "</Name>\r\n");
-			}
-			if (NumericUtil.isInteger(expiration)) {
-				if (Integer.valueOf(expiration) > 0) {
-					cmdXml.append("<Expiration>" + expiration + "</Expiration>\r\n");
-				}
-			}
-			if (NumericUtil.isInteger(heartBeatInterval)) {
-				if (Integer.valueOf(heartBeatInterval) > 0) {
-					cmdXml.append("<HeartBeatInterval>" + heartBeatInterval + "</HeartBeatInterval>\r\n");
-				}
-			}
-			if (NumericUtil.isInteger(heartBeatCount)) {
-				if (Integer.valueOf(heartBeatCount) > 0) {
-					cmdXml.append("<HeartBeatCount>" + heartBeatCount + "</HeartBeatCount>\r\n");
-				}
-			}
-			cmdXml.append("</BasicParam>\r\n");
-			cmdXml.append("</Control>\r\n");
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, errorEvent);
+    }
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+    /**
+     * 寮哄埗鍏抽敭甯у懡浠�,璁惧鏀跺埌姝ゅ懡浠ゅ簲绔嬪埢鍙戦�佷竴涓狪DR甯�
+     *
+     * @param device    瑙嗛璁惧
+     * @param channelId 棰勮閫氶亾
+     */
+    @Override
+    public void iFrameCmd(Device device, String channelId) throws InvalidArgumentException, SipException, ParseException {
+
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Control>\r\n");
+        cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        if (ObjectUtils.isEmpty(channelId)) {
+            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        } else {
+            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        }
+        cmdXml.append("<IFameCmd>Send</IFameCmd>\r\n");
+        cmdXml.append("</Control>\r\n");
+
+        
+
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request);
+    }
+
+    /**
+     * 鐪嬪畧浣嶆帶鍒跺懡浠�
+     *
+     * @param device      瑙嗛璁惧
+     * @param enabled     鐪嬪畧浣嶄娇鑳斤細1 = 寮�鍚紝0 = 鍏抽棴
+     * @param resetTime   鑷姩褰掍綅鏃堕棿闂撮殧锛屽紑鍚湅瀹堜綅鏃朵娇鐢紝鍗曚綅:绉�(s)
+     * @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紝寮�鍚湅瀹堜綅鏃朵娇鐢紝鍙栧�艰寖鍥�0~255
+     */
+    @Override
+    public void homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
+
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Control>\r\n");
+        cmdXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        if (ObjectUtils.isEmpty(channelId)) {
+            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        } else {
+            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        }
+        cmdXml.append("<HomePosition>\r\n");
+        if (NumericUtil.isInteger(enabled) && (!enabled.equals("0"))) {
+            cmdXml.append("<Enabled>1</Enabled>\r\n");
+            if (NumericUtil.isInteger(resetTime)) {
+                cmdXml.append("<ResetTime>" + resetTime + "</ResetTime>\r\n");
+            } else {
+                cmdXml.append("<ResetTime>0</ResetTime>\r\n");
+            }
+            if (NumericUtil.isInteger(presetIndex)) {
+                cmdXml.append("<PresetIndex>" + presetIndex + "</PresetIndex>\r\n");
+            } else {
+                cmdXml.append("<PresetIndex>0</PresetIndex>\r\n");
+            }
+        } else {
+            cmdXml.append("<Enabled>0</Enabled>\r\n");
+        }
+        cmdXml.append("</HomePosition>\r\n");
+        cmdXml.append("</Control>\r\n");
+
+        
+
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, errorEvent);
+    }
+
+    /**
+     * 璁惧閰嶇疆鍛戒护
+     *
+     * @param device 瑙嗛璁惧
+     */
+    @Override
+    public void deviceConfigCmd(Device device) {
+        // TODO Auto-generated method stub
+    }
+
+    /**
+     * 璁惧閰嶇疆鍛戒护锛歜asicParam
+     *
+     * @param device            瑙嗛璁惧
+     * @param channelId         閫氶亾缂栫爜锛堝彲閫夛級
+     * @param name              璁惧/閫氶亾鍚嶇О锛堝彲閫夛級
+     * @param expiration        娉ㄥ唽杩囨湡鏃堕棿锛堝彲閫夛級
+     * @param heartBeatInterval 蹇冭烦闂撮殧鏃堕棿锛堝彲閫夛級
+     * @param heartBeatCount    蹇冭烦瓒呮椂娆℃暟锛堝彲閫夛級
+     */
+    @Override
+    public void deviceBasicConfigCmd(Device device, String channelId, String name, String expiration,
+                                     String heartBeatInterval, String heartBeatCount, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
+
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Control>\r\n");
+        cmdXml.append("<CmdType>DeviceConfig</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        if (ObjectUtils.isEmpty(channelId)) {
+            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        } else {
+            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        }
+        cmdXml.append("<BasicParam>\r\n");
+        if (!ObjectUtils.isEmpty(name)) {
+            cmdXml.append("<Name>" + name + "</Name>\r\n");
+        }
+        if (NumericUtil.isInteger(expiration)) {
+            if (Integer.valueOf(expiration) > 0) {
+                cmdXml.append("<Expiration>" + expiration + "</Expiration>\r\n");
+            }
+        }
+        if (NumericUtil.isInteger(heartBeatInterval)) {
+            if (Integer.valueOf(heartBeatInterval) > 0) {
+                cmdXml.append("<HeartBeatInterval>" + heartBeatInterval + "</HeartBeatInterval>\r\n");
+            }
+        }
+        if (NumericUtil.isInteger(heartBeatCount)) {
+            if (Integer.valueOf(heartBeatCount) > 0) {
+                cmdXml.append("<HeartBeatCount>" + heartBeatCount + "</HeartBeatCount>\r\n");
+            }
+        }
+        cmdXml.append("</BasicParam>\r\n");
+        cmdXml.append("</Control>\r\n");
+
+        
+
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, errorEvent);
+    }
+
+    /**
+     * 鏌ヨ璁惧鐘舵��
+     *
+     * @param device 瑙嗛璁惧
+     */
+    @Override
+    public void deviceStatusQuery(Device device, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
+        String charset = device.getCharset();
+        StringBuffer catalogXml = new StringBuffer(200);
+        catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        catalogXml.append("<Query>\r\n");
+        catalogXml.append("<CmdType>DeviceStatus</CmdType>\r\n");
+        catalogXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        catalogXml.append("</Query>\r\n");
 
-	/**
-	 * 鏌ヨ璁惧鐘舵��
-	 * 
-	 * @param device 瑙嗛璁惧
-	 */  
-	@Override
-	public boolean deviceStatusQuery(Device device, SipSubscribe.Event errorEvent) {
-		try {
-			String charset = device.getCharset();
-			StringBuffer catalogXml = new StringBuffer(200);
-			catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			catalogXml.append("<Query>\r\n");
-			catalogXml.append("<CmdType>DeviceStatus</CmdType>\r\n");
-			catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			catalogXml.append("</Query>\r\n");
+        
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
 
-			Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
+        sipSender.transmitRequest( request, errorEvent);
+    }
 
-			transmitRequest(device, request, errorEvent);
-			return true;
-			
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
+    /**
+     * 鏌ヨ璁惧淇℃伅
+     *
+     * @param device 瑙嗛璁惧
+     */
+    @Override
+    public void deviceInfoQuery(Device device) throws InvalidArgumentException, SipException, ParseException {
 
-	/**
-	 * 鏌ヨ璁惧淇℃伅
-	 * 
-	 * @param device 瑙嗛璁惧
-	 */  
-	@Override
-	public boolean deviceInfoQuery(Device device) {
-		try {
-			StringBuffer catalogXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			catalogXml.append("<Query>\r\n");
-			catalogXml.append("<CmdType>DeviceInfo</CmdType>\r\n");
-			catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			catalogXml.append("</Query>\r\n");
+        StringBuffer catalogXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        catalogXml.append("<Query>\r\n");
+        catalogXml.append("<CmdType>DeviceInfo</CmdType>\r\n");
+        catalogXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        catalogXml.append("</Query>\r\n");
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        
 
-			Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
+        Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
 
-			transmitRequest(device, request);
-			
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		}
-		return true;
-	}
+        sipSender.transmitRequest( request);
 
-	/**
-	 * 鏌ヨ鐩綍鍒楄〃
-	 * 
-	 * @param device 瑙嗛璁惧
-	 */ 
-	@Override
-	public boolean catalogQuery(Device device, int sn, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer catalogXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			catalogXml.append("<Query>\r\n");
-			catalogXml.append("  <CmdType>Catalog</CmdType>\r\n");
-			catalogXml.append("  <SN>" + sn + "</SN>\r\n");
-			catalogXml.append("  <DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			catalogXml.append("</Query>\r\n");
+    }
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+    /**
+     * 鏌ヨ鐩綍鍒楄〃
+     *
+     * @param device 瑙嗛璁惧
+     */
+    @Override
+    public void catalogQuery(Device device, int sn, SipSubscribe.Event errorEvent) throws SipException, InvalidArgumentException, ParseException {
 
-			Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(),  SipUtils.getNewFromTag(), null, callIdHeader);
+        StringBuffer catalogXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        catalogXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        catalogXml.append("<Query>\r\n");
+        catalogXml.append("  <CmdType>Catalog</CmdType>\r\n");
+        catalogXml.append("  <SN>" + sn + "</SN>\r\n");
+        catalogXml.append("  <DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        catalogXml.append("</Query>\r\n");
 
-			transmitRequest(device, request, errorEvent);
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		}
-		return true;
-	}
+        
 
-	/**
-	 * 鏌ヨ褰曞儚淇℃伅
-	 * 
-	 * @param device 瑙嗛璁惧
-	 * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
-	 * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
-	 */  
-	@Override
-	public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn, Integer secrecy, String type, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {
-		if (secrecy == null) {
-			secrecy = 0;
-		}
-		if (type == null) {
-			type = "all";
-		}
-		try {
-			StringBuffer recordInfoXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			recordInfoXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			recordInfoXml.append("<Query>\r\n");
-			recordInfoXml.append("<CmdType>RecordInfo</CmdType>\r\n");
-			recordInfoXml.append("<SN>" + sn + "</SN>\r\n");
-			recordInfoXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			if (startTime != null) {
-				recordInfoXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>\r\n");
-			}
-			if (endTime != null) {
-				recordInfoXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>\r\n");
-			}
-			if (secrecy != null) {
-				recordInfoXml.append("<Secrecy> "+ secrecy + " </Secrecy>\r\n");
-			}
-			if (type != null) {
-				// 澶у崕NVR瑕佹眰蹇呴』澧炲姞涓�涓�间负all鐨勬枃鏈厓绱犺妭鐐筎ype
-				recordInfoXml.append("<Type>" + type+"</Type>\r\n");
-			}
-			recordInfoXml.append("</Query>\r\n");
-			
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
 
-			Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(),
-					SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
+        sipSender.transmitRequest( request, errorEvent);
+    }
 
-			transmitRequest(device, request, errorEvent, okEvent);
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		}
-		return true;
-	}
+    /**
+     * 鏌ヨ褰曞儚淇℃伅
+     *
+     * @param device    瑙嗛璁惧
+     * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+     * @param endTime   缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+     */
+    @Override
+    public void recordInfoQuery(Device device, String channelId, String startTime, String endTime, int sn, Integer secrecy, String type, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
+        if (secrecy == null) {
+            secrecy = 0;
+        }
+        if (type == null) {
+            type = "all";
+        }
 
-	/**
-	 * 鏌ヨ鎶ヨ淇℃伅
-	 * 
-	 * @param device		瑙嗛璁惧
-	 * @param startPriority	鎶ヨ璧峰绾у埆锛堝彲閫夛級
-	 * @param endPriority	鎶ヨ缁堟绾у埆锛堝彲閫夛級
-	 * @param alarmMethod	鎶ヨ鏂瑰紡鏉′欢锛堝彲閫夛級
-	 * @param alarmType		鎶ヨ绫诲瀷
-	 * @param startTime		鎶ヨ鍙戠敓璧峰鏃堕棿锛堝彲閫夛級
-	 * @param endTime		鎶ヨ鍙戠敓缁堟鏃堕棿锛堝彲閫夛級
-	 * @return				true = 鍛戒护鍙戦�佹垚鍔�
-	 */
-	@Override
-	public boolean alarmInfoQuery(Device device, String startPriority, String endPriority, String alarmMethod, String alarmType,
-								 String startTime, String endTime, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Query>\r\n");
-			cmdXml.append("<CmdType>Alarm</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			if (!ObjectUtils.isEmpty(startPriority)) {
-				cmdXml.append("<StartAlarmPriority>" + startPriority + "</StartAlarmPriority>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(endPriority)) {
-				cmdXml.append("<EndAlarmPriority>" + endPriority + "</EndAlarmPriority>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(alarmMethod)) {
-				cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(alarmType)) {
-				cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(startTime)) {
-				cmdXml.append("<StartAlarmTime>" + startTime + "</StartAlarmTime>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(endTime)) {
-				cmdXml.append("<EndAlarmTime>" + endTime + "</EndAlarmTime>\r\n");
-			}
-			cmdXml.append("</Query>\r\n");
-			
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        StringBuffer recordInfoXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        recordInfoXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        recordInfoXml.append("<Query>\r\n");
+        recordInfoXml.append("<CmdType>RecordInfo</CmdType>\r\n");
+        recordInfoXml.append("<SN>" + sn + "</SN>\r\n");
+        recordInfoXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        if (startTime != null) {
+            recordInfoXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>\r\n");
+        }
+        if (endTime != null) {
+            recordInfoXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>\r\n");
+        }
+        if (secrecy != null) {
+            recordInfoXml.append("<Secrecy> " + secrecy + " </Secrecy>\r\n");
+        }
+        if (type != null) {
+            // 澶у崕NVR瑕佹眰蹇呴』澧炲姞涓�涓�间负all鐨勬枃鏈厓绱犺妭鐐筎ype
+            recordInfoXml.append("<Type>" + type + "</Type>\r\n");
+        }
+        recordInfoXml.append("</Query>\r\n");
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
+        
 
-	/**
-	 * 鏌ヨ璁惧閰嶇疆
-	 * 
-	 * @param device 		瑙嗛璁惧
-	 * @param channelId		閫氶亾缂栫爜锛堝彲閫夛級
-	 * @param configType	閰嶇疆绫诲瀷锛�
-	 */
-	@Override
-	public boolean deviceConfigQuery(Device device, String channelId, String configType,  SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Query>\r\n");
-			cmdXml.append("<CmdType>ConfigDownload</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			if (ObjectUtils.isEmpty(channelId)) {
-				cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			} else {
-				cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			}
-			cmdXml.append("<ConfigType>" + configType + "</ConfigType>\r\n");
-			cmdXml.append("</Query>\r\n");
-			
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(),
+                SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
+        sipSender.transmitRequest( request, errorEvent, okEvent);
+    }
 
-	/**
-	 * 鏌ヨ璁惧棰勭疆浣嶇疆
-	 * 
-	 * @param device 瑙嗛璁惧
-	 */  
-	@Override
-	public boolean presetQuery(Device device, String channelId, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Query>\r\n");
-			cmdXml.append("<CmdType>PresetQuery</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			if (ObjectUtils.isEmpty(channelId)) {
-				cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			} else {
-				cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			}
-			cmdXml.append("</Query>\r\n");
-			
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+    /**
+     * 鏌ヨ鎶ヨ淇℃伅
+     *
+     * @param device        瑙嗛璁惧
+     * @param startPriority 鎶ヨ璧峰绾у埆锛堝彲閫夛級
+     * @param endPriority   鎶ヨ缁堟绾у埆锛堝彲閫夛級
+     * @param alarmMethod   鎶ヨ鏂瑰紡鏉′欢锛堝彲閫夛級
+     * @param alarmType     鎶ヨ绫诲瀷
+     * @param startTime     鎶ヨ鍙戠敓璧峰鏃堕棿锛堝彲閫夛級
+     * @param endTime       鎶ヨ鍙戠敓缁堟鏃堕棿锛堝彲閫夛級
+     * @return true = 鍛戒护鍙戦�佹垚鍔�
+     */
+    @Override
+    public void alarmInfoQuery(Device device, String startPriority, String endPriority, String alarmMethod, String alarmType,
+                               String startTime, String endTime, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request, errorEvent);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		} 
-	}
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Query>\r\n");
+        cmdXml.append("<CmdType>Alarm</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        if (!ObjectUtils.isEmpty(startPriority)) {
+            cmdXml.append("<StartAlarmPriority>" + startPriority + "</StartAlarmPriority>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(endPriority)) {
+            cmdXml.append("<EndAlarmPriority>" + endPriority + "</EndAlarmPriority>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(alarmMethod)) {
+            cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(alarmType)) {
+            cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(startTime)) {
+            cmdXml.append("<StartAlarmTime>" + startTime + "</StartAlarmTime>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(endTime)) {
+            cmdXml.append("<EndAlarmTime>" + endTime + "</EndAlarmTime>\r\n");
+        }
+        cmdXml.append("</Query>\r\n");
 
-	/**
-	 * 鏌ヨ绉诲姩璁惧浣嶇疆鏁版嵁
-	 * 
-	 * @param device 瑙嗛璁惧
-	 */  
-	@Override
-	public boolean mobilePostitionQuery(Device device, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer mobilePostitionXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			mobilePostitionXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			mobilePostitionXml.append("<Query>\r\n");
-			mobilePostitionXml.append("<CmdType>MobilePosition</CmdType>\r\n");
-			mobilePostitionXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			mobilePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			mobilePostitionXml.append("<Interval>60</Interval>\r\n");
-			mobilePostitionXml.append("</Query>\r\n");
-			
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        
 
-			Request request = headerProvider.createMessageRequest(device, mobilePostitionXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, errorEvent);
+    }
 
-			transmitRequest(device, request, errorEvent);
-			
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-			return false;
-		}
-		return true;
-	}
+    /**
+     * 鏌ヨ璁惧閰嶇疆
+     *
+     * @param device     瑙嗛璁惧
+     * @param channelId  閫氶亾缂栫爜锛堝彲閫夛級
+     * @param configType 閰嶇疆绫诲瀷锛�
+     */
+    @Override
+    public void deviceConfigQuery(Device device, String channelId, String configType, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-	/**
-	 * 璁㈤槄銆佸彇娑堣闃呯Щ鍔ㄤ綅缃�
-	 * 
-	 * @param device	瑙嗛璁惧
-	 * @return			true = 鍛戒护鍙戦�佹垚鍔�
-	 */
-	@Override
-	public boolean mobilePositionSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent ,SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer subscribePostitionXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			subscribePostitionXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			subscribePostitionXml.append("<Query>\r\n");
-			subscribePostitionXml.append("<CmdType>MobilePosition</CmdType>\r\n");
-			subscribePostitionXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			subscribePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			if (device.getSubscribeCycleForMobilePosition() > 0) {
-				subscribePostitionXml.append("<Interval>" + String.valueOf(device.getMobilePositionSubmissionInterval()) + "</Interval>\r\n");
-			}
-			subscribePostitionXml.append("</Query>\r\n");
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Query>\r\n");
+        cmdXml.append("<CmdType>ConfigDownload</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        if (ObjectUtils.isEmpty(channelId)) {
+            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        } else {
+            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        }
+        cmdXml.append("<ConfigType>" + configType + "</ConfigType>\r\n");
+        cmdXml.append("</Query>\r\n");
 
-			Request request;
-			if (dialog != null) {
-				SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());
-				request = dialog.createRequest(Request.SUBSCRIBE);
-				ExpiresHeader expiresHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForCatalog());
-				request.setExpires(expiresHeader);
+        
 
-				request.setRequestURI(requestURI);
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, errorEvent);
+    }
 
-				ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
-				request.setContent(subscribePostitionXml.toString(), contentTypeHeader);
+    /**
+     * 鏌ヨ璁惧棰勭疆浣嶇疆
+     *
+     * @param device 瑙嗛璁惧
+     */
+    @Override
+    public void presetQuery(Device device, String channelId, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-				CSeqHeader cSeqHeader = (CSeqHeader)request.getHeader(CSeqHeader.NAME);
-				cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());
-				request.removeHeader(CSeqHeader.NAME);
-				request.addHeader(cSeqHeader);
-			}else {
-				CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-						: udpSipProvider.getNewCallId();
-				request = headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, device.getSubscribeCycleForMobilePosition(), "presence" ,callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));
-			}
-			transmitRequest(device, request, errorEvent, okEvent);
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Query>\r\n");
+        cmdXml.append("<CmdType>PresetQuery</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        if (ObjectUtils.isEmpty(channelId)) {
+            cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        } else {
+            cmdXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        }
+        cmdXml.append("</Query>\r\n");
 
-			return true;
+        
 
-		} catch ( NumberFormatException | ParseException | InvalidArgumentException	| SipException e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
+        Request request = headerProvider.createMessageRequest(device, cmdXml.toString(), null, SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request, errorEvent);
+    }
 
-	/**
-	 * 璁㈤槄銆佸彇娑堣闃呮姤璀︿俊鎭�
-	 * 
-	 * @param device		瑙嗛璁惧
-	 * @param expires		璁㈤槄杩囨湡鏃堕棿锛�0 = 鍙栨秷璁㈤槄锛�
-	 * @param startPriority	鎶ヨ璧峰绾у埆锛堝彲閫夛級
-	 * @param endPriority	鎶ヨ缁堟绾у埆锛堝彲閫夛級
-	 * @param alarmMethod	鎶ヨ鏂瑰紡鏉′欢锛堝彲閫夛級
-	 * @param alarmType		鎶ヨ绫诲瀷
-	 * @param startTime		鎶ヨ鍙戠敓璧峰鏃堕棿锛堝彲閫夛級
-	 * @param endTime		鎶ヨ鍙戠敓缁堟鏃堕棿锛堝彲閫夛級
-	 * @return				true = 鍛戒护鍙戦�佹垚鍔�
-	 */
-	@Override
-	public boolean alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String alarmType, String startTime, String endTime) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Query>\r\n");
-			cmdXml.append("<CmdType>Alarm</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			if (!ObjectUtils.isEmpty(startPriority)) {
-				cmdXml.append("<StartAlarmPriority>" + startPriority + "</StartAlarmPriority>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(endPriority)) {
-				cmdXml.append("<EndAlarmPriority>" + endPriority + "</EndAlarmPriority>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(alarmMethod)) {
-				cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(alarmType)) {
-				cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(startTime)) {
-				cmdXml.append("<StartAlarmTime>" + startTime + "</StartAlarmTime>\r\n");
-			}
-			if (!ObjectUtils.isEmpty(endTime)) {
-				cmdXml.append("<EndAlarmTime>" + endTime + "</EndAlarmTime>\r\n");
-			}
-			cmdXml.append("</Query>\r\n");
+    /**
+     * 鏌ヨ绉诲姩璁惧浣嶇疆鏁版嵁
+     *
+     * @param device 瑙嗛璁惧
+     */
+    @Override
+    public void mobilePostitionQuery(Device device, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
+        StringBuffer mobilePostitionXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        mobilePostitionXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        mobilePostitionXml.append("<Query>\r\n");
+        mobilePostitionXml.append("<CmdType>MobilePosition</CmdType>\r\n");
+        mobilePostitionXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        mobilePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        mobilePostitionXml.append("<Interval>60</Interval>\r\n");
+        mobilePostitionXml.append("</Query>\r\n");
 
-			Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, expires, "presence" , callIdHeader);
-			transmitRequest(device, request);
+        
 
-			return true;
+        Request request = headerProvider.createMessageRequest(device, mobilePostitionXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
 
-		} catch ( NumberFormatException | ParseException | InvalidArgumentException	| SipException e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
+        sipSender.transmitRequest( request, errorEvent);
 
-	@Override
-	public boolean catalogSubscribe(Device device, Dialog dialog, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) {
-		try {
-			StringBuffer cmdXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			cmdXml.append("<Query>\r\n");
-			cmdXml.append("<CmdType>Catalog</CmdType>\r\n");
-			cmdXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			cmdXml.append("</Query>\r\n");
+    }
 
+    /**
+     * 璁㈤槄銆佸彇娑堣闃呯Щ鍔ㄤ綅缃�
+     *
+     * @param device 瑙嗛璁惧
+     * @return true = 鍛戒护鍙戦�佹垚鍔�
+     */
+    @Override
+    public SIPRequest mobilePositionSubscribe(Device device, SIPRequest requestOld, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-			Request request;
-			if (dialog != null) {
-				SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());
-				request = dialog.createRequest(Request.SUBSCRIBE);
-				ExpiresHeader expiresHeader = sipFactory.createHeaderFactory().createExpiresHeader(device.getSubscribeCycleForCatalog());
-				request.setExpires(expiresHeader);
+        StringBuffer subscribePostitionXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        subscribePostitionXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        subscribePostitionXml.append("<Query>\r\n");
+        subscribePostitionXml.append("<CmdType>MobilePosition</CmdType>\r\n");
+        subscribePostitionXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        subscribePostitionXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        if (device.getSubscribeCycleForMobilePosition() > 0) {
+            subscribePostitionXml.append("<Interval>" + device.getMobilePositionSubmissionInterval() + "</Interval>\r\n");
+        }
+        subscribePostitionXml.append("</Query>\r\n");
 
-				request.setRequestURI(requestURI);
+        CallIdHeader callIdHeader;
 
-				ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
-				request.setContent(cmdXml.toString(), contentTypeHeader);
+        if (requestOld != null) {
+            callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());
+        } else {
+            callIdHeader = sipSender.getNewCallIdHeader(device.getTransport());
+        }
+        SIPRequest request = (SIPRequest) headerProvider.createSubscribeRequest(device, subscribePostitionXml.toString(), requestOld, device.getSubscribeCycleForMobilePosition(), "presence",callIdHeader); //Position;id=" + tm.substring(tm.length() - 4));
 
-				CSeqHeader cSeqHeader = (CSeqHeader)request.getHeader(CSeqHeader.NAME);
-				cSeqHeader.setSeqNumber(redisCatchStorage.getCSEQ());
-				request.removeHeader(CSeqHeader.NAME);
-				request.addHeader(cSeqHeader);
+        sipSender.transmitRequest( request, errorEvent, okEvent);
+        return request;
+    }
 
-			}else {
-				CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-						: udpSipProvider.getNewCallId();
+    /**
+     * 璁㈤槄銆佸彇娑堣闃呮姤璀︿俊鎭�
+     *
+     * @param device        瑙嗛璁惧
+     * @param expires       璁㈤槄杩囨湡鏃堕棿锛�0 = 鍙栨秷璁㈤槄锛�
+     * @param startPriority 鎶ヨ璧峰绾у埆锛堝彲閫夛級
+     * @param endPriority   鎶ヨ缁堟绾у埆锛堝彲閫夛級
+     * @param alarmMethod   鎶ヨ鏂瑰紡鏉′欢锛堝彲閫夛級
+     * @param alarmType     鎶ヨ绫诲瀷
+     * @param startTime     鎶ヨ鍙戠敓璧峰鏃堕棿锛堝彲閫夛級
+     * @param endTime       鎶ヨ鍙戠敓缁堟鏃堕棿锛堝彲閫夛級
+     * @return true = 鍛戒护鍙戦�佹垚鍔�
+     */
+    @Override
+    public void alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String alarmType, String startTime, String endTime) throws InvalidArgumentException, SipException, ParseException {
 
-				// 鏈夋晥鏃堕棿榛樿涓�60绉掍互涓�
-				request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), SipUtils.getNewViaTag(),
-						SipUtils.getNewFromTag(), null, device.getSubscribeCycleForCatalog(), "Catalog" ,
-						callIdHeader);
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Query>\r\n");
+        cmdXml.append("<CmdType>Alarm</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        if (!ObjectUtils.isEmpty(startPriority)) {
+            cmdXml.append("<StartAlarmPriority>" + startPriority + "</StartAlarmPriority>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(endPriority)) {
+            cmdXml.append("<EndAlarmPriority>" + endPriority + "</EndAlarmPriority>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(alarmMethod)) {
+            cmdXml.append("<AlarmMethod>" + alarmMethod + "</AlarmMethod>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(alarmType)) {
+            cmdXml.append("<AlarmType>" + alarmType + "</AlarmType>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(startTime)) {
+            cmdXml.append("<StartAlarmTime>" + startTime + "</StartAlarmTime>\r\n");
+        }
+        if (!ObjectUtils.isEmpty(endTime)) {
+            cmdXml.append("<EndAlarmTime>" + endTime + "</EndAlarmTime>\r\n");
+        }
+        cmdXml.append("</Query>\r\n");
 
-			}
-			transmitRequest(device, request, errorEvent, okEvent);
-			return true;
+        
 
-		} catch ( NumberFormatException | ParseException | InvalidArgumentException	| SipException e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
+        Request request = headerProvider.createSubscribeRequest(device, cmdXml.toString(), null, expires, "presence",sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest( request);
 
-	@Override
-	public boolean dragZoomCmd(Device device, String channelId, String cmdString) {
-		try {
-			StringBuffer dragXml = new StringBuffer(200);
-			String charset = device.getCharset();
-			dragXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
-			dragXml.append("<Control>\r\n");
-			dragXml.append("<CmdType>DeviceControl</CmdType>\r\n");
-			dragXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
-			if (ObjectUtils.isEmpty(channelId)) {
-				dragXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
-			} else {
-				dragXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
-			}
-			dragXml.append(cmdString);
-			dragXml.append("</Control>\r\n");
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
-			Request request = headerProvider.createMessageRequest(device, dragXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
-			logger.debug("鎷夋淇′护锛� " + request.toString());
-			transmitRequest(device, request);
-			return true;
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
+    }
 
+    @Override
+    public SIPRequest catalogSubscribe(Device device, SIPRequest requestOld, SipSubscribe.Event okEvent, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException {
 
-	private ClientTransaction transmitRequest(Device device, Request request) throws SipException {
-		return transmitRequest(device, request, null, null);
-	}
+        StringBuffer cmdXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        cmdXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        cmdXml.append("<Query>\r\n");
+        cmdXml.append("<CmdType>Catalog</CmdType>\r\n");
+        cmdXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        cmdXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        cmdXml.append("</Query>\r\n");
 
-	private ClientTransaction transmitRequest(Device device, Request request, SipSubscribe.Event errorEvent) throws SipException {
-		return transmitRequest(device, request, errorEvent, null);
-	}
+        CallIdHeader callIdHeader;
 
-	private ClientTransaction transmitRequest(Device device, Request request, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws SipException {
-		ClientTransaction clientTransaction = null;
-		if("TCP".equals(device.getTransport())) {
-			clientTransaction = tcpSipProvider.getNewClientTransaction(request);
-		} else if("UDP".equals(device.getTransport())) {
-			clientTransaction = udpSipProvider.getNewClientTransaction(request);
-		}
-		if (request.getHeader(UserAgentHeader.NAME) == null) {
-			UserAgentHeader userAgentHeader = null;
-			try {
-				userAgentHeader = SipUtils.createUserAgentHeader(sipFactory);
-			} catch (ParseException e) {
-				logger.error("娣诲姞UserAgentHeader澶辫触", e);
-			}
-			request.addHeader(userAgentHeader);
-		}
-		CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME);
-		// 娣诲姞閿欒璁㈤槄
-		if (errorEvent != null) {
-			sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), (eventResult -> {
-				errorEvent.response(eventResult);
-				sipSubscribe.removeErrorSubscribe(eventResult.callId);
-				sipSubscribe.removeOkSubscribe(eventResult.callId);
-			}));
-		}
-		// 娣诲姞璁㈤槄
-		if (okEvent != null) {
-			sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), eventResult ->{
-				okEvent.response(eventResult);
-				sipSubscribe.removeOkSubscribe(eventResult.callId);
-				sipSubscribe.removeErrorSubscribe(eventResult.callId);
-			});
-		}
+        if (requestOld != null) {
+            callIdHeader = sipFactory.createHeaderFactory().createCallIdHeader(requestOld.getCallIdHeader().getCallId());
+        } else {
+            callIdHeader = sipSender.getNewCallIdHeader(device.getTransport());
+        }
 
-		clientTransaction.sendRequest();
-		return clientTransaction;
-	}
+        // 鏈夋晥鏃堕棿榛樿涓�60绉掍互涓�
+        SIPRequest request = (SIPRequest) headerProvider.createSubscribeRequest(device, cmdXml.toString(), requestOld, device.getSubscribeCycleForCatalog(), "Catalog",
+                callIdHeader);
+        sipSender.transmitRequest( request, errorEvent, okEvent);
+        return request;
+    }
 
-	/**
-	 * 鍥炴斁鏆傚仠
-	 */
-	@Override
-	public void playPauseCmd(Device device, StreamInfo streamInfo) {
-		try {
-			StringBuffer content = new StringBuffer(200);
-			content.append("PAUSE RTSP/1.0\r\n");
-			content.append("CSeq: " + getInfoCseq() + "\r\n");
-			content.append("PauseTime: now\r\n");
-			Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
-			if (request == null) {
-				return;
-			}
-			logger.info(request.toString());
-			ClientTransaction clientTransaction = null;
-			if ("TCP".equals(device.getTransport())) {
-				clientTransaction = tcpSipProvider.getNewClientTransaction(request);
-			} else if ("UDP".equals(device.getTransport())) {
-				clientTransaction = udpSipProvider.getNewClientTransaction(request);
-			}
-			if (clientTransaction != null) {
-				clientTransaction.sendRequest();
-			}
+    @Override
+    public void dragZoomCmd(Device device, String channelId, String cmdString) throws InvalidArgumentException, SipException, ParseException {
 
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		}
-	}
+        StringBuffer dragXml = new StringBuffer(200);
+        String charset = device.getCharset();
+        dragXml.append("<?xml version=\"1.0\" encoding=\"" + charset + "\"?>\r\n");
+        dragXml.append("<Control>\r\n");
+        dragXml.append("<CmdType>DeviceControl</CmdType>\r\n");
+        dragXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        if (ObjectUtils.isEmpty(channelId)) {
+            dragXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n");
+        } else {
+            dragXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
+        }
+        dragXml.append(cmdString);
+        dragXml.append("</Control>\r\n");
+        
+        Request request = headerProvider.createMessageRequest(device, dragXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        logger.debug("鎷夋淇′护锛� " + request.toString());
+        sipSender.transmitRequest(request);
+    }
 
-	/**
-	 * 鍥炴斁鎭㈠
-	 */
-	@Override
-	public void playResumeCmd(Device device, StreamInfo streamInfo) {
-		try {
-			StringBuffer content = new StringBuffer(200);
-			content.append("PLAY RTSP/1.0\r\n");
-			content.append("CSeq: " + getInfoCseq() + "\r\n");
-			content.append("Range: npt=now-\r\n");
-			Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
-			if (request == null) {
-				return;
-			}
-			logger.info(request.toString());
-			ClientTransaction clientTransaction = null;
-			if ("TCP".equals(device.getTransport())) {
-				clientTransaction = tcpSipProvider.getNewClientTransaction(request);
-			} else if ("UDP".equals(device.getTransport())) {
-				clientTransaction = udpSipProvider.getNewClientTransaction(request);
-			}
 
-			clientTransaction.sendRequest();
+    
 
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		}
-	}
 
-	/**
-	 * 鍥炴斁鎷栧姩鎾斁
-	 */
-	@Override
-	public void playSeekCmd(Device device, StreamInfo streamInfo, long seekTime) {
-		try {
-			StringBuffer content = new StringBuffer(200);
-			content.append("PLAY RTSP/1.0\r\n");
-			content.append("CSeq: " + getInfoCseq() + "\r\n");
-			content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");
+    /**
+     * 鍥炴斁鏆傚仠
+     */
+    @Override
+    public void playPauseCmd(Device device, StreamInfo streamInfo) throws InvalidArgumentException, ParseException, SipException {
+        StringBuffer content = new StringBuffer(200);
+        content.append("PAUSE RTSP/1.0\r\n");
+        content.append("CSeq: " + getInfoCseq() + "\r\n");
+        content.append("PauseTime: now\r\n");
 
-			Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
-			if (request == null) {
-				return;
-			}
-			logger.info(request.toString());
-			ClientTransaction clientTransaction = null;
-			if ("TCP".equals(device.getTransport())) {
-				clientTransaction = tcpSipProvider.getNewClientTransaction(request);
-			} else if ("UDP".equals(device.getTransport())) {
-				clientTransaction = udpSipProvider.getNewClientTransaction(request);
-			}
+        playbackControlCmd(device, streamInfo, content.toString(), null, null);
+    }
 
-			clientTransaction.sendRequest();
 
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		}
-	}
+    /**
+     * 鍥炴斁鎭㈠
+     */
+    @Override
+    public void playResumeCmd(Device device, StreamInfo streamInfo) throws InvalidArgumentException, ParseException, SipException {
+        StringBuffer content = new StringBuffer(200);
+        content.append("PLAY RTSP/1.0\r\n");
+        content.append("CSeq: " + getInfoCseq() + "\r\n");
+        content.append("Range: npt=now-\r\n");
 
-	/**
-	 * 鍥炴斁鍊嶉�熸挱鏀�
-	 */
-	@Override
-	public void playSpeedCmd(Device device, StreamInfo streamInfo, Double speed) {
-		try {
+        playbackControlCmd(device, streamInfo, content.toString(), null, null);
+    }
 
-			StringBuffer content = new StringBuffer(200);
-			content.append("PLAY RTSP/1.0\r\n");
-			content.append("CSeq: " + getInfoCseq() + "\r\n");
-			content.append("Scale: " + String.format("%.6f",speed) + "\r\n");
-			Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
-			if (request == null) {
-				return;
-			}
-			logger.info(request.toString());
-			ClientTransaction clientTransaction = null;
-			if ("TCP".equals(device.getTransport())) {
-				clientTransaction = tcpSipProvider.getNewClientTransaction(request);
-			} else if ("UDP".equals(device.getTransport())) {
-				clientTransaction = udpSipProvider.getNewClientTransaction(request);
-			}
+    /**
+     * 鍥炴斁鎷栧姩鎾斁
+     */
+    @Override
+    public void playSeekCmd(Device device, StreamInfo streamInfo, long seekTime) throws InvalidArgumentException, ParseException, SipException {
+        StringBuffer content = new StringBuffer(200);
+        content.append("PLAY RTSP/1.0\r\n");
+        content.append("CSeq: " + getInfoCseq() + "\r\n");
+        content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");
 
-			clientTransaction.sendRequest();
+        playbackControlCmd(device, streamInfo, content.toString(), null, null);
+    }
 
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		}
-	}
+    /**
+     * 鍥炴斁鍊嶉�熸挱鏀�
+     */
+    @Override
+    public void playSpeedCmd(Device device, StreamInfo streamInfo, Double speed) throws InvalidArgumentException, ParseException, SipException {
+        StringBuffer content = new StringBuffer(200);
+        content.append("PLAY RTSP/1.0\r\n");
+        content.append("CSeq: " + getInfoCseq() + "\r\n");
+        content.append("Scale: " + String.format("%.6f", speed) + "\r\n");
 
-	private int getInfoCseq() {
-		return (int) ((Math.random() * 9 + 1) * Math.pow(10, 8));
-	}
-	
-	@Override
-	public void playbackControlCmd(Device device, StreamInfo streamInfo, String content,SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) {
-		try {
-			Request request = headerProvider.createInfoRequest(device, streamInfo, content);
-			if (request == null) {
-				return;
-			}
-			ClientTransaction clientTransaction = null;
-			if ("TCP".equals(device.getTransport())) {
-				clientTransaction = tcpSipProvider.getNewClientTransaction(request);
-			} else if ("UDP".equals(device.getTransport())) {
-				clientTransaction = udpSipProvider.getNewClientTransaction(request);
-			}
-			CallIdHeader callIdHeader = (CallIdHeader)request.getHeader(CallIdHeader.NAME);
-			if(errorEvent != null) {
-				sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), (eventResult -> {
-					errorEvent.response(eventResult);
-					sipSubscribe.removeErrorSubscribe(eventResult.callId);
-					sipSubscribe.removeOkSubscribe(eventResult.callId);
-				}));
-			}
-			
-			if(okEvent != null) {
-				sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), eventResult -> {
-					okEvent.response(eventResult);
-					sipSubscribe.removeOkSubscribe(eventResult.callId);
-					sipSubscribe.removeErrorSubscribe(eventResult.callId);
-				});
-			}
-			clientTransaction.sendRequest();
-			
-		} catch (SipException | ParseException | InvalidArgumentException e) {
-			e.printStackTrace();
-		}
-	}
+        playbackControlCmd(device, streamInfo, content.toString(), null, null);
+    }
 
-	@Override
-	public boolean sendAlarmMessage(Device device, DeviceAlarm deviceAlarm) {
-		if (device == null) {
-			return false;
-		}
-		logger.info("[鍙戦�� 鎶ヨ閫氱煡] {}/{}->{},{}", device.getDeviceId(), deviceAlarm.getChannelId(),
-				deviceAlarm.getLongitude(), deviceAlarm.getLatitude());
-		try {
-			String characterSet = device.getCharset();
-			StringBuffer deviceStatusXml = new StringBuffer(600);
-			deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
-			deviceStatusXml.append("<Notify>\r\n");
-			deviceStatusXml.append("<CmdType>Alarm</CmdType>\r\n");
-			deviceStatusXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>\r\n");
-			deviceStatusXml.append("<DeviceID>" + deviceAlarm.getChannelId() + "</DeviceID>\r\n");
-			deviceStatusXml.append("<AlarmPriority>" + deviceAlarm.getAlarmPriority() + "</AlarmPriority>\r\n");
-			deviceStatusXml.append("<AlarmMethod>" + deviceAlarm.getAlarmMethod() + "</AlarmMethod>\r\n");
-			deviceStatusXml.append("<AlarmTime>" + deviceAlarm.getAlarmTime() + "</AlarmTime>\r\n");
-			deviceStatusXml.append("<AlarmDescription>" + deviceAlarm.getAlarmDescription() + "</AlarmDescription>\r\n");
-			deviceStatusXml.append("<Longitude>" + deviceAlarm.getLongitude() + "</Longitude>\r\n");
-			deviceStatusXml.append("<Latitude>" + deviceAlarm.getLatitude() + "</Latitude>\r\n");
-			deviceStatusXml.append("<info>\r\n");
-			deviceStatusXml.append("<AlarmType>" + deviceAlarm.getAlarmType() + "</AlarmType>\r\n");
-			deviceStatusXml.append("</info>\r\n");
-			deviceStatusXml.append("</Notify>\r\n");
+    private int getInfoCseq() {
+        return (int) ((Math.random() * 9 + 1) * Math.pow(10, 8));
+    }
 
-			CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId()
-					: udpSipProvider.getNewCallId();
-			Request request = headerProvider.createMessageRequest(device, deviceStatusXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, callIdHeader);
-			transmitRequest(device, request);
+    @Override
+    public void playbackControlCmd(Device device, StreamInfo streamInfo, String content, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws SipException, InvalidArgumentException, ParseException {
 
+        SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(device.getDeviceId(), streamInfo.getChannelId(), null, streamInfo.getStream());
+        if (ssrcTransaction == null) {
+            logger.info("[鍥炴斁鎺у埗]鏈壘鍒拌棰戞祦淇℃伅锛岃澶囷細{}, 娴両D: {}", device.getDeviceId(), streamInfo.getStream());
+            return;
+        }
 
-		} catch (SipException | ParseException  e) {
-			e.printStackTrace();
-			return false;
-		} catch (InvalidArgumentException e) {
-			throw new RuntimeException(e);
-		}
-		return true;
-	}
+        SIPRequest request = headerProvider.createInfoRequest(device, streamInfo.getChannelId(), content.toString(), ssrcTransaction.getSipTransactionInfo());
+        if (request == null) {
+            logger.info("[鍥炴斁鎺у埗]鏋勫缓Request淇℃伅澶辫触锛岃澶囷細{}, 娴両D: {}", device.getDeviceId(), streamInfo.getStream());
+            return;
+        }
 
-	private void sendNotify(Device device, String catalogXmlContent,
-							SubscribeInfo subscribeInfo, SipSubscribe.Event errorEvent,  SipSubscribe.Event okEvent )
-			throws SipException, ParseException {
-		MessageFactoryImpl messageFactory = (MessageFactoryImpl) sipFactory.createMessageFactory();
-		String characterSet = device.getCharset();
-		// 璁剧疆缂栫爜锛� 闃叉涓枃涔辩爜
-		messageFactory.setDefaultContentEncodingCharset(characterSet);
-		Dialog dialog  = subscribeInfo.getDialog();
-		if (dialog == null || !dialog.getState().equals(DialogState.CONFIRMED)) {
-			return;
-		}
-		SIPRequest notifyRequest = (SIPRequest)dialog.createRequest(Request.NOTIFY);
-		ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");
-		notifyRequest.setContent(catalogXmlContent, contentTypeHeader);
+        sipSender.transmitRequest( request, errorEvent, okEvent);
+    }
 
-		SubscriptionStateHeader subscriptionState = sipFactory.createHeaderFactory()
-				.createSubscriptionStateHeader(SubscriptionStateHeader.ACTIVE);
-		notifyRequest.addHeader(subscriptionState);
+    @Override
+    public void sendAlarmMessage(Device device, DeviceAlarm deviceAlarm) throws InvalidArgumentException, SipException, ParseException {
+        if (device == null) {
+            return;
+        }
+        logger.info("[鍙戦�� 鎶ヨ閫氱煡] {}/{}->{},{}", device.getDeviceId(), deviceAlarm.getChannelId(),
+                deviceAlarm.getLongitude(), deviceAlarm.getLatitude());
 
-		EventHeader event = sipFactory.createHeaderFactory().createEventHeader(subscribeInfo.getEventType());
-		if (subscribeInfo.getEventId() != null) {
-			event.setEventId(subscribeInfo.getEventId());
-		}
-		notifyRequest.addHeader(event);
+        String characterSet = device.getCharset();
+        StringBuffer deviceStatusXml = new StringBuffer(600);
+        deviceStatusXml.append("<?xml version=\"1.0\" encoding=\"" + characterSet + "\"?>\r\n");
+        deviceStatusXml.append("<Notify>\r\n");
+        deviceStatusXml.append("<CmdType>Alarm</CmdType>\r\n");
+        deviceStatusXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n");
+        deviceStatusXml.append("<DeviceID>" + deviceAlarm.getChannelId() + "</DeviceID>\r\n");
+        deviceStatusXml.append("<AlarmPriority>" + deviceAlarm.getAlarmPriority() + "</AlarmPriority>\r\n");
+        deviceStatusXml.append("<AlarmMethod>" + deviceAlarm.getAlarmMethod() + "</AlarmMethod>\r\n");
+        deviceStatusXml.append("<AlarmTime>" + deviceAlarm.getAlarmTime() + "</AlarmTime>\r\n");
+        deviceStatusXml.append("<AlarmDescription>" + deviceAlarm.getAlarmDescription() + "</AlarmDescription>\r\n");
+        deviceStatusXml.append("<Longitude>" + deviceAlarm.getLongitude() + "</Longitude>\r\n");
+        deviceStatusXml.append("<Latitude>" + deviceAlarm.getLatitude() + "</Latitude>\r\n");
+        deviceStatusXml.append("<info>\r\n");
+        deviceStatusXml.append("<AlarmType>" + deviceAlarm.getAlarmType() + "</AlarmType>\r\n");
+        deviceStatusXml.append("</info>\r\n");
+        deviceStatusXml.append("</Notify>\r\n");
 
-		SipURI sipURI = (SipURI) notifyRequest.getRequestURI();
-		if (subscribeInfo.getTransaction() != null) {
-			SIPRequest request = (SIPRequest) subscribeInfo.getTransaction().getRequest();
-			sipURI.setHost(request.getRemoteAddress().getHostAddress());
-			sipURI.setPort(request.getRemotePort());
-		}else {
-			sipURI.setHost(device.getIp());
-			sipURI.setPort(device.getPort());
-		}
+        
+        Request request = headerProvider.createMessageRequest(device, deviceStatusXml.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null,sipSender.getNewCallIdHeader(device.getTransport()));
+        sipSender.transmitRequest(request);
 
-		ClientTransaction transaction = null;
-		if ("TCP".equals(device.getTransport())) {
-			transaction = tcpSipProvider.getNewClientTransaction(notifyRequest);
-		} else if ("UDP".equals(device.getTransport())) {
-			transaction = udpSipProvider.getNewClientTransaction(notifyRequest);
-		}
-		// 娣诲姞閿欒璁㈤槄
-		if (errorEvent != null) {
-			sipSubscribe.addErrorSubscribe(subscribeInfo.getCallId(), errorEvent);
-		}
-		// 娣诲姞璁㈤槄
-		if (okEvent != null) {
-			sipSubscribe.addOkSubscribe(subscribeInfo.getCallId(), okEvent);
-		}
-		if (transaction == null) {
-			logger.error("骞冲彴{}鐨凾ransport閿欒锛歿}",device.getDeviceId(), device.getTransport());
-			return;
-		}
-		dialog.sendRequest(transaction);
 
-	}
+    }
 }

--
Gitblit v1.8.0