From 2c1dbe63de3d370d0b0f20fea474326e88b9ca23 Mon Sep 17 00:00:00 2001 From: lawrencehj <1934378145@qq.com> Date: 星期三, 10 三月 2021 14:39:40 +0800 Subject: [PATCH] 增加接收Bye请求后停止向上级推流功能 --- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java | 112 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 90 insertions(+), 22 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 3da654a..6fa4eca 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,7 +1,7 @@ package com.genersoft.iot.vmp.gb28181.transmit.cmd; -import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.gb28181.bean.Device; +import com.genersoft.iot.vmp.gb28181.event.SipSubscribe; import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe; /** @@ -83,7 +83,7 @@ * @param device 瑙嗛璁惧 * @param channelId 棰勮閫氶亾 */ - void playStreamCmd(Device device, String channelId, ZLMHttpHookSubscribe.Event event); + void playStreamCmd(Device device, String channelId, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent); /** * 璇锋眰鍥炴斁瑙嗛娴� @@ -93,15 +93,16 @@ * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss */ - void playbackStreamCmd(Device device, String channelId, String startTime, String endTime, ZLMHttpHookSubscribe.Event event); + void playbackStreamCmd(Device device, String channelId, String startTime, String endTime, ZLMHttpHookSubscribe.Event event, SipSubscribe.Event errorEvent); /** * 瑙嗛娴佸仠姝� * * @param ssrc ssrc */ + void streamByeCmd(String ssrc, SipSubscribe.Event okEvent); void streamByeCmd(String ssrc); - + /** * 璇煶骞挎挱 * @@ -113,24 +114,35 @@ /** * 闊宠棰戝綍鍍忔帶鍒� * - * @param device 瑙嗛璁惧 - * @param channelId 棰勮閫氶亾 + * @param device 瑙嗛璁惧 + * @param channelId 棰勮閫氶亾 + * @param recordCmdStr 褰曞儚鍛戒护锛歊ecord / StopRecord */ - boolean recordCmd(Device device,String channelId); + boolean recordCmd(Device device, String channelId, String recordCmdStr, SipSubscribe.Event errorEvent); + /** + * 杩滅▼鍚姩鎺у埗鍛戒护 + * + * @param device 瑙嗛璁惧 + */ + boolean teleBootCmd(Device device); + /** * 鎶ヨ甯冮槻/鎾ら槻鍛戒护 * - * @param device 瑙嗛璁惧 + * @param device 瑙嗛璁惧 + * @param setGuard true: SetGuard, false: ResetGuard */ - boolean guardCmd(Device device); + boolean guardCmd(Device device, String guardCmdStr, SipSubscribe.Event errorEvent); /** * 鎶ヨ澶嶄綅鍛戒护 * - * @param device 瑙嗛璁惧 + * @param device 瑙嗛璁惧 + * @param alarmMethod 鎶ヨ鏂瑰紡锛堝彲閫夛級 + * @param alarmType 鎶ヨ绫诲瀷锛堝彲閫夛級 */ - boolean alarmCmd(Device device); + boolean alarmCmd(Device device, String alarmMethod, String alarmType, SipSubscribe.Event errorEvent); /** * 寮哄埗鍏抽敭甯у懡浠�,璁惧鏀跺埌姝ゅ懡浠ゅ簲绔嬪埢鍙戦�佷竴涓狪DR甯� @@ -138,14 +150,17 @@ * @param device 瑙嗛璁惧 * @param channelId 棰勮閫氶亾 */ - boolean iFameCmd(Device device,String channelId); + boolean iFrameCmd(Device device, String channelId); /** * 鐪嬪畧浣嶆帶鍒跺懡浠� * - * @param device 瑙嗛璁惧 + * @param device 瑙嗛璁惧 + * @param enabled 鐪嬪畧浣嶄娇鑳斤細1 = 寮�鍚紝0 = 鍏抽棴 + * @param resetTime 鑷姩褰掍綅鏃堕棿闂撮殧锛屽紑鍚湅瀹堜綅鏃朵娇鐢紝鍗曚綅:绉�(s) + * @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紝寮�鍚湅瀹堜綅鏃朵娇鐢紝鍙栧�艰寖鍥�0~255 */ - boolean homePositionCmd(Device device); + boolean homePositionCmd(Device device, String channelId, String enabled, String resetTime, String presetIndex, SipSubscribe.Event errorEvent); /** * 璁惧閰嶇疆鍛戒护 @@ -154,13 +169,24 @@ */ boolean deviceConfigCmd(Device device); + /** + * 璁惧閰嶇疆鍛戒护锛歜asicParam + * + * @param device 瑙嗛璁惧 + * @param channelId 閫氶亾缂栫爜锛堝彲閫夛級 + * @param name 璁惧/閫氶亾鍚嶇О锛堝彲閫夛級 + * @param expiration 娉ㄥ唽杩囨湡鏃堕棿锛堝彲閫夛級 + * @param heartBeatInterval 蹇冭烦闂撮殧鏃堕棿锛堝彲閫夛級 + * @param heartBeatCount 蹇冭烦瓒呮椂娆℃暟锛堝彲閫夛級 + */ + boolean deviceBasicConfigCmd(Device device, String channelId, String name, String expiration, String heartBeatInterval, String heartBeatCount, SipSubscribe.Event errorEvent); /** * 鏌ヨ璁惧鐘舵�� * * @param device 瑙嗛璁惧 */ - boolean deviceStatusQuery(Device device); + boolean deviceStatusQuery(Device device, SipSubscribe.Event errorEvent); /** * 鏌ヨ璁惧淇℃伅 @@ -175,7 +201,7 @@ * * @param device 瑙嗛璁惧 */ - boolean catalogQuery(Device device); + boolean catalogQuery(Device device, SipSubscribe.Event errorEvent); /** * 鏌ヨ褰曞儚淇℃伅 @@ -189,28 +215,70 @@ /** * 鏌ヨ鎶ヨ淇℃伅 * - * @param device 瑙嗛璁惧 + * @param device 瑙嗛璁惧 + * @param startPriority 鎶ヨ璧峰绾у埆锛堝彲閫夛級 + * @param endPriority 鎶ヨ缁堟绾у埆锛堝彲閫夛級 + * @param alarmMethod 鎶ヨ鏂瑰紡鏉′欢锛堝彲閫夛級 + * @param alarmType 鎶ヨ绫诲瀷 + * @param startTime 鎶ヨ鍙戠敓璧峰鏃堕棿锛堝彲閫夛級 + * @param endTime 鎶ヨ鍙戠敓缁堟鏃堕棿锛堝彲閫夛級 + * @return true = 鍛戒护鍙戦�佹垚鍔� */ - boolean alarmInfoQuery(Device device); + boolean alarmInfoQuery(Device device, String startPriority, String endPriority, String alarmMethod, + String alarmType, String startTime, String endTime, SipSubscribe.Event errorEvent); /** * 鏌ヨ璁惧閰嶇疆 * - * @param device 瑙嗛璁惧 + * @param device 瑙嗛璁惧 + * @param channelId 閫氶亾缂栫爜锛堝彲閫夛級 + * @param configType 閰嶇疆绫诲瀷锛� */ - boolean configQuery(Device device); + boolean deviceConfigQuery(Device device, String channelId, String configType, SipSubscribe.Event errorEvent); /** * 鏌ヨ璁惧棰勭疆浣嶇疆 * * @param device 瑙嗛璁惧 */ - boolean presetQuery(Device device); + boolean presetQuery(Device device, String channelId, SipSubscribe.Event errorEvent); /** * 鏌ヨ绉诲姩璁惧浣嶇疆鏁版嵁 * * @param device 瑙嗛璁惧 */ - boolean mobilePostitionQuery(Device device); + boolean mobilePostitionQuery(Device device, SipSubscribe.Event errorEvent); + + /** + * 璁㈤槄銆佸彇娑堣闃呯Щ鍔ㄤ綅缃� + * + * @param device 瑙嗛璁惧 + * @param expires 璁㈤槄瓒呮椂鏃堕棿锛堝��=0鏃朵负鍙栨秷璁㈤槄锛� + * @param interval 涓婃姤鏃堕棿闂撮殧 + * @return true = 鍛戒护鍙戦�佹垚鍔� + */ + boolean mobilePositionSubscribe(Device device, int expires, int interval); + + /** + * 璁㈤槄銆佸彇娑堣闃呮姤璀︿俊鎭� + * @param device 瑙嗛璁惧 + * @param expires 璁㈤槄杩囨湡鏃堕棿锛�0 = 鍙栨秷璁㈤槄锛� + * @param startPriority 鎶ヨ璧峰绾у埆锛堝彲閫夛級 + * @param endPriority 鎶ヨ缁堟绾у埆锛堝彲閫夛級 + * @param alarmMethods 鎶ヨ鏂瑰紡鏉′欢锛堝彲閫夛級 + * @param alarmType 鎶ヨ绫诲瀷 + * @param startTime 鎶ヨ鍙戠敓璧峰鏃堕棿锛堝彲閫夛級 + * @param endTime 鎶ヨ鍙戠敓缁堟鏃堕棿锛堝彲閫夛級 + * @return true = 鍛戒护鍙戦�佹垚鍔� + */ + boolean alarmSubscribe(Device device, int expires, String startPriority, String endPriority, String alarmMethod, String alarmType, String startTime, String endTime); + + + /** + * 閲婃斁rtpserver + * @param device + * @param channelId + */ + void closeRTPServer(Device device, String channelId); } -- Gitblit v1.8.0