From c81cc4313a62522c3822a2d88af67a6b2e151cd9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 26 九月 2021 15:33:00 +0800
Subject: [PATCH] Merge pull request #174 from chenparty/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 a69cec8..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,12 +1,10 @@
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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -33,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<>();
@@ -59,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));
}
@@ -84,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