From 6dc4b8a79a07857f415e6da3955f8c14eafca38a Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 15 十月 2021 15:05:02 +0800 Subject: [PATCH] 修复点播与录像回放sdp信息sdp-ip的取值错误,修复回放信令错误 --- src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java index 4f832ae..be69df1 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java @@ -1,6 +1,7 @@ package com.genersoft.iot.vmp.media.zlm; import com.alibaba.fastjson.JSONObject; +import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import org.springframework.stereotype.Component; import java.util.*; @@ -30,7 +31,7 @@ } public interface Event{ - void response(JSONObject response); + void response(MediaServerItem mediaServerItem, JSONObject response); } private Map<HookType, Map<JSONObject, ZLMHttpHookSubscribe.Event>> allSubscribes = new ConcurrentHashMap<>(); @@ -56,6 +57,9 @@ if (result == null) { result = key.getString(s).equals(hookResponse.getString(s)); }else { + if (key.getString(s) == null) { + continue; + } result = result && key.getString(s).equals(hookResponse.getString(s)); } @@ -81,9 +85,9 @@ if (result == null) { result = key.getString(s).equals(hookResponse.getString(s)); }else { + if (key.getString(s) == null) continue; result = result && key.getString(s).equals(hookResponse.getString(s)); } - } if (null != result && result){ iterator.remove(); -- Gitblit v1.8.0