From 72a67eb9ba942e632c11906093c5cd14e364eed7 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/static/inout/video-play.js | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/static/inout/video-play.js b/fzzy-igdss-web/src/main/resources/static/inout/video-play.js
index b9f50eb..760f987 100644
--- a/fzzy-igdss-web/src/main/resources/static/inout/video-play.js
+++ b/fzzy-igdss-web/src/main/resources/static/inout/video-play.js
@@ -21,9 +21,15 @@
initVideo2(snapParam2, snapPram3);
return;
}
- var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl;
//杞︾墝璇嗗埆鎾斁
if (snapParam1) {
+ var url = "";
+ if (PlayType.PLAY_TYPE_WEB_RTC == snapParam1.playType) {
+ url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl;
+ }
+ if (PlayType.PLAY_TYPE_YD_QLY == snapParam1.playType) {
+ url = "/basic/inout/get-media";
+ }
$.ajax({
type: "POST",
url: url,
@@ -56,8 +62,14 @@
initVideo3(snapParam3)
return;
}
- var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl;
if (snapParam2) {
+ var url = "";
+ if (PlayType.PLAY_TYPE_WEB_RTC == snapParam2.playType) {
+ url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl;
+ }
+ if (PlayType.PLAY_TYPE_YD_QLY == snapParam2.playType) {
+ url = "/basic/inout/get-media";
+ }
$.ajax({
type: "POST",
url: url,
@@ -90,7 +102,13 @@
return;
}
if (!snapParam3) return;
- var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl;
+ var url = "";
+ if (PlayType.PLAY_TYPE_WEB_RTC == snapParam3.playType) {
+ url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl;
+ }
+ if (PlayType.PLAY_TYPE_YD_QLY == snapParam3.playType) {
+ url = "/basic/inout/get-media";
+ }
$.ajax({
type: "POST",
url: url,
@@ -126,6 +144,9 @@
videoId = data.cameraId;
htm = '<video class="video" id="video' + playNum + '" autoplay="" muted="" playsinline=""></video>';
}
+ if (PlayType.PLAY_TYPE_YD_QLY == data.playType) {
+ htm = '<iframe src="' + data.playUrl + '" width="100%" height="100%" frameborder="0" allowfullscreen></iframe>';
+ }
if (1 == order) {
$("#kccz-r-video1").append(htm);
--
Gitblit v1.9.3