Merge pull request #93 from yu1183688986/wvp-28181-2.0

648540858

2021-05-06 fd296d1a6acccbe9f3a72623719bf7101725f4e9

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java

@@ -63,11 +63,35 @@
                }

            }
            if (result) {
            if (null != result && result) {
                event = eventMap.get(key);
            }
        }
        return event;
    }

    public void removeSubscribe(HookType type, JSONObject hookResponse) {
        Map<JSONObject, Event> eventMap = allSubscribes.get(type);
        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();
            }
        }
    }

    /**
@@ -76,7 +100,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;