From c662a530989706b705142743e0095d5b7f331751 Mon Sep 17 00:00:00 2001
From: wangyimeng <421132955@qq.com>
Date: 星期六, 04 三月 2023 20:47:48 +0800
Subject: [PATCH] 请求历史媒体下载增加回复事件处理ssrc与下级不一致情况

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java |  105 ++++++++++++++++++++++++++--------------------------
 1 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
index 6aa20e4..fdd2288 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
@@ -15,26 +15,26 @@
 import javax.sip.SipException;
 import java.text.ParseException;
 
-/**
- * @description:璁惧鑳藉姏鎺ュ彛锛岀敤浜庡畾涔夎澶囩殑鎺у埗銆佹煡璇㈣兘鍔�
+/**    
+ * @description:璁惧鑳藉姏鎺ュ彛锛岀敤浜庡畾涔夎澶囩殑鎺у埗銆佹煡璇㈣兘鍔�   
  * @author: swwheihei
- * @date:   2020骞�5鏈�3鏃� 涓嬪崍9:16:34
+ * @date:   2020骞�5鏈�3鏃� 涓嬪崍9:16:34     
  */
 public interface ISIPCommander {
 
 	/**
 	 * 浜戝彴鏂瑰悜鏀炬帶鍒讹紝浣跨敤閰嶇疆鏂囦欢涓殑榛樿闀滃ご绉诲姩閫熷害
-	 *
+	 * 
 	 * @param device  鎺у埗璁惧
 	 * @param channelId  棰勮閫氶亾
 	 * @param leftRight  闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
      * @param upDown     闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
 	 */
 	void ptzdirectCmd(Device device,String channelId,int leftRight, int upDown) throws InvalidArgumentException, ParseException, SipException;
-
+	
 	/**
 	 * 浜戝彴鏂瑰悜鏀炬帶鍒�
-	 *
+	 * 
 	 * @param device  鎺у埗璁惧
 	 * @param channelId  棰勮閫氶亾
 	 * @param leftRight  闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
@@ -42,28 +42,28 @@
      * @param moveSpeed  闀滃ご绉诲姩閫熷害
 	 */
 	void ptzdirectCmd(Device device,String channelId,int leftRight, int upDown, int moveSpeed) throws InvalidArgumentException, ParseException, SipException;
-
+	
 	/**
 	 * 浜戝彴缂╂斁鎺у埗锛屼娇鐢ㄩ厤缃枃浠朵腑鐨勯粯璁ら暅澶寸缉鏀鹃�熷害
-	 *
+	 * 
 	 * @param device  鎺у埗璁惧
 	 * @param channelId  棰勮閫氶亾
      * @param inOut      闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
 	 */
 	void ptzZoomCmd(Device device,String channelId,int inOut) throws InvalidArgumentException, ParseException, SipException;
-
+	
 	/**
 	 * 浜戝彴缂╂斁鎺у埗
-	 *
+	 * 
 	 * @param device  鎺у埗璁惧
 	 * @param channelId  棰勮閫氶亾
      * @param inOut      闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
 	 */
 	void ptzZoomCmd(Device device,String channelId,int inOut, int moveSpeed) throws InvalidArgumentException, ParseException, SipException;
-
+	
 	/**
 	 * 浜戝彴鎺у埗锛屾敮鎸佹柟鍚戜笌缂╂斁鎺у埗
-	 *
+	 * 
 	 * @param device  鎺у埗璁惧
 	 * @param channelId  棰勮閫氶亾
 	 * @param leftRight  闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
@@ -73,10 +73,10 @@
      * @param zoomSpeed  闀滃ご缂╂斁閫熷害
 	 */
 	void ptzCmd(Device device,String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 鍓嶇鎺у埗锛屽寘鎷琍TZ鎸囦护銆丗I鎸囦护銆侀缃綅鎸囦护銆佸贰鑸寚浠ゃ�佹壂鎻忔寚浠ゅ拰杈呭姪寮�鍏虫寚浠�
-	 *
+	 * 
 	 * @param device  		鎺у埗璁惧
 	 * @param channelId		棰勮閫氶亾
 	 * @param cmdCode		鎸囦护鐮�
@@ -85,7 +85,7 @@
      * @param combineCode2	缁勫悎鐮�2
 	 */
 	void frontEndCmd(Device device, String channelId, int cmdCode, int parameter1, int parameter2, int combineCode2) throws SipException, InvalidArgumentException, ParseException;
-
+	
 	/**
 	 * 鍓嶇鎺у埗鎸囦护锛堢敤浜庤浆鍙戜笂绾ф寚浠わ級
 	 * @param device		鎺у埗璁惧
@@ -103,7 +103,7 @@
 
 	/**
 	 * 璇锋眰鍥炴斁瑙嗛娴�
-	 *
+	 * 
 	 * @param device  瑙嗛璁惧
 	 * @param channelId  棰勮閫氶亾
 	 * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
@@ -113,13 +113,13 @@
 
 	/**
 	 * 璇锋眰鍘嗗彶濯掍綋涓嬭浇
-	 *
+	 * 
 	 * @param device  瑙嗛璁惧
 	 * @param channelId  棰勮閫氶亾
 	 * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
 	 * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
 	 * @param downloadSpeed 涓嬭浇鍊嶉�熷弬鏁�
-	 */
+	 */ 
 	void downloadStreamCmd(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, Device device, String channelId,
 						   String startTime, String endTime, int downloadSpeed, InviteStreamCallback inviteStreamCallback, InviteStreamCallback hookEvent,
 						   SipSubscribe.Event errorEvent,SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException;
@@ -150,7 +150,7 @@
 	 * 鍥炴斁鍊嶉�熸挱鏀�
 	 */
 	void playSpeedCmd(Device device, StreamInfo streamInfo, Double speed) throws InvalidArgumentException, ParseException, SipException;
-
+	
 	/**
 	 * 鍥炴斁鎺у埗
 	 * @param device
@@ -162,55 +162,55 @@
 
     /**
 	 * 璇煶骞挎挱
-	 *
+	 * 
 	 * @param device  瑙嗛璁惧
 	 * @param channelId  棰勮閫氶亾
 	 */
 	void audioBroadcastCmd(Device device,String channelId);
-
+	
 	/**
 	 * 璇煶骞挎挱
-	 *
+	 * 
 	 * @param device  瑙嗛璁惧
 	 */
 	void audioBroadcastCmd(Device device, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException;
 	void audioBroadcastCmd(Device device) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 闊宠棰戝綍鍍忔帶鍒�
-	 *
+	 * 
 	 * @param device  		瑙嗛璁惧
 	 * @param channelId  	棰勮閫氶亾
 	 * @param recordCmdStr	褰曞儚鍛戒护锛歊ecord / StopRecord
 	 */
 	void recordCmd(Device device, String channelId, String recordCmdStr, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 杩滅▼鍚姩鎺у埗鍛戒护
-	 *
+	 * 
 	 * @param device	瑙嗛璁惧
 	 */
 	void teleBootCmd(Device device) throws InvalidArgumentException, SipException, ParseException;
 
 	/**
 	 * 鎶ヨ甯冮槻/鎾ら槻鍛戒护
-	 *
+	 * 
 	 * @param device  	瑙嗛璁惧
 	 */
 	void guardCmd(Device device, String guardCmdStr, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 鎶ヨ澶嶄綅鍛戒护
-	 *
+	 * 
 	 * @param device		瑙嗛璁惧
 	 * @param alarmMethod	鎶ヨ鏂瑰紡锛堝彲閫夛級
 	 * @param alarmType		鎶ヨ绫诲瀷锛堝彲閫夛級
 	 */
 	void alarmCmd(Device device, String alarmMethod, String alarmType, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 寮哄埗鍏抽敭甯у懡浠�,璁惧鏀跺埌姝ゅ懡浠ゅ簲绔嬪埢鍙戦�佷竴涓狪DR甯�
-	 *
+	 * 
 	 * @param device  瑙嗛璁惧
 	 * @param channelId  棰勮閫氶亾
 	 */
@@ -221,7 +221,6 @@
 	 *
 	 * @param device      瑙嗛璁惧
 	 * @param channelId      閫氶亾id锛岄潪閫氶亾鍒欐槸璁惧鏈韩
-	 * @param frontCmd     涓婄骇骞冲彴鐨勬寚浠わ紝濡傛灉瀛樺湪鍒欑洿鎺ヤ笅鍙�
 	 * @param enabled     鐪嬪畧浣嶄娇鑳斤細1 = 寮�鍚紝0 = 鍏抽棴
 	 * @param resetTime   鑷姩褰掍綅鏃堕棿闂撮殧锛屽紑鍚湅瀹堜綅鏃朵娇鐢紝鍗曚綅:绉�(s)
 	 * @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紝寮�鍚湅瀹堜綅鏃朵娇鐢紝鍙栧�艰寖鍥�0~255
@@ -230,58 +229,58 @@
 
 	/**
 	 * 璁惧閰嶇疆鍛戒护
-	 *
+	 * 
 	 * @param device  瑙嗛璁惧
 	 */
 	void deviceConfigCmd(Device device);
-
+	
 	/**
 	 * 璁惧閰嶇疆鍛戒护锛歜asicParam
-	 *
+	 * 
 	 * @param device  			瑙嗛璁惧
 	 * @param channelId			閫氶亾缂栫爜锛堝彲閫夛級
 	 * @param name				璁惧/閫氶亾鍚嶇О锛堝彲閫夛級
 	 * @param expiration		娉ㄥ唽杩囨湡鏃堕棿锛堝彲閫夛級
 	 * @param heartBeatInterval	蹇冭烦闂撮殧鏃堕棿锛堝彲閫夛級
 	 * @param heartBeatCount	蹇冭烦瓒呮椂娆℃暟锛堝彲閫夛級
-	 */
+	 */  
 	void deviceBasicConfigCmd(Device device, String channelId, String name, String expiration, String heartBeatInterval, String heartBeatCount, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException;
 
 	/**
 	 * 鏌ヨ璁惧鐘舵��
-	 *
+	 * 
 	 * @param device 瑙嗛璁惧
 	 */
 	void deviceStatusQuery(Device device, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 鏌ヨ璁惧淇℃伅
-	 *
+	 * 
 	 * @param device 瑙嗛璁惧
-	 * @return
+	 * @return 
 	 */
 	void deviceInfoQuery(Device device) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 鏌ヨ鐩綍鍒楄〃
-	 *
+	 * 
 	 * @param device 瑙嗛璁惧
 	 */
 	void catalogQuery(Device device, int sn, SipSubscribe.Event errorEvent) throws SipException, InvalidArgumentException, ParseException;
-
+	
 	/**
 	 * 鏌ヨ褰曞儚淇℃伅
-	 *
+	 * 
 	 * @param device 瑙嗛璁惧
 	 * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
 	 * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
 	 * @param sn
 	 */
 	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;
-
+	
 	/**
 	 * 鏌ヨ鎶ヨ淇℃伅
-	 *
+	 * 
 	 * @param device		瑙嗛璁惧
 	 * @param startPriority	鎶ヨ璧峰绾у埆锛堝彲閫夛級
 	 * @param endPriority	鎶ヨ缁堟绾у埆锛堝彲閫夛級
@@ -293,33 +292,33 @@
 	 */
 	void alarmInfoQuery(Device device, String startPriority, String endPriority, String alarmMethod,
 							String alarmType, String startTime, String endTime, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 鏌ヨ璁惧閰嶇疆
-	 *
+	 * 
 	 * @param device 		瑙嗛璁惧
 	 * @param channelId		閫氶亾缂栫爜锛堝彲閫夛級
 	 * @param configType	閰嶇疆绫诲瀷锛�
 	 */
 	void deviceConfigQuery(Device device, String channelId, String configType,  SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 鏌ヨ璁惧棰勭疆浣嶇疆
-	 *
+	 * 
 	 * @param device 瑙嗛璁惧
 	 */
 	void presetQuery(Device device, String channelId, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException;
-
+	
 	/**
 	 * 鏌ヨ绉诲姩璁惧浣嶇疆鏁版嵁
-	 *
+	 * 
 	 * @param device 瑙嗛璁惧
 	 */
 	void mobilePostitionQuery(Device device, SipSubscribe.Event errorEvent) throws InvalidArgumentException, SipException, ParseException;
 
 	/**
 	 * 璁㈤槄銆佸彇娑堣闃呯Щ鍔ㄤ綅缃�
-	 *
+	 * 
 	 * @param device	瑙嗛璁惧
 	 * @return			true = 鍛戒护鍙戦�佹垚鍔�
 	 */

--
Gitblit v1.8.0