Quellcode durchsuchen

fix: 播放异常问题修复
1. 播放异常问题修复
2. 弹窗ui限制作用域

kindring vor 1 Jahr
Ursprung
Commit
49b7f57443

+ 6 - 0
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -164,6 +164,12 @@ public class PlayController {
 			wvpResult.setMsg("当前设备通道在推流中,请先停止(如遇非正常停止,请等待一分钟后重试)");
 			msg.setData(wvpResult);
 			resultHolder.invokeResult(msg);
+			try{
+				resultHolder.invokeAllResult(msg);
+			}catch (Exception e){
+				logger.error("关闭所有视频通道失败");
+			}
+
 		}
 		return result;
 	}

+ 17 - 17
web_src/src/assets/el-ui.css

@@ -1,63 +1,63 @@
 /* 移除无用 ui 样式 */
-.el-dialog__header {
+.use-custom-el .el-dialog__header {
   padding: 0;
 }
-.el-dialog__body {
+.use-custom-el .el-dialog__body {
   padding: 0;
 }
-.el-dialog{
-  display: flex;
+.use-custom-el .el-dialog{
+  display: block;
   flex-direction: column;
   height: 95%;
 }
-.el-dialog__header{
+.use-custom-el .el-dialog__header{
   display: flex;
   justify-content: center;
   align-items: center;
   height: 40px;
   flex-shrink: 0;
 }
-.el-dialog__body{
+.use-custom-el .el-dialog__body{
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  height: calc(90% - 40px);
+  height: calc(100% - 40px);
   flex-shrink: 0;
   flex: 0;
 }
-.el-dialog__headerbtn{
+.use-custom-el .el-dialog__headerbtn{
   position: absolute;
   right: 13px;
   top: 13px;
 }
-.el-table .cell{
+.use-custom-el .el-table .cell{
   padding: 0;
 }
-.el-table th.el-table__cell>.cell{
+.use-custom-el .el-table th.el-table__cell>.cell{
   padding: 0;
 }
-.el-button+.el-button{
-    margin-left: 0;
+.use-custom-el .el-button+.el-button{
+  margin-left: 0;
 }
 
-.el-tabs{
+.use-custom-el .el-tabs{
   height: 100%;
 }
 /* el-tabs__header .el-top*/
-.el-tabs__header{
+.use-custom-el .el-tabs__header{
   height: 40px;
   flex-shrink: 0;
   margin-bottom: 0;
 }
-.el-tabs__content{
+.use-custom-el .el-tabs__content{
   height: calc(100% - 40px);
   overflow: hidden;
 }
 
-.el-tab-pane{
+.use-custom-el .el-tab-pane{
   height: 100%;
   overflow: hidden;
   position: relative;
-    /*padding: 0 10px;*/
+  /*padding: 0 10px;*/
 }

+ 5 - 4
web_src/src/components/dialog/newPlay.vue

@@ -151,7 +151,7 @@ export default {
                   fps = tracksElement.fps;
                   break;
               }
-              if(tracksElement.codec_id_name.incudes('h265')){
+              if(tracksElement.codec_id_name && tracksElement.codec_id_name.incudes('h265')){
                   isH265 = true;
                   break;
               }
@@ -170,7 +170,7 @@ export default {
           // 判断是否为265视频
       }
       this.isLoading = false;
-      this.getMediaInfo();
+
       this.playFromStreamInfo(false, streamInfo);
     },
     playFromStreamInfo(realHasAudio, streamInfo) {
@@ -185,7 +185,8 @@ export default {
                 this.hasAudio,
                 this.fps,
                 this.enableDebug
-            )
+            );
+          this.getMediaInfo();
         });
     },
     getUrlByStreamInfo(streamInfo){
@@ -304,7 +305,7 @@ export default {
 </script>
 
 <template>
-  <div id="newPlay" v-loading="isLoading">
+  <div id="newPlay" class="use-custom-el" v-loading="isLoading">
     <el-dialog
       width="80%"
       height="80%"