张艾宸 / webScreen

转到一个项目
Toggle navigation Toggle navigation pinning
张艾宸
6492d2a6 1 parent ca2df2c0

实时录制去掉media目录，去掉vb参数

内嵌 并排对比
正在显示 2 个修改的文件 包含 13 行增加 和 8 行删除
@@ -30,15 +30,19 @@ class MediaCreat { @@ -30,15 +30,19 @@ class MediaCreat {
30 let fileConfig = this.getConfigFileJson() 30 let fileConfig = this.getConfigFileJson()
31 if (!fileConfig) return false 31 if (!fileConfig) return false
32 const { BACKMEDIACONFIG, PROJECTWINCATALOG, PROJECTCATALOG } = JSON.parse(fileConfig) 32 const { BACKMEDIACONFIG, PROJECTWINCATALOG, PROJECTCATALOG } = JSON.parse(fileConfig)
33 - let mediaDir = PROJECTCATALOG + "/media/"  
34 - let classDir = PROJECTCATALOG + "/media/" + siteId 33 + // let mediaDir = PROJECTCATALOG + "/media/"
  34 + // let classDir = PROJECTCATALOG + "/media/" + siteId
  35 + // let ymdDir = null
  36 + // let timeDir = dayTimeYMD().ymd
  37 + // ymdDir = PROJECTCATALOG + "/media/" + siteId + "/" + timeDir
  38 +
  39 +
  40 + let classDir = PROJECTCATALOG + "/" + siteId
35 let ymdDir = null 41 let ymdDir = null
36 let timeDir = dayTimeYMD().ymd 42 let timeDir = dayTimeYMD().ymd
37 - ymdDir = PROJECTCATALOG + "/media/" + siteId + "/" + timeDir 43 + ymdDir = PROJECTCATALOG + "/" + siteId + "/" + timeDir
38 44
39 - if (!fs.existsSync(mediaDir)) {  
40 - fs.mkdirSync(mediaDir);  
41 - } 45 +
42 if (!fs.existsSync(classDir)) { 46 if (!fs.existsSync(classDir)) {
43 fs.mkdirSync(classDir); 47 fs.mkdirSync(classDir);
44 } 48 }
@@ -81,7 +85,8 @@ class MediaCreat { @@ -81,7 +85,8 @@ class MediaCreat {
81 // 上报地址 85 // 上报地址
82 async sendMediaInfo(siteId,id,timeDir){ 86 async sendMediaInfo(siteId,id,timeDir){
83 // https://testmp4.obs.cn-north-4.myhuaweicloud.com/oss/media/eebbktest/20210326/1657547103.mp4 87 // https://testmp4.obs.cn-north-4.myhuaweicloud.com/oss/media/eebbktest/20210326/1657547103.mp4
84 - let MediaUrl = `https://testmp4.obs.cn-north-4.myhuaweicloud.com/oss/media/${siteId}/${timeDir}/${id}.mp4` 88 + // let MediaUrl = `https://testmp4.obs.cn-north-4.myhuaweicloud.com/oss/media/${siteId}/${timeDir}/${id}.mp4`
  89 + let MediaUrl = `https://testmp4.obs.cn-north-4.myhuaweicloud.com/oss/${siteId}/${timeDir}/${id}.mp4`
85 let urlSizeId = { 90 let urlSizeId = {
86 "eebbktest": "gdbbkwxyace", 91 "eebbktest": "gdbbkwxyace",
87 "gdbbk":"gdbbkwx", 92 "gdbbk":"gdbbkwx",
@@ -131,7 +131,7 @@ class MediaCreat { @@ -131,7 +131,7 @@ class MediaCreat {
131 // export DISPLAY=:7 131 // export DISPLAY=:7
132 // 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}` 132 // 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}`
133 // console.log("url", url) 133 // console.log("url", url)
134 - 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` 134 + 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}`
135 exec(url, { maxBuffer: 1073741824 }, (err, stdout, stderr) => { 135 exec(url, { maxBuffer: 1073741824 }, (err, stdout, stderr) => {
136 if (err != null) { 136 if (err != null) {
137 this.wrieLog(" 错误" + id + "：" + err) 137 this.wrieLog(" 错误" + id + "：" + err)