From 44b7f67a2029aafd43d9eb4de7b28561f0f53bcd Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期六, 23 四月 2022 23:54:49 +0800
Subject: [PATCH] 在1e2d207aea24b5956d5ece95ed4a9db0f59f34d7这个版本中，作者删除了initData函数，但是忘记删除mounted中的this.mounted() 导致console报错
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 84b36e3..8a62bea 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -31,6 +32,7 @@
on_server_keepalive
}
+ @FunctionalInterface
public interface Event{
void response(MediaServerItem mediaServerItem, JSONObject response);
}
@@ -38,12 +40,7 @@
private Map<HookType, Map<JSONObject, ZLMHttpHookSubscribe.Event>> allSubscribes = new ConcurrentHashMap<>();
public void addSubscribe(HookType type, JSONObject hookResponse, ZLMHttpHookSubscribe.Event event) {
- Map<JSONObject, Event> eventMap = allSubscribes.get(type);
- if (eventMap == null) {
- eventMap = new HashMap<JSONObject, Event>();
- allSubscribes.put(type,eventMap);
- }
- eventMap.put(hookResponse, event);
+ allSubscribes.computeIfAbsent(type, k -> new ConcurrentHashMap<>()).put(hookResponse, event);
}
public ZLMHttpHookSubscribe.Event getSubscribe(HookType type, JSONObject hookResponse) {
@@ -80,7 +77,8 @@
Set<Map.Entry<JSONObject, Event>> entries = eventMap.entrySet();
if (entries.size() > 0) {
- for (Map.Entry<JSONObject, Event> entry : entries) {
+ List<Map.Entry<JSONObject, ZLMHttpHookSubscribe.Event>> entriesToRemove = new ArrayList<>();
+ for (Map.Entry<JSONObject, ZLMHttpHookSubscribe.Event> entry : entries) {
JSONObject key = entry.getKey();
Boolean result = null;
for (String s : key.keySet()) {
@@ -92,9 +90,16 @@
}
}
if (null != result && result){
+ entriesToRemove.add(entry);
+ }
+ }
+
+ if (!CollectionUtils.isEmpty(entriesToRemove)) {
+ for (Map.Entry<JSONObject, ZLMHttpHookSubscribe.Event> entry : entriesToRemove) {
entries.remove(entry);
}
}
+
}
}
--
Gitblit v1.8.0