From e30e28712f7ec5a3c5514484b34bdde11d0954c3 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期六, 24 十月 2020 15:26:11 +0800
Subject: [PATCH] 播放等待时间增加到30秒，避免部分设备（NVR）播放超时
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 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 2fe88ae..0fdc897 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
@@ -1,10 +1,11 @@
package com.genersoft.iot.vmp.gb28181.transmit.cmd;
+import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.Device;
/**
* @Description:璁惧鑳藉姏鎺ュ彛锛岀敤浜庡畾涔夎澶囩殑鎺у埗銆佹煡璇㈣兘鍔�
- * @author: songww
+ * @author: swwheihei
* @date: 2020骞�5鏈�3鏃� 涓嬪崍9:16:34
*/
public interface ISIPCommander {
@@ -12,48 +13,48 @@
/**
* 浜戝彴鏂瑰悜鏀炬帶鍒讹紝浣跨敤閰嶇疆鏂囦欢涓殑榛樿闀滃ご绉诲姩閫熷害
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
* @param upDown 闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
* @param moveSpeed 闀滃ご绉诲姩閫熷害
*/
- public boolean ptzdirectCmd(String deviceId,String channelId,int leftRight, int upDown);
+ public boolean ptzdirectCmd(Device device,String channelId,int leftRight, int upDown);
/**
* 浜戝彴鏂瑰悜鏀炬帶鍒�
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
* @param upDown 闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
* @param moveSpeed 闀滃ご绉诲姩閫熷害
*/
- public boolean ptzdirectCmd(String deviceId,String channelId,int leftRight, int upDown, int moveSpeed);
+ public boolean ptzdirectCmd(Device device,String channelId,int leftRight, int upDown, int moveSpeed);
/**
* 浜戝彴缂╂斁鎺у埗锛屼娇鐢ㄩ厤缃枃浠朵腑鐨勯粯璁ら暅澶寸缉鏀鹃�熷害
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param inOut 闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
*/
- public boolean ptzZoomCmd(String deviceId,String channelId,int inOut);
+ public boolean ptzZoomCmd(Device device,String channelId,int inOut);
/**
* 浜戝彴缂╂斁鎺у埗
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param inOut 闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
* @param zoomSpeed 闀滃ご缂╂斁閫熷害
*/
- public boolean ptzZoomCmd(String deviceId,String channelId,int inOut, int moveSpeed);
+ public boolean ptzZoomCmd(Device device,String channelId,int inOut, int moveSpeed);
/**
* 浜戝彴鎺у埗锛屾敮鎸佹柟鍚戜笌缂╂斁鎺у埗
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
* @param upDown 闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
@@ -61,67 +62,84 @@
* @param moveSpeed 闀滃ご绉诲姩閫熷害
* @param zoomSpeed 闀滃ご缂╂斁閫熷害
*/
- public boolean ptzCmd(String deviceId,String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed);
+ public boolean ptzCmd(Device device,String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed);
/**
* 璇锋眰棰勮瑙嗛娴�
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
* @param channelId 棰勮閫氶亾
*/
- public String playStreamCmd(String deviceId,String channelId);
+ public StreamInfo playStreamCmd(Device device, String channelId);
+
+ /**
+ * 璇锋眰鍥炴斁瑙嗛娴�
+ *
+ * @param device 瑙嗛璁惧
+ * @param channelId 棰勮閫氶亾
+ * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+ * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+ */
+ public String playbackStreamCmd(Device device,String channelId, String startTime, String endTime);
+
+ /**
+ * 瑙嗛娴佸仠姝�
+ *
+ * @param ssrc ssrc
+ */
+ public void streamByeCmd(String ssrc);
/**
* 璇煶骞挎挱
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
* @param channelId 棰勮閫氶亾
*/
- public String audioBroadcastCmd(String deviceId,String channelId);
+ public boolean audioBroadcastCmd(Device device,String channelId);
/**
* 闊宠棰戝綍鍍忔帶鍒�
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
* @param channelId 棰勮閫氶亾
*/
- public String recordCmd(String deviceId,String channelId);
+ public boolean recordCmd(Device device,String channelId);
/**
* 鎶ヨ甯冮槻/鎾ら槻鍛戒护
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
*/
- public String guardCmd(String deviceId);
+ public boolean guardCmd(Device device);
/**
* 鎶ヨ澶嶄綅鍛戒护
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
*/
- public String alarmCmd(String deviceId);
+ public boolean alarmCmd(Device device);
/**
* 寮哄埗鍏抽敭甯у懡浠�,璁惧鏀跺埌姝ゅ懡浠ゅ簲绔嬪埢鍙戦�佷竴涓狪DR甯�
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
* @param channelId 棰勮閫氶亾
*/
- public String iFameCmd(String deviceId,String channelId);
+ public boolean iFameCmd(Device device,String channelId);
/**
* 鐪嬪畧浣嶆帶鍒跺懡浠�
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
*/
- public String homePositionCmd(String deviceId);
+ public boolean homePositionCmd(Device device);
/**
* 璁惧閰嶇疆鍛戒护
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
*/
- public String deviceConfigCmd(String deviceId);
+ public boolean deviceConfigCmd(Device device);
/**
@@ -150,8 +168,10 @@
* 鏌ヨ褰曞儚淇℃伅
*
* @param device 瑙嗛璁惧
+ * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+ * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
*/
- public boolean recordInfoQuery(Device device);
+ public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime);
/**
* 鏌ヨ鎶ヨ淇℃伅
--
Gitblit v1.8.0