From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
old mode 100644
new mode 100755
index df90121..417251f
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
@@ -37,7 +37,7 @@
public static HookSubscribeForStreamPush on_publish(String app, String stream, String scheam, String mediaServerId) {
HookSubscribeForStreamPush hookSubscribe = new HookSubscribeForStreamPush();
- JSONObject subscribeKey = new com.alibaba.fastjson.JSONObject();
+ JSONObject subscribeKey = new JSONObject();
subscribeKey.put("app", app);
subscribeKey.put("stream", stream);
if (scheam != null) {
@@ -49,10 +49,13 @@
return hookSubscribe;
}
-
- public static HookSubscribeForServerStarted on_server_started() {
- HookSubscribeForServerStarted hookSubscribe = new HookSubscribeForServerStarted();
- hookSubscribe.setContent(new JSONObject());
+ public static HookSubscribeForRecordMp4 on_record_mp4(String mediaServerId, String app, String stream) {
+ HookSubscribeForRecordMp4 hookSubscribe = new HookSubscribeForRecordMp4();
+ JSONObject subscribeKey = new com.alibaba.fastjson2.JSONObject();
+ subscribeKey.put("app", app);
+ subscribeKey.put("stream", stream);
+ subscribeKey.put("mediaServerId", mediaServerId);
+ hookSubscribe.setContent(subscribeKey);
return hookSubscribe;
}
--
Gitblit v1.8.0