From c21d973977a9f1d00d26179de764687ddd0ec56c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 24 四月 2024 14:59:41 +0800
Subject: [PATCH] 修复收到catalog消息是更新导致是否有音频的设置失效的BUG
---
src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/CatalogSubscribeTask.java | 83 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/CatalogSubscribeTask.java b/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/CatalogSubscribeTask.java
old mode 100644
new mode 100755
index 51356d5..d9270bb
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/CatalogSubscribeTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/task/impl/CatalogSubscribeTask.java
@@ -1,52 +1,77 @@
package com.genersoft.iot.vmp.gb28181.task.impl;
+import com.genersoft.iot.vmp.common.CommonCallback;
+import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
+import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.sip.Dialog;
import javax.sip.DialogState;
+import javax.sip.InvalidArgumentException;
import javax.sip.ResponseEvent;
+import javax.sip.SipException;
+import javax.sip.header.ToHeader;
+import java.text.ParseException;
/**
* 鐩綍璁㈤槄浠诲姟
+ * @author lin
*/
public class CatalogSubscribeTask implements ISubscribeTask {
private final Logger logger = LoggerFactory.getLogger(CatalogSubscribeTask.class);
private Device device;
private final ISIPCommander sipCommander;
- private Dialog dialog;
+ private SIPRequest request;
- public CatalogSubscribeTask(Device device, ISIPCommander sipCommander) {
+ private DynamicTask dynamicTask;
+
+ private String taskKey = "catalog-subscribe-timeout";
+
+
+ public CatalogSubscribeTask(Device device, ISIPCommander sipCommander, DynamicTask dynamicTask) {
this.device = device;
this.sipCommander = sipCommander;
+ this.dynamicTask = dynamicTask;
}
@Override
public void run() {
- sipCommander.catalogSubscribe(device, dialog, eventResult -> {
- if (eventResult.dialog != null || eventResult.dialog.getState().equals(DialogState.CONFIRMED)) {
- dialog = eventResult.dialog;
- }
- ResponseEvent event = (ResponseEvent) eventResult.event;
- if (event.getResponse().getRawContent() != null) {
+ if (dynamicTask.get(taskKey) != null) {
+ dynamicTask.stop(taskKey);
+ }
+ SIPRequest sipRequest = null;
+ try {
+ sipRequest = sipCommander.catalogSubscribe(device, request, eventResult -> {
+ ResponseEvent event = (ResponseEvent) eventResult.event;
// 鎴愬姛
logger.info("[鐩綍璁㈤槄]鎴愬姛锛� {}", device.getDeviceId());
- }else {
- // 鎴愬姛
- logger.info("[鐩綍璁㈤槄]鎴愬姛锛� {}", device.getDeviceId());
- }
- },eventResult -> {
- dialog = null;
- // 澶辫触
- logger.warn("[鐩綍璁㈤槄]澶辫触锛屼俊浠ゅ彂閫佸け璐ワ細 {}-{} ", device.getDeviceId(), eventResult.msg);
- });
+ ToHeader toHeader = (ToHeader)event.getResponse().getHeader(ToHeader.NAME);
+ try {
+ this.request.getToHeader().setTag(toHeader.getTag());
+ } catch (ParseException e) {
+ logger.info("[鐩綍璁㈤槄]鎴愬姛锛� 浣嗕负request璁剧疆ToTag澶辫触");
+ this.request = null;
+ }
+ },eventResult -> {
+ this.request = null;
+ // 澶辫触
+ logger.warn("[鐩綍璁㈤槄]澶辫触锛屼俊浠ゅ彂閫佸け璐ワ細 {}-{} ", device.getDeviceId(), eventResult.msg);
+ dynamicTask.startDelay(taskKey, CatalogSubscribeTask.this, 2000);
+ });
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鐩綍璁㈤槄: {}", e.getMessage());
+
+ }
+ if (sipRequest != null) {
+ this.request = sipRequest;
+ }
}
@Override
- public void stop() {
+ public void stop(CommonCallback<Boolean> callback) {
/**
* dialog 鐨勫悇涓姸鎬�
* EARLY-> Early state鐘舵��-鍒濆璇锋眰鍙戦�佷互鍚庯紝鏀跺埌浜嗕竴涓复鏃跺搷搴旀秷鎭�
@@ -55,21 +80,29 @@
* TERMINATED-> Terminated Dialog鐘舵��-缁堟
*/
logger.info("鍙栨秷鐩綍璁㈤槄鏃禿ialog鐘舵�佷负{}", DialogState.CONFIRMED);
- if (dialog != null && dialog.getState().equals(DialogState.CONFIRMED)) {
- device.setSubscribeCycleForCatalog(0);
- sipCommander.mobilePositionSubscribe(device, dialog, eventResult -> {
+ if (dynamicTask.get(taskKey) != null) {
+ dynamicTask.stop(taskKey);
+ }
+ device.setSubscribeCycleForCatalog(0);
+ try {
+ sipCommander.catalogSubscribe(device, request, eventResult -> {
ResponseEvent event = (ResponseEvent) eventResult.event;
if (event.getResponse().getRawContent() != null) {
// 鎴愬姛
- logger.info("[鍙栨秷鐩綍璁㈤槄璁㈤槄]鎴愬姛锛� {}", device.getDeviceId());
+ logger.info("[鍙栨秷鐩綍璁㈤槄]鎴愬姛锛� {}", device.getDeviceId());
}else {
// 鎴愬姛
- logger.info("[鍙栨秷鐩綍璁㈤槄璁㈤槄]鎴愬姛锛� {}", device.getDeviceId());
+ logger.info("[鍙栨秷鐩綍璁㈤槄]鎴愬姛锛� {}", device.getDeviceId());
+ }
+ if (callback != null) {
+ callback.run(event.getResponse().getRawContent() != null);
}
},eventResult -> {
// 澶辫触
- logger.warn("[鍙栨秷鐩綍璁㈤槄璁㈤槄]澶辫触锛屼俊浠ゅ彂閫佸け璐ワ細 {}-{} ", device.getDeviceId(), eventResult.msg);
+ logger.warn("[鍙栨秷鐩綍璁㈤槄]澶辫触锛屼俊浠ゅ彂閫佸け璐ワ細 {}-{} ", device.getDeviceId(), eventResult.msg);
});
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍙栨秷鐩綍璁㈤槄: {}", e.getMessage());
}
}
}
--
Gitblit v1.8.0