From e48fa711a3664bece9b3e58840a75fe7c05bc47c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期六, 08 五月 2021 17:14:05 +0800
Subject: [PATCH] 添加截图（快照）功能
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 1633f43..4f832ae 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,10 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -63,7 +60,7 @@
}
}
- if (result) {
+ if (null != result && result) {
event = eventMap.get(key);
}
}
@@ -75,7 +72,10 @@
if (eventMap == null) {
return;
}
- for (JSONObject key : eventMap.keySet()) {
+ Iterator<Map.Entry<JSONObject, Event>> iterator = eventMap.entrySet().iterator();
+ while (iterator.hasNext()){
+ Map.Entry<JSONObject, Event> next = iterator.next();
+ JSONObject key = next.getKey();
Boolean result = null;
for (String s : key.keySet()) {
if (result == null) {
@@ -85,8 +85,8 @@
}
}
- if (result) {
- eventMap.remove(key);
+ if (null != result && result){
+ iterator.remove();
}
}
}
@@ -97,7 +97,7 @@
* @return
*/
public List<ZLMHttpHookSubscribe.Event> getSubscribes(HookType type) {
- ZLMHttpHookSubscribe.Event event= null;
+ // ZLMHttpHookSubscribe.Event event= null;
Map<JSONObject, Event> eventMap = allSubscribes.get(type);
if (eventMap == null) {
return null;
--
Gitblit v1.8.0