From e5370bbd6e74b7746db12ced5302ef97ef58a4ce Mon Sep 17 00:00:00 2001 From: mrjackwang <30337754+mrjackwang@users.noreply.github.com> Date: 星期四, 03 三月 2022 19:52:16 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 6 ++++-- 1 files changed, 4 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 be69df1..ff8204c 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 @@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentHashMap; /** - * @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢璁㈤槄 + * @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢璁㈤槄 * @author: pan * @date: 2020骞�12鏈�2鏃� 21:17:32 */ @@ -27,7 +27,8 @@ on_stream_changed, on_stream_none_reader, on_stream_not_found, - on_server_started + on_server_started, + on_server_keepalive } public interface Event{ @@ -90,6 +91,7 @@ } } if (null != result && result){ + // TODO 鎶ラ敊鏈鐞� iterator.remove(); } } -- Gitblit v1.8.0