From 5a7a7a12bde268c104610d3e81a08df06ccab5eb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 六月 2023 16:46:26 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
index f0d453b..407ccc5 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
@@ -22,12 +22,10 @@
* @param parentPlatform
* @return
*/
- void register(ParentPlatform parentPlatform, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent)
- throws InvalidArgumentException, ParseException, SipException;
+ void register(ParentPlatform parentPlatform, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws InvalidArgumentException, ParseException, SipException;
- void register(ParentPlatform parentPlatform, String callId, WWWAuthenticateHeader www,
- SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent, boolean registerAgain, boolean isRegister)
- throws SipException, InvalidArgumentException, ParseException;
+ void register(ParentPlatform parentPlatform, SipTransactionInfo sipTransactionInfo, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws InvalidArgumentException, ParseException, SipException;
+ void register(ParentPlatform parentPlatform, SipTransactionInfo sipTransactionInfo, WWWAuthenticateHeader www, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent, boolean isRegister) throws SipException, InvalidArgumentException, ParseException;
/**
* 鍚戜笂绾у钩鍙版敞閿�
@@ -35,8 +33,7 @@
* @param parentPlatform
* @return
*/
- void unregister(ParentPlatform parentPlatform, SipSubscribe.Event errorEvent, SipSubscribe.Event okEvent)
- throws InvalidArgumentException, ParseException, SipException;
+ void unregister(ParentPlatform parentPlatform, SipTransactionInfo sipTransactionInfo, SipSubscribe.Event errorEvent , SipSubscribe.Event okEvent) throws InvalidArgumentException, ParseException, SipException;
/**
@@ -69,12 +66,11 @@
* 鍚戜笂绾у洖澶岲eviceInfo鏌ヨ淇℃伅
*
* @param parentPlatform 骞冲彴淇℃伅
- * @param sn
- * @param fromTag
+ * @param sn SN
+ * @param fromTag FROM澶寸殑tag淇℃伅
* @return
*/
- void deviceInfoResponse(ParentPlatform parentPlatform, String sn, String fromTag)
- throws SipException, InvalidArgumentException, ParseException;
+ void deviceInfoResponse(ParentPlatform parentPlatform,Device device, String sn, String fromTag) throws SipException, InvalidArgumentException, ParseException;
/**
* 鍚戜笂绾у洖澶岲eviceStatus鏌ヨ淇℃伅
@@ -84,8 +80,7 @@
* @param fromTag
* @return
*/
- void deviceStatusResponse(ParentPlatform parentPlatform, String sn, String fromTag)
- throws SipException, InvalidArgumentException, ParseException;
+ void deviceStatusResponse(ParentPlatform parentPlatform,String channelId, String sn, String fromTag,boolean status) throws SipException, InvalidArgumentException, ParseException;
/**
* 鍚戜笂绾у洖澶嶇Щ鍔ㄤ綅缃闃呮秷鎭�
--
Gitblit v1.8.0