From b6e604f2449bb65dfaafb0f0741ba54ff0d2f9c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 30 四月 2024 15:20:03 +0800
Subject: [PATCH] 修改云端录像详情页使用直接访问zlm的方式播放录像
---
src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
index e753fb6..2dd92eb 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -46,6 +45,8 @@
private Long aliveSecond;
@Schema(description = "鏁版嵁浜х敓閫熷害锛屽崟浣峛yte/s")
private Long bytesSpeed;
+ @Schema(description = "閴存潈鍙傛暟")
+ private String callId;
public static MediaInfo getInstance(JSONObject jsonObject, MediaServer mediaServer) {
MediaInfo mediaInfo = new MediaInfo();
@@ -128,7 +129,7 @@
}
public static MediaInfo getInstance(OnStreamChangedHookParam param, MediaServer mediaServer) {
- List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
+
MediaInfo mediaInfo = new MediaInfo();
mediaInfo.setApp(param.getApp());
mediaInfo.setStream(param.getStream());
@@ -139,6 +140,10 @@
mediaInfo.setOriginType(param.getOriginType());
mediaInfo.setAliveSecond(param.getAliveSecond());
mediaInfo.setBytesSpeed(param.getBytesSpeed());
+ List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
+ if (tracks == null || tracks.isEmpty()) {
+ return mediaInfo;
+ }
for (OnStreamChangedHookParam.MediaTrack mediaTrack : tracks) {
switch (mediaTrack.getCodec_id()) {
case 0:
@@ -300,4 +305,12 @@
public void setSchema(String schema) {
this.schema = schema;
}
+
+ public String getCallId() {
+ return callId;
+ }
+
+ public void setCallId(String callId) {
+ this.callId = callId;
+ }
}
--
Gitblit v1.8.0