Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
张艾宸
/
webScreen
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
张艾宸
2021-05-26 10:20:49 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
6492d2a60dfcad090990a8a2b2651a14d9cb5c93
6492d2a6
1 parent
ca2df2c0
实时录制去掉media目录,去掉vb参数
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
13 行增加
和
8 行删除
routes/bbgRecording.js
routes/index.js
routes/bbgRecording.js
查看文件 @
6492d2a
...
...
@@ -30,15 +30,19 @@ class MediaCreat {
let
fileConfig
=
this
.
getConfigFileJson
()
if
(
!
fileConfig
)
return
false
const
{
BACKMEDIACONFIG
,
PROJECTWINCATALOG
,
PROJECTCATALOG
}
=
JSON
.
parse
(
fileConfig
)
let
mediaDir
=
PROJECTCATALOG
+
"/media/"
let
classDir
=
PROJECTCATALOG
+
"/media/"
+
siteId
// let mediaDir = PROJECTCATALOG + "/media/"
// let classDir = PROJECTCATALOG + "/media/" + siteId
// let ymdDir = null
// let timeDir = dayTimeYMD().ymd
// ymdDir = PROJECTCATALOG + "/media/" + siteId + "/" + timeDir
let
classDir
=
PROJECTCATALOG
+
"/"
+
siteId
let
ymdDir
=
null
let
timeDir
=
dayTimeYMD
().
ymd
ymdDir
=
PROJECTCATALOG
+
"/media/"
+
siteId
+
"/"
+
timeDir
ymdDir
=
PROJECTCATALOG
+
"/"
+
siteId
+
"/"
+
timeDir
if
(
!
fs
.
existsSync
(
mediaDir
))
{
fs
.
mkdirSync
(
mediaDir
);
}
if
(
!
fs
.
existsSync
(
classDir
))
{
fs
.
mkdirSync
(
classDir
);
}
...
...
@@ -81,7 +85,8 @@ class MediaCreat {
// 上报地址
async
sendMediaInfo
(
siteId
,
id
,
timeDir
){
// https://testmp4.obs.cn-north-4.myhuaweicloud.com/oss/media/eebbktest/20210326/1657547103.mp4
let
MediaUrl
=
`
https
:
//testmp4.obs.cn-north-4.myhuaweicloud.com/oss/media/${siteId}/${timeDir}/${id}.mp4`
// let MediaUrl = `https://testmp4.obs.cn-north-4.myhuaweicloud.com/oss/media/${siteId}/${timeDir}/${id}.mp4`
let
MediaUrl
=
`
https
:
//testmp4.obs.cn-north-4.myhuaweicloud.com/oss/${siteId}/${timeDir}/${id}.mp4`
let
urlSizeId
=
{
"eebbktest"
:
"gdbbkwxyace"
,
"gdbbk"
:
"gdbbkwx"
,
...
...
routes/index.js
查看文件 @
6492d2a
...
...
@@ -131,7 +131,7 @@ class MediaCreat {
// export DISPLAY=:7
// let url = `${path.resolve(__dirname, PROJECTWINCATALOG+"/web_capture_c")} -o=${ymdDir}/${id}.mp4 -u="${BACKMEDIACONFIG.url}?classId=${id}&recordMp4=${BACKMEDIACONFIG.recordMp4}&userId=${BACKMEDIACONFIG.userId}&userName=${BACKMEDIACONFIG.userName}&userRole=${BACKMEDIACONFIG.userRole}&portalIP=${BACKMEDIACONFIG.portalIP}&portalPort=${BACKMEDIACONFIG.portalPort}&channels=${BACKMEDIACONFIG.channels}&playRecord=${BACKMEDIACONFIG.playRecord}" -d=${BACKMEDIACONFIG.d} -s=${BACKMEDIACONFIG.s} -fa=${BACKMEDIACONFIG.fa} -k=${BACKMEDIACONFIG.k} -w=${BACKMEDIACONFIG.w} -h=${BACKMEDIACONFIG.h}`
// console.log("url", url)
let
url
=
`
$
{
PROJECTWINCATALOG
}
/web_capture_c -o=${ymdDir}/
$
{
id
}.
mp4
-
u
=
"${BACKMEDIACONFIG.url}?classId=${id}&recordMp4=${BACKMEDIACONFIG.recordMp4}&userId=${BACKMEDIACONFIG.userId}&userName=${BACKMEDIACONFIG.userName}&userRole=${BACKMEDIACONFIG.userRole}&portalIP=${BACKMEDIACONFIG.portalIP}&portalPort=${BACKMEDIACONFIG.portalPort}&channels=${BACKMEDIACONFIG.channels}&playRecord=${BACKMEDIACONFIG.playRecord}&language=zh-cn"
-
d
=
$
{
BACKMEDIACONFIG
.
d
}
-
s
=
$
{
BACKMEDIACONFIG
.
s
}
-
fa
=
$
{
BACKMEDIACONFIG
.
fa
}
-
k
=
$
{
BACKMEDIACONFIG
.
k
}
-
w
=
$
{
BACKMEDIACONFIG
.
w
}
-
h
=
$
{
BACKMEDIACONFIG
.
h
}
-
vb
=
999999999999
`
let
url
=
`
$
{
PROJECTWINCATALOG
}
/web_capture_c -o=${ymdDir}/
$
{
id
}.
mp4
-
u
=
"${BACKMEDIACONFIG.url}?classId=${id}&recordMp4=${BACKMEDIACONFIG.recordMp4}&userId=${BACKMEDIACONFIG.userId}&userName=${BACKMEDIACONFIG.userName}&userRole=${BACKMEDIACONFIG.userRole}&portalIP=${BACKMEDIACONFIG.portalIP}&portalPort=${BACKMEDIACONFIG.portalPort}&channels=${BACKMEDIACONFIG.channels}&playRecord=${BACKMEDIACONFIG.playRecord}&language=zh-cn"
-
d
=
$
{
BACKMEDIACONFIG
.
d
}
-
s
=
$
{
BACKMEDIACONFIG
.
s
}
-
fa
=
$
{
BACKMEDIACONFIG
.
fa
}
-
k
=
$
{
BACKMEDIACONFIG
.
k
}
-
w
=
$
{
BACKMEDIACONFIG
.
w
}
-
h
=
$
{
BACKMEDIACONFIG
.
h
}
`
exec
(
url
,
{
maxBuffer
:
1073741824
},
(
err
,
stdout
,
stderr
)
=>
{
if
(
err
!=
null
)
{
this
.
wrieLog
(
" 错误"
+
id
+
":"
+
err
)
...
...
请
注册
或
登录
后发表评论