Browse Source

Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial

tag_videoplay.done
巴林闲侠 3 years ago
parent
commit
da1ea56186
  1. 2
      code/VideoAccess-VCMP/web/client/index.html
  2. 4
      code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
  3. 1
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
  4. 8
      code/VideoAccess-VCMP/web/client/src/sections/offline/containers/statuscode.jsx

2
code/VideoAccess-VCMP/web/client/index.html

@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" />
<meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy">
<!-- <meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy"> 会将http转化成https,导致jessibuca视频播放不成功 -->
<link rel="shortcut icon" href="/assets/images/favicon.ico">
<script src="/assets/js/jessibuca/jessibuca.js"></script>
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_14797_10.b43556420cacd0119dedf94deff663bb.js"></script>

4
code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx

@ -251,7 +251,7 @@ const VideoPlay = ({
// console.log(err);
// })
const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`)
const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`)
} catch (error) {
console.log(error.response);
}
@ -267,7 +267,7 @@ const VideoPlay = ({
debug: true,
showBandwidth: false, //
operateBtns: {
fullscreen: false,
fullscreen: true,
screenshot: false,
play: false,
audio: false,

1
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx

@ -225,6 +225,7 @@ const CameraHeader = (props) => {
yingshiToken: row.secretYingshi?.token,
playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd?.ezopen,
playUrlHd: row.gbCamera?.playUrl?.liveUrl?.hd?.ezopen,
replayUrl:row.gbCamera?.playUrl?.replayUrl?.cloud,
content:data,
})
} else {

8
code/VideoAccess-VCMP/web/client/src/sections/offline/containers/statuscode.jsx

@ -92,7 +92,7 @@ const Statuscode = (props) => {
},
},
{
title: "释义",
title: "官方释义",
dataIndex: "paraphrase",
render: (_, r, index) => {
return r.paraphrase
@ -133,7 +133,7 @@ const Statuscode = (props) => {
</Button>
) : (
<Popconfirm
title="禁用后下级业务系统将无法获取该视频流的所有信息。"
title="禁用后,您的自定义释义将会失效。"
arrowPointAtCenter={false}
showArrow={true}
position="topRight"
@ -322,7 +322,7 @@ const Statuscode = (props) => {
label="释义搜索:"
field="keyword"
maxLength="36"
placeholder="请输入错误描述、释义或自定义释义"
placeholder="请输入错误描述、释义"
labelPosition="left"
style={screen}
/>
@ -339,7 +339,7 @@ const Statuscode = (props) => {
<Form.Select.Option value="true">禁用</Form.Select.Option>
</Form.Select>
<Form.Select
label="状态查询:"
label="自定义释义:"
labelPosition="left"
field="paraphraseCustom"
style={screen}

Loading…
Cancel
Save