Merge branch 'master' into dev/通用通道云台控制

This commit is contained in:
lin
2025-07-07 18:03:39 +08:00

View File

@@ -243,7 +243,7 @@ public class SIPCommanderForPlatform implements ISIPCommanderForPlatform {
if (sendAfterResponse) {
// 默认按照收到200回复后发送下一条 如果超时收不到回复就以30毫秒的间隔直接发送。
sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, eventResult -> {
if (eventResult.type.equals(SipSubscribe.EventResultType.timeout)) {
if (eventResult.statusCode == -1024) {
// 消息发送超时, 以30毫秒的间隔直接发送
int indexNext = index + parentPlatform.getCatalogGroup();
try {
@@ -266,8 +266,7 @@ public class SIPCommanderForPlatform implements ISIPCommanderForPlatform {
});
}else {
sipSender.transmitRequest(parentPlatform.getDeviceIp(), request, eventResult -> {
log.error("[目录推送失败] 国标级联 platform : {}, code: {}, msg: {}, 停止发送", parentPlatform.getServerGBId(), eventResult.statusCode, eventResult.msg);
dynamicTask.stop(timeoutTaskKey);
log.error("[目录推送失败] 国标级联 platform : {}, code: {}, msg: {}", parentPlatform.getServerGBId(), eventResult.statusCode, eventResult.msg);
}, null);
dynamicTask.startDelay(timeoutTaskKey, ()->{
int indexNext = index + parentPlatform.getCatalogGroup();