合并主线

648540858

2024-01-16 6eed486ff1866c6d3ca7240e6c9cd1a5b4d5c6b7

合并主线

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

@@ -318,8 +318,7 @@
                    result.setEnable_audio(true);

                }

            }

        }

        else if (param.getApp().equals("broadcast")) {

        } else if (param.getApp().equals("broadcast")) {

            result.setEnable_audio(true);

        }else if (param.getApp().equals("talk")) {

            result.setEnable_audio(true);

@@ -352,13 +351,10 @@
            logger.info("[ZLM HOOK] 流注销, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

        }



        JSONObject ret = new JSONObject();

        ret.put("code", 0);

        ret.put("msg", "success");

        MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());

        JSONObject json = (JSONObject) JSON.toJSON(param);

        taskExecutor.execute(() -> {

            ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);

            MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());

            if (mediaInfo == null) {

                logger.info("[ZLM HOOK] 流变化未找到ZLM, {}", param.getMediaServerId());

                return;

@@ -554,8 +550,6 @@
                            }

                        }

                    }

                }



            }

        });

        return HookResult.SUCCESS();


 src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -108,12 +108,6 @@
    private ZLMRESTfulUtils zlmresTfulUtils;

    @Autowired
    private ZLMServerFactory zlmServerFactory;

    @Autowired
    private AssistRESTfulUtils assistRESTfulUtils;

    @Autowired
    private IMediaService mediaService;

    @Autowired