From 7e755f405dd1112a201b9dbde7e2d6cff8abc8f4 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 01 四月 2022 16:45:29 +0800
Subject: [PATCH] 支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 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 62b18f5..3505225 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,7 +1,6 @@
package com.genersoft.iot.vmp.media.zlm;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.springframework.stereotype.Component;
@@ -9,7 +8,7 @@
import java.util.concurrent.ConcurrentHashMap;
/**
- * @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢璁㈤槄
+ * @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢璁㈤槄
* @author: pan
* @date: 2020骞�12鏈�2鏃� 21:17:32
*/
@@ -28,11 +27,13 @@
on_stream_changed,
on_stream_none_reader,
on_stream_not_found,
- on_server_started
+ on_server_started,
+ on_server_keepalive
}
+ @FunctionalInterface
public interface Event{
- void response(IMediaServerItem mediaServerItem, JSONObject response);
+ void response(MediaServerItem mediaServerItem, JSONObject response);
}
private Map<HookType, Map<JSONObject, ZLMHttpHookSubscribe.Event>> allSubscribes = new ConcurrentHashMap<>();
@@ -58,6 +59,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));
}
@@ -74,21 +78,23 @@
if (eventMap == null) {
return;
}
- 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) {
- result = key.getString(s).equals(hookResponse.getString(s));
- }else {
- result = result && key.getString(s).equals(hookResponse.getString(s));
- }
- }
- if (null != result && result){
- iterator.remove();
+ Set<Map.Entry<JSONObject, Event>> entries = eventMap.entrySet();
+ if (entries.size() > 0) {
+ for (Map.Entry<JSONObject, Event> entry : entries) {
+ JSONObject key = entry.getKey();
+ Boolean result = null;
+ for (String s : key.keySet()) {
+ 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){
+ entries.remove(entry);
+ }
}
}
}
--
Gitblit v1.8.0