ucservice 1.5.0 → 1.5.3

package/src/scooper.video.js

@@ -298,7 +298,14 @@
 							}
 					}
 					return e.returnValue;
-			}
+			},
+
+			/**
+       * 清空事件
+       */
+			 removeAllListeners: function () {
+        this._listeners = {};
+      }
 		}
 		
 		let videoListener = new Listener();
@@ -916,20 +923,20 @@
 			 * 添加事件
 			 */
 			addListener: function(type,handler,key){
-				videoListener.addListener(type,handler,key);
+				this.videoListener.addListener(type,handler,key);
 			},
 			
 			/**
 			 * 删除事件
 			 */
 			removeListener: function(type,handler){
-				videoListener.removeListener(type,handler);
+				this.videoListener.removeListener(type,handler);
 			},
 			/**
 			 * 派发事件
 			 */
 			dispatch: function(e,options){
-				videoListener.dispatch(e,options);
+				this.videoListener.dispatch(e,options);
 			},
 			
 			/**
@@ -1306,10 +1313,12 @@
 			 */
 			function VideoWebRtc($dom,opts){
 			let _self = this;
+			_self.videoListener = new Listener();
 					if (!opts) {
 						console.error('VideoWebRtc的参数opts不能为空');
 							return;
 					}
+					_self.configOpt = (opts && opts.configOpt) || 3;
 			hasMediaDevices();
 			//检测声卡设备为异步方法，耗时在几十毫秒左右，因此需要做延迟
 			//默认检查次数为40  间隔为20ms
@@ -1318,10 +1327,52 @@
 				if (count == 40) {
 					clearInterval(index);
 					_self._init($dom,opts);
+					let resizeObserver = new ResizeObserver(function( entries ) { 
+						// console.log(entries) 
+						entries.forEach((item, index) =>{ 
+							let target = item.target
+							let videoLi = document.getElementById(me.selector).querySelectorAll('li')
+							_self.VIDEO_DATA.forEach((item, index) => {
+								let tel = item.video
+								if (!tel&&item.id) {
+									videoLi[index].querySelector('video').style = ''
+									videoLi[index].querySelector('.rotate-btn').setAttribute('rotate-index', 0)
+								}else{
+									let rotateIndex = $(videoLi[index]).find('button[name=rotateVideo]').attr('rotate-index')
+									setTimeout(() => {
+										_self.videoRotateSize(videoLi[index], rotateIndex);
+									}, 200);
+								}
+							})
+						}) 
+					})
+					// 监听dom
+					resizeObserver.observe(document.querySelector(_self.selector))
 				} else {
 					if (window.checkAudioDevicesStatus) {
 						clearInterval(index);
 						_self._init($dom,opts);
+						let resizeObserver = new ResizeObserver(function( entries ) { 
+							// console.log(entries) 
+							entries.forEach((item, index) =>{ 
+								let target = item.target
+								let videoLi = document.getElementById(me.selector).querySelectorAll('li')
+								_self.VIDEO_DATA.forEach((item, index) => {
+									let tel = item.video
+									if (!tel&&item.id) {
+										videoLi[index].querySelector('video').style = ''
+										videoLi[index].querySelector('.rotate-btn').setAttribute('rotate-index', 0)
+									}else{
+										let rotateIndex = $(videoLi[index]).find('button[name=rotateVideo]').attr('rotate-index')
+										setTimeout(() => {
+											_self.videoRotateSize(videoLi[index], rotateIndex);
+										}, 200);
+									}
+								})
+							}) 
+						})
+						// 监听dom
+						resizeObserver.observe(document.querySelector(_self.selector))
 					}
 				}
 				count++;
@@ -1347,6 +1398,11 @@
 	//        		console.info('该视频正在播放');
 	//        		return false;
 	//        	}
+						// 启用播放队列时，当前位置正在关闭上一个视频，则加入播放队列
+						if (me.waitPlayQueueSwitch && me.VIDEO_DATA[index].isClosing) {
+							me._addWaitingVideo(index, video, id, opts);
+							return ;
+						}
 							console.log("play >>> " + "video=" + video + "; id=" + id + "; index=" + index);
 							me.dispatch('beforeplay',{index:index, video:video, id:id});
 							
@@ -1441,7 +1497,7 @@
 					 */
 					playInChoice: function(video, id, opts){
 						let me = this;
-						let selView = $('[video-flag="'+me._opts.windowsBeginIndex+'"]>li.sel');
+						let selView = $(me.selector + ' li.sel');
 						if(selView.length){
 							if (me.VIDEO_DATA[selView.index()].playing) {
 								me.close(selView.index());
@@ -1498,6 +1554,7 @@
 						this.VIDEO_DATA[index].close();
 		 
 							if (!isSave) {
+								this.VIDEO_DATA[index].closeType = 'close';
 									this.dispatch('afterclose', this.VIDEO_DATA[index]); 
 							}
 	
@@ -1524,6 +1581,7 @@
 								me.close(videoData[i].index);
 								
 										if (!isSave) {
+											videoData[i].closeType = 'close';
 											me.dispatch('afterclose', videoData[i]); 
 										}
 							}
@@ -1535,12 +1593,14 @@
 					 */
 					closeAll: function(isSave){
 						let me = this;
-										 
+				// 清除所有等待播放队列
+        me._removeAllWaitingVideo();
 				let openVideos = [];
 				for(let i = me._opts.windowsBeginIndex; i < me._opts.windowsBeginIndex + me._opts.windowsNum; i++){
-					if(me.VIDEO_DATA[i].playing){
-						me.close(i, isSave)
-					}
+					// if(me.VIDEO_DATA[i].playing){
+						// me.close(i, isSave)
+					// }
+					me.close(i, isSave);
 				}
 	
 	//			if(!openVideos.length) return;
@@ -1582,8 +1642,8 @@
 						me.setChoiceWindow(me._getMinIndexFreeWindow());
 					}
 					
-					$('[video-flag="'+me._opts.windowsBeginIndex+'"]').removeClass("mode-" + me._opts.windows).addClass("mode-" + num);
-					let _li = $('[video-flag="'+me._opts.windowsBeginIndex+'"]>li').hide();
+					$(me.selector + ' .video-main').removeClass("mode-" + me._opts.windows).addClass("mode-" + num);
+					let _li = $(me.selector + ' li').hide();
 					me._opts.windows = num;
 					for(let i = 0; i < num; i++){
 						_li.eq(i).show();
@@ -1592,7 +1652,7 @@
 					this.dispatch('screenchange', {windowNums:num, flag:me._opts.flag});
 
 					//设置旋转了的视频样式
-					let videoLi = document.getElementById('videoRef').querySelectorAll('li')
+					let videoLi = document.getElementById(me.selector).querySelectorAll('li')
 					me.VIDEO_DATA.forEach((item, index) => {
 						let tel = item.video
 						if (!tel&&item.id) {
@@ -1603,11 +1663,11 @@
 					//设置旋转视频的样式
 					for(let k = 0; k < _li.length; k++){
 						let rotateIndex = _li.eq(k).find('button[name=rotateVideo]').attr('rotate-index');
-						if(rotateIndex != 0 && rotateIndex != 2){
+						// if(rotateIndex != 0 && rotateIndex != 2){
 							setTimeout(() => {
 								me.videoRotateSize(_li.eq(k)[0], rotateIndex);
 							}, 200);
-						}
+						// }
 					}
 					
 				},
@@ -1639,23 +1699,34 @@
 						this._polltimer = new PollTimer(function(firstRun){
 								me.closeAll();
 								
-								wait(500).then(function(){
-											 for(let i = 0; i < windowNum; i++) {
+										if (firstRun) {
+											for(let i = 0; i < windowNum; i++) {
 												if(nowNum == maxNum){
-														nowNum = 0;
-														if(maxNum < windowNum) {
-																break;
-														}
+													nowNum = 0;
+													if(maxNum < windowNum) {
+														break;
+													}
 												}
-												
+						
 												me.playByOrder(array[nowNum].video, array[nowNum].id, array[nowNum].opts);
 												nowNum++;
-										}
-										if (firstRun) {
+											}
 												me.dispatch('startpoll', array);
-										}
-								})
-								
+										}else {
+											wait(1500).then(function(){
+												for(let i = 0; i < windowNum; i++) {
+														if(nowNum == maxNum){
+																nowNum = 0;
+																if(maxNum < windowNum) {
+																		break;
+																}
+														}
+														
+														me.playByOrder(array[nowNum].video, array[nowNum].id, array[nowNum].opts);
+														nowNum++;
+												}
+											})
+										}							
 						}, time);
 					},
 					
@@ -1780,9 +1851,9 @@
 					 */
 					getInChoiceVideo: function() {
 						let me = this;
-						let selView = $('[video-flag="'+me._opts.windowsBeginIndex+'"]>li.sel');
-					if(selView.length && me.VIDEO_DATA[selView.index()].video){
-						return me.VIDEO_DATA[selView.index()];
+						let selView = $(me.selector + ' li.sel');
+					if(selView.length && me.VIDEO_DATA[selView.attr("index")].video){
+						return me.VIDEO_DATA[selView.attr("index")];
 					}
 						return undefined;
 					},
@@ -1818,13 +1889,21 @@
 					
 						let canvasObj = document.getElementById('myCanvas');               
 							let videoObj = dataObj.tagBox.get(0);      
-							
-						canvasObj.width = dataObj.tagBox.parent().width();
-						canvasObj.height = dataObj.tagBox.parent().height();
+						if (videoObj == undefined) {
+							return;
+        		}
+						// 取流中 取视频框尺寸
+        // 播放中 取视频画面尺寸
+        if (dataObj.tagBox.parent().find(".stream-loading").length != 0) {
+          canvasObj.width = dataObj.tagBox.width();
+          canvasObj.height = dataObj.tagBox.height();
+        } else {
+          canvasObj.width = videoObj.videoWidth;
+          canvasObj.height = videoObj.videoHeight;
+        }
 	
 						let ctx = canvasObj.getContext("2d");
-						ctx.drawImage(videoObj, 0, 0, dataObj.tagBox.parent().width(), 
-								dataObj.tagBox.parent().height());
+						ctx.drawImage(videoObj, 0, 0, videoObj.videoWidth, videoObj.videoHeight);
 						
 						let dataUrl = canvasObj.toDataURL('image/jpeg');
 						callback ? callback(dataUrl) : null;
@@ -1874,7 +1953,8 @@
 						if (index < 0) {
 							console.error('窗口编号获取失败！')
 						}
-						
+						//保存对讲号码
+						window.pocNo = pocNo;
 						return me.VIDEO_DATA[index].pocCall("open_poccall", pocNo, centerTel);
 					},
 					
@@ -1899,6 +1979,7 @@
 						}
 						
 						me.VIDEO_DATA[index].stream = null;
+						window.pocNo = null;
 						return me.VIDEO_DATA[index].pocCall("close_poccall", pocNo, centerTel);
 					},
 					
@@ -1933,22 +2014,28 @@
 			 * 添加事件
 			 */
 			addListener: function(type, handler, key){
-				videoListener.addListener(type, handler, key);
+				this.videoListener.addListener(type, handler, key);
 			},
 			
 			/**
 			 * 删除事件
 			 */
 			removeListener: function(type, handler){
-				videoListener.removeListener(type, handler);
+				this.videoListener.removeListener(type, handler);
 			},
 			/**
 			 * 派发事件
 			 */
 			dispatch: function(e, options){
-				videoListener.dispatch(e, options);
+				this.videoListener.dispatch(e, options);
 			},
 			
+			/**
+       * 清空事件
+       */
+			 removeAllListeners: function() {
+				this.videoListener.removeAllListeners();
+			},
 					/**
 					 * 获取编号最小的空闲窗口的编号
 					 */
@@ -1956,7 +2043,7 @@
 						let me = this;
 						index = index || me._opts.windowsBeginIndex;
 						for (; index < me._opts.windowsBeginIndex + me._opts.windows ; index++) {
-							if (!me.VIDEO_DATA[index].playing) {
+							if (!me.VIDEO_DATA[index].playing && !me.VIDEO_DATA[index].isWaiting) {
 								return index;
 							}
 						}
@@ -1968,7 +2055,7 @@
 					 */
 					_getChoiceWindow: function() {
 						let me = this;
-						let selView = $('[video-flag="' + me._opts.windowsBeginIndex+'"]>li.sel');
+						let selView = $(me.selector + ' li.sel');
 						if (selView.length) {
 							return selView.index();
 						}
@@ -1997,8 +2084,8 @@
 					_clickWindow: function() {
 						let me = this;
 					//视频窗口选中
-					$('[video-flag="'+me._opts.windowsBeginIndex+'"]>li').click(function(){
-						$('[video-flag="'+me._opts.windowsBeginIndex+'"]>li').removeClass("sel");
+					$(me.selector + ' li').click(function(){
+						$(me.selector + ' li').removeClass("sel");
 						$(this).addClass("sel");
 						
 						//如果视频正在播放则分发点击消息
@@ -2006,6 +2093,33 @@
 									me.dispatch('click', me.getInChoiceVideo());
 								}
 					}); 
+					// 设置视频窗可拖拽
+					let src = null;
+					$(me.selector + ' li').bind("dragstart", function (ev) {
+							src = $(this);
+					})
+
+					$(me.selector + ' li').bind("dragover", function (ev) {
+							ev.preventDefault();
+					})
+
+					$(me.selector + ' li').bind("drop", function (ev) {
+							ev.preventDefault();
+							if(src.prop("outerHTML") === $(this).prop("outerHTML")){
+									return;
+							}
+							let target = $(this);
+							let srcIndex = src.index();
+							let targetIndex = target.index();
+
+							if (srcIndex > targetIndex) {
+									src.insertBefore(target);
+									target.insertAfter($(me.selector +' .video-main li.screen').eq(srcIndex));
+							} else {
+									src.insertAfter(target);
+									target.insertBefore($(me.selector +' .video-main li.screen').eq(srcIndex));
+							}
+					})
 					},
 					
 					/*
@@ -2034,7 +2148,11 @@
 									conf: {},
 									pollInterval: 10,
 									windowsNum: 16,
-									isVideoTag: true  //true生成video标签 false生产audio标签 默认true
+									isVideoTag: true,  //true生成video标签 false生产audio标签 默认true
+									showVideoInfo: 1, //显示分辨率、码率等信息，1-显示左下角 2-显示左上角，为0时控制_showVideoInfo函数处理，默认1
+          waitPlayQueueSwitch: false, //播放队列开关，默认false
+          defaultBusinessType: 0, // 配置的默认业务类型  0：调度主线  1：勤指
+          videoTipTimeOut: 5, // 超时无首屏检测时间
 							};  
 							
 							$.extend(me._opts,opts);
@@ -2053,23 +2171,32 @@
 							}
 							
 							//获取起始的窗口位置
-							me._opts.windowsBeginIndex = windowsSum;
-							//窗口总数
-							windowsSum += me._opts.windowsNum;
+							me._opts.windowsBeginIndex = 0;
+							// 对讲号码初始化
+							window.pocNo = 0;
+              // 播放队列开关 默认打开
+        me.waitPlayQueueSwitch = opts.waitPlayQueueSwitch == undefined ? false : opts.waitPlayQueueSwitch;
 							
 							//是否提示
 							me._opts.showPrompt === false && (showPrompt = false);
-							//初始化界面
-							me._opts.isVideoTag ? me._initVideoView($dom) : me._initAudioView($dom);
+							// 勤指业务下 设备检测
+							me._opts.defaultBusinessType == 1 && me._checkDevices();
+              //初始化界面
+              me._opts.isVideoTag ? me._initVideoView($dom, me._opts.showVideoInfo) : me._initAudioView($dom);
+							
 							//初始化Janus
 							me._initJanus();
 							//初始化按钮点击事件
 							me._initBtnEvent();
+							// 初始化事件监听
+							me._initEventListen();
 							
 							//设置鼠标点击选中窗口
 							me._clickWindow();
-							//显示视频信息：名称、分辨率、码率、丢包率
-							me._showVideoInfo();
+							if (me._opts.showVideoInfo != 0) {
+								//显示视频信息：名称、分辨率、码率、丢包率
+								me._showVideoInfo();
+							}
 							//双击某个视频全屏
 							me._dbClickFullScreen();
 					},
@@ -2172,36 +2299,7 @@
 					 */
 					_initBtnEvent: function() {
 						let me = this;
-
-						// 设置视频窗可拖拽
-            var src = null;
-            $(me.selector + ' li').bind("dragstart", function (ev) {
-                src = $(this);
-            })
-
-            $(me.selector + ' li').bind("dragover", function (ev) {
-                ev.preventDefault();
-            })
-
-            $(me.selector + ' li').bind("drop", function (ev) {
-                ev.preventDefault();
-                if(src.prop("outerHTML") === $(this).prop("outerHTML")){
-                    return;
-                }
-                var target = $(this);
-                var srcIndex = src.index();
-                var targetIndex = target.index();
-
-                if (srcIndex > targetIndex) {
-                    src.insertBefore(target);
-                    target.insertAfter($(me.selector +' .video-main li.screen').eq(srcIndex));
-                } else {
-                    src.insertAfter(target);
-                    target.insertBefore($(me.selector +' .video-main li.screen').eq(srcIndex));
-                }
-            })
-
-						let videoFlagObj = $('[video-flag="'+me._opts.windowsBeginIndex+'"]');
+						let videoFlagObj = $(me.selector + ' .video-main');
 						
 				//锁定视频事件
 						videoFlagObj.find("button[name='lockVideo']").click(function(){
@@ -2219,6 +2317,8 @@
 								me.VIDEO_DATA[index].isLockVideo = true;
 								$(this).attr('class', 'lock-video-btn');
 							}      		
+							//jquery方式阻止默认事件 & 冒泡事件
+							return false;
 						});
 						videoFlagObj.find('button[name=rotateVideo]').click(function(){
 							let rotateIndex = Number($(this).attr("rotate-index"));
@@ -2227,12 +2327,16 @@
 							$(this).attr("rotate-index", rotateIndex);
 							let li = $(this).parent().parent()[0];
 							me.videoRotateSize(li, rotateIndex)
+							//jquery方式阻止默认事件 & 冒泡事件
+							return false;
 						})
 						
 						//接收音频事件
 						videoFlagObj.find("button[name='recvAudio']").click(function(){
 					let _self = this;
 							let index = Number($(this).parent().parent().attr("index"));
+							// 优先当前窗口参数设置的业务类型  其次配置的默认业务类型
+							let businessType = me.VIDEO_DATA[index].opts.businessType == undefined ? me._opts.defaultBusinessType : me.VIDEO_DATA[index].opts.businessType;
 							
 							if (!me.VIDEO_DATA[index].playing) {
 								promptAlarm('请选择播放的视频源！');
@@ -2243,8 +2347,9 @@
 								//发送停止播放音频的请求
 								me.VIDEO_DATA[index].operateAudio("stop_audio")       			
 								$(this).attr('class', 'unrecv-audio-btn');
-								me.VIDEO_DATA[index].tagBox.muted = false;
+								me.VIDEO_DATA[index].tagBox.prop("muted", true);
 							} else {
+								if (businessType == 0) {
 						//发送前先关闭其它音频通道(包括接收和发送音频)
 						let lis = $($(_self).parent().parent().parent()).children();
 						for (let i = 0; i < lis.length; i++) {
@@ -2269,21 +2374,33 @@
 						//发送播放音频的请求
 						$(_self).attr('class', 'recv-audio-btn');
 						setTimeout(function () {
-							me.VIDEO_DATA[index].operateAudio("recv_audio");
-							me.VIDEO_DATA[index].tagBox.muted = true;
+							if(!me.VIDEO_DATA[index].isClosing){
+								me.VIDEO_DATA[index].operateAudio("recv_audio");
+								me.VIDEO_DATA[index].tagBox.prop("muted", false);
+							}
 						}, 1000);
+					} else if (businessType == 1) {
+						// poc新模式支持回传多个音频，因此不关闭
+              //发送播放音频的请求
+              $(_self).attr('class', 'recv-audio-btn');
+              me.VIDEO_DATA[index].operateAudio("recv_audio");
+              me.VIDEO_DATA[index].tagBox.prop("muted", false)
+            }
 							}      		
 						});
 						
 						//发送音频事件
 						videoFlagObj.find("button[name='sendAudio']").click(function(){
 							let index = Number($(this).parent().parent().attr("index"));
+							// 优先当前窗口参数设置的业务类型  其次配置的默认业务类型 最后默认调度业务
+							let businessType = me.VIDEO_DATA[index].opts.businessType == undefined ? me._opts.defaultBusinessType : me.VIDEO_DATA[index].opts.businessType;
 							
 							if (!me.VIDEO_DATA[index].playing) {
 								promptAlarm('请选择播放的视频源！');
 								return;
 							}
-							
+							if (businessType == 0) {
+                // 主线业务
 							if ($(this).attr('class') == 'send-audio-btn') {
 								me.VIDEO_DATA[index].operateAudio("unsend_audio")       			
 								$(this).attr('class', 'unsend-audio-btn');
@@ -2293,23 +2410,53 @@
 								$(this).attr('class', 'send-audio-btn');
 								me.VIDEO_DATA[index].stream.getAudioTracks()[0].enabled = true;
 							}      		
+						} else if (businessType == 1) {
+							// 勤指业务
+							if ($(this).attr('class') == 'send-audio-btn') {
+								$(this).attr('class', 'unsend-audio-btn');
+								//关闭点对点对讲
+								me.VIDEO_DATA[index].ptopPoc("close_ptop_poc", window.pocNo);
+							} else {
+								$(this).attr('class', 'send-audio-btn');
+								//发起点对点对讲
+								me.VIDEO_DATA[index].ptopPoc("open_ptop_poc", window.pocNo);
+							}
+						}
+								//jquery方式阻止默认事件 & 冒泡事件
+								return false;
 						});
 						
 						//关闭视频事件
 						videoFlagObj.find("button[name='closeVideo']").click(function(){
 							let index = Number($(this).parent().parent().attr("index"));        		
 							me.close(index);
+							// //jquery方式阻止默认事件 & 冒泡事件
+							// return false;
+						});
+					},
+					/**
+					 * 初始化事件监听
+					 */
+					 _initEventListen: function () {
+						let _self = this;
+						// 打开视频 {index, video, id, opts} index(视频窗口编号，从0开始) video(视频设备id，即devId) id(标识，空的话使用设备id) opts(其他参数)
+						_self.addListener('openVideo', function (e) {
+							_self.play(e.index, e.video, e.id, e.opts);
+						})
+						
+						// janus通知后台已关闭视频
+						_self.addListener('notifyCloseVideo', function (e) {
+							_self._notifyWaitingVideo(e.index);
 						});
 					},
-					
 					/**
 					 * 双击某个视频全屏
 					 */
 					_dbClickFullScreen: function() {
 						let me = this;
-							$('[video-flag="'+me._opts.windowsBeginIndex+'"]').find('.video-box').on("dblclick",function(){
-								me._fullScreenEvent(this);
-							});
+						$(me.selector + ' .video-main').find('.video-box').on("dblclick",function(){
+							me._fullScreenEvent(this);
+						});
 					},
 					
 					/**
@@ -2342,10 +2489,17 @@
 					_showVideoInfo: function() {
 						let me = this;
 							function clock(){
+								if(!me.VIDEO_DATA || !me.VIDEO_DATA.length) return;
 									for (let i = 0; i < me.VIDEO_DATA.length; i++) {
 										if (me.VIDEO_DATA[i].playing) {
 											let number = Number(i) + Number(1);
-											let videoObj = document.getElementById('video-' + number);
+											//获取视频video标签
+                      let $videoList = $(me.selector + " .video-main #video-" + number);
+                          if(!$videoList.length) {
+                            console.error("can not find dom by id [video-" + number + "]");
+                            continue ;
+                          }
+                      let videoObj = $videoList[0];
 											
 											if (!videoObj) continue;
 											
@@ -2360,6 +2514,7 @@
 											
 											let config = me.VIDEO_DATA[i].sipcall.webrtcStuff;
 											me._setPacketsLostRate(i, config, me);
+											me._setFrameDecoded(i, config, me);
 											let resolution = width + "×" + height;
 											switch(height + '') {
 								case '1080':
@@ -2378,11 +2533,24 @@
 										break;
 											}
 																					
-											let videoInfoObj = document.getElementById('info-' + number);
+											//获取文案显示dom元素
+											let $videoInfoList = $(me.selector + " .video-main #info-" + number);
+											if(!$videoInfoList.length) {
+													console.error("can not find dom by id [info-" + number + "]");
+													continue ;
+											}
+											let videoInfoObj = $videoInfoList[0];
 											let videoName = me.VIDEO_DATA[i].opts && me.VIDEO_DATA[i].opts.name ? 
 													me.VIDEO_DATA[i].opts.name : me.VIDEO_DATA[i].video;
 											videoInfoObj.innerHTML = videoName + '&nbsp;&nbsp;' + resolution +
 													'<br>丢包率：' + me.VIDEO_DATA[i].packetsLostRate + '&nbsp;&nbsp;' + bitrate.replace("kbits/sec", "kbps");
+													//根据视频框大小自动计算 显示文案的文字大小
+                          let fontHeightSize = $(me.selector + " .video-main #video-" + number).height() / 15;
+                          let fontWidthSize = $(me.selector + " .video-main #video-" + number).width() / 18;
+                          //长和宽 除以 15, 取小的值做文字大小样式
+                          let fontSize = fontHeightSize < fontWidthSize? fontHeightSize:fontWidthSize;
+                          fontSize = (!fontSize || fontSize > 20)? 20 : fontSize;
+                          $("#info-" + number).css("font-size", fontSize+"px");
 										}              	
 									}
 							}
@@ -2438,23 +2606,163 @@
 													'<br>' + bitrate + '&nbsp;&nbsp;Lost：' + res.packetsLost;*/
 								}
 							}
-	
 						});
-					});                		
-					}
-					},
+					});
+				}
+							},
+
+								/**
+           * 设置当前网络信号提示
+           * @param index 当前打开视频的索引
+           * @param config
+           * @param me
+           * @private
+           */
+								 _setFrameDecoded: function(index, config, me) {
+									if (config.pc !== null && typeof config.pc !== 'undefined' && config.pc.getStats) {
+											config.pc.getStats().then(function (stats) {
+													stats.forEach(function (res) {
+															if (res) {
+																	let inStats = false;
+																	// Check if these are statistics on incoming media
+																	if ((res.mediaType === 'video' || res.id.toLowerCase().indexOf('video') > -1) &&
+																			res.type === 'inbound-rtp' && res.id.indexOf('rtcp') < 0) {
+																			// New stats
+																			inStats = true;
+																	} else if (res.type === 'ssrc' && res.bytesReceived &&
+																			(res.googCodecName === 'VP8' || res.googCodecName === '')) {
+																			// Older Chromer versions
+																			inStats = true;
+																	}
+																	// Parse stats now
+																	if (inStats) {
+																			if (res.hasOwnProperty('framesDecoded')) {
+																					if (res.framesDecoded <= 1) return;
+																					if (typeof me.VIDEO_DATA[index].framesDecodedCount === 'undefined') {
+																							me.VIDEO_DATA[index].framesDecodedCount = 0;
+																					}
+																					if (typeof me.VIDEO_DATA[index].framesDecodedLast === 'undefined') {
+																							me.VIDEO_DATA[index].framesDecodedLast = res.framesDecoded;
+																					}
+																					if (res.framesDecoded > me.VIDEO_DATA[index].framesDecodedLast) {
+																							if (typeof me.VIDEO_DATA[index].tipDom !== 'undefined' && me.VIDEO_DATA[index].tipDom.style.display === 'block') {
+																									me.VIDEO_DATA[index].tipDom.style.display = 'none';
+																							}
+																					}
+																					me.VIDEO_DATA[index].framesDecodedCount++;
+																					// 定时检测
+																					if (me.VIDEO_DATA[index].framesDecodedCount === me.configOpt) {
+																							if (res.framesDecoded - me.VIDEO_DATA[index].framesDecodedLast === 0) {   // 卡顿
+																									if (typeof me.VIDEO_DATA[index].tipDom === 'undefined') {
+																											var numIndex = index + 1;
+																											me.VIDEO_DATA[index].tipDom = document.getElementById('frame-decoded-' + numIndex);
+																									}
+																									me.VIDEO_DATA[index].tipDom.style.display = 'block';
+																							}
+																							me.VIDEO_DATA[index].framesDecodedCount = 0;
+																							me.VIDEO_DATA[index].framesDecodedLast = res.framesDecoded;
+																					} else {
+																							me.VIDEO_DATA[index].framesDecodedLast = res.framesDecoded;
+																					}
+																			}
+																	}
+															}
+		
+							});
+						});                		
+						}
+						},
+
+
+					/**
+       * 设备可用性检查（扬声器、麦克风、分辨率、浏览器类型）
+       * 1. 未检测（status == undefined）询问进入检测界面
+       * 2. 检测完成按相应结果给予相应提示
+       * 3. 拒绝检测按所有检测通过处理
+       * 4. 程序自行检测，并将是否加载声卡结果放入window对象
+       * @private
+       */
+			_checkDevices: function() {
+						let me = this;
+			let tipCountKey = "DEVICES_CHECK_TIP_COUNT";
+			let statusKey = "DEVICES_CHECK_STATUS";
+			let checkCompleted = "completed";
+			let checkRejected = "rejected";
+			let microResultKey = "MICRO_RESULT";
+			let speakerResultKey = "SPEAKER_RESULT";
+			let screenResultKey = "SCREEN_RESULT";
+			let resultPass = "pass";
+			let resultNotPass = "not pass";
+
+			let tipCount = sessionStorage.getItem(tipCountKey);
+			let status = localStorage.getItem(statusKey);
+			if ((tipCount == undefined || tipCount == "0") && status == undefined) {
+				sessionStorage.setItem(tipCountKey, "1");
+				//弹窗讯问是否进入检测界面
+				if (confirm("您还没有检测硬件设备，是否先进行检测？")) {
+					window.open("/scooper-video/new/checkDevices");
+				} else {
+					localStorage.setItem(statusKey, checkRejected);
+				}
+				return;
+			}
+
+						if (status == checkCompleted) {
+							let microResult = (localStorage.getItem(microResultKey) == undefined) ? resultPass : localStorage.getItem(microResultKey);
+							let speakerResult = (localStorage.getItem(speakerResultKey) == undefined) ? resultPass : localStorage.getItem(speakerResultKey);
+							let screenResult = (localStorage.getItem(screenResultKey) == undefined) ? resultPass : localStorage.getItem(screenResultKey);
+
+							let msg = "";
+				if(speakerResult == resultNotPass){
+					msg += "检测到扬声器异常，可能影响系统某些功能的使用！";
+					console.error(msg);
+				}
+				if (microResult == resultNotPass) {
+					msg += "检测到麦克风异常，可能影响系统某些功能的使用！";
+					console.error(msg);
+				}
+				if (screenResult === resultNotPass) {
+					msg += "您的屏幕分辨率过低，可能导致页面布局混乱！";
+					//提示消息
+					promptAlarm(msg);
+				}
+				let userAgent = navigator.userAgent;
+				if (userAgent.toLowerCase().indexOf("chrome") < 0 &&  userAgent.toLowerCase().indexOf("firefox") < 0 && userAgent.toLowerCase().indexOf("edge") < 0) {
+					msg += "当前浏览器下部分功能可能存在兼容问题，建议使用谷歌浏览器！";
+					promptAlarm(msg);
+				}
+
+				if (msg != "") {
+					//提示并派发消息
+					// promptAlarm(msg);
+					//防止外部未监听消息就派发事件
+					setTimeout(function () {
+						me.videoListener.dispatch('msginfo', {'msg' : msg});
+					}, 3000);
+				}
+						}
+
+				},
+				
 					
 					/**
 					 * 视频界面的初始化，在传过来的dom中创建界面
 					 */
-					_initVideoView: function($dom) {
+					_initVideoView: function($dom, infoPosition) {
 						let me = this;
-						let objClass = (me._opts.windowsNum == 1 ? 'video-main-full mode-' : 'video-main mode-') + me._opts.windows;
+						let position;
+            switch (infoPosition) {
+          case 1: position = "info-bottom"; break;
+          case 2: position = "info-top"; break;
+          default : position = "info-bottom";
+        }
+						let objClass = (me._opts.windowsNum == 1 ? 'video-main video-main-full mode-' : 'video-main mode-') + me._opts.windows;
 						let videoHtml = '<ul class="' + objClass +'" id="video-main-web-rtc" video-flag="'+me._opts.windowsBeginIndex+'">';
 						let index = me._opts.windowsBeginIndex + 1;
 						for (let i = index; i < index + me._opts.windowsNum; i++) {
-							videoHtml += '<li class="screen-' + i +'" index="' + (i - 1) +'" draggable="true"><video class="video-box" id="video-' + i +'" autoplay ></video>' +
-							'<div class="info hide" id="info-' + i +'"></div>' +
+							videoHtml += '<li class="screen screen-' + i +'" index="' + (i - 1) +'" draggable="true"><video muted class="video-box" id="video-' + i +'" autoplay ></video>' +
+							'<div class="hide info ' + position + '" id="info-' + i +'"></div>' +
+              '<div class="hide frame-decoded" id="frame-decoded-' + i + '"style="position:absolute;float:left;color:#fff;width:67%;z-index:1;top:135px;left:180px">网络信号不佳</div>' +
 							'<div class="operate-btn">';
 							//videoHtml +='<button type="button" class="unlock-video-btn hide" name="lockVideo"></button>';
 							checkUserMediaAvailable() && (videoHtml += '<button type="button" class="rotate-btn hide" name="rotateVideo" rotate-index="0" title="视频旋转"></button><button type="button" class="unsend-audio-btn hide" name="sendAudio"></button>');
@@ -2474,7 +2782,7 @@
 					 */
 					_initAudioView: function($dom) {
 						let me = this;
-						let objClass = (me._opts.windowsNum == 1 ? 'video-main-full mode-' : 'video-main mode-') + me._opts.windows;
+						let objClass = (me._opts.windowsNum == 1 ? 'video-main video-main-full mode-' : 'video-main mode-') + me._opts.windows;
 						let videoHtml = '<ul class="' + objClass +'" id="video-main-web-rtc" video-flag="'+me._opts.windowsBeginIndex+'">';
 						let index = me._opts.windowsBeginIndex + 1;
 						for (let i = index; i < index + me._opts.windowsNum; i++) {
@@ -2523,6 +2831,7 @@
 									
 									console.error('Janus服务连接失败：'+ error)
 									me.closeAll();
+									me._removeAllWaitingVideo();
 									me._initJanus();
 								},
 								destroyed: function() {
@@ -2533,6 +2842,19 @@
 						}
 					});
 				},
+				/**
+           * 销毁所有
+           */
+				 destory: function() {
+					var me = this;
+					me.destoryJanus();
+					$(me.selector).empty();
+					me.videoListener = null;
+					me.VIDEO_DATA = null;
+					me.selector = null;
+					//destoryJanus会触发回调,需要使用到opts
+					// me._opts = null;
+			},
 				
 				/**
 				 * 销毁：Janus销毁、资源释放
@@ -2541,7 +2863,7 @@
 					let me = this;
 					me._opts.janus.destroy({
 						success: function() {
-							window.windowsSum = 0;
+							// window.windowsSum = 0;
 							//userToken = null;
 							registered = false;   				
 						},
@@ -2549,7 +2871,10 @@
 						notifyDestroyed: true,
 						
 					});
+					me.removeAllListeners();
 				},
+
+				reLoginJanusItvIndex : -1,
 				
 					/**
 					 * 初始化插件、登陆，初始化窗口
@@ -2607,59 +2932,271 @@
 								console.log("result event:" + event);
 								if(event === 'registration_failed') {
 									promptFailed("janus登陆失败: " + result["code"] + " " + result["reason"]);
+									if(me.reLoginJanusItvIndex == -1) {
+										me.reLoginJanusItvIndex = setInterval(function () {
+											console.log("尝试重新登陆janus！");
+											me._initJanus(janus);
+										}, 5000);
+									}
+										return;
+									}
+								if (event === 'video_server_closed') {
+									if(me.reLoginJanusItvIndex == -1) {
+										me.reLoginJanusItvIndex = setInterval(function () {
+											console.log("尝试重新登陆janus！");
+											me._initJanus(janus);
+										}, 5000);
+									}
 									return;
 								}
 								if(event === 'registered') {
 									let userToken = result["userToken"];
 									console.log('janus登陆成功')
 									registered = true;
+									if (me.reLoginJanusItvIndex != -1) {
+										clearInterval(me.reLoginJanusItvIndex);
+										me.reLoginJanusItvIndex = -1;
+									}
 	
 									//生成主界面
+									//相对序号，用于标识当前janus连接初始化的序号窗口
+									let relativeIndex = 0;
 									for(let i = me._opts.windowsBeginIndex; i < me._opts.windowsBeginIndex + me._opts.windowsNum; i++){
 										me.VIDEO_DATA[i] = new SVideo({
 											index: i,
 											janus: janus,
 											userToken: userToken,
 											windowsNum: me._opts.windowsNum,
+											relativeIndex: relativeIndex++,
 											flag: me._opts.flag,
 											isVideoTag: me._opts.isVideoTag,
-											janusPlugin: me._opts.conf.janusPlugin
-										});
+											janusPlugin: me._opts.conf.janusPlugin,
+											videoTipTimeOut: me._opts.videoTipTimeOut,
+											parentSelector: me.selector
+										}, me.videoListener);
 									}
 								}
 							}
 						}
 					});
 				},
+				/* ----------------------------- 播放队列 --------------------------- */
+  
+      // 记录等待中的视频
+      WAITING_DATA: [],
+  
+      // 播放队列开关 默认关闭
+      waitPlayQueueSwitch: false,
+  
+      /**
+       * 添加等待视频数据
+       * 同一位置再次打开，则覆盖上一次的
+       * 参数：index(视频窗口编号，从0开始) video(视频设备id，即devId) id(标识，空的话使用设备id) opts(其他参数)
+       */
+      _addWaitingVideo: function (index, video, id, opts) {
+        let _self = this;
+        let isOverride = false;
+        $.each(_self.WAITING_DATA, function (i, obj) {
+          if (obj.index == index) {
+            console.log("播放队列中 index = " + index + ", video = " + obj.video + " 替换为 video = " + video);
+            _self.WAITING_DATA[i] = {
+              index: index,
+              video: video,
+              id: id,
+              opts: opts
+            }
+            isOverride = true;
+            return false;
+          }
+        });
+        if (!isOverride) {
+          _self.WAITING_DATA.push({
+            index: index,
+            video: video,
+            id: id,
+            opts: opts
+          });
+          console.log("index = " + index + ", video = " + video + " 加入播放队列");
+        }
+        _self.VIDEO_DATA[index].isWaiting = true;
+      },
+  
+      /**
+       * 删除等待视频数据
+       */
+      _removeWaitingVideo: function (index, video) {
+        let _self = this;
+        $.each(_self.WAITING_DATA, function (i, obj) {
+          if (obj.index == index && obj.video == video) {
+            _self.WAITING_DATA.splice(i, 1);
+            _self.VIDEO_DATA[index].isWaiting = false;
+            console.log("index = " + index + ", video = " + video + " 从播放队列移除");
+            return false;
+          }
+        });
+      },
+  
+      /**
+       * 删除所有等待播放视频的数据
+       */
+      _removeAllWaitingVideo: function () {
+        let _self = this;
+        _self.WAITING_DATA = [];
+        let index = _self._opts.windowsBeginIndex;
+        for (; index < _self._opts.windowsBeginIndex + _self._opts.windows ; index++) {
+          _self.VIDEO_DATA[index].isWaiting = false;
+        }
+      },
+  
+      /**
+       * 上一个视频关闭后，如果该位置由等待视频，通知打开新视频
+       * @param index
+       */
+      _notifyWaitingVideo: function (index) {
+        let _self = this;
+        $.each(_self.WAITING_DATA, function (i, obj) {
+          if (obj.index == index) {
+            _self.play(obj.index, obj.video, obj.id, obj.opts);
+            _self._removeWaitingVideo(obj.index, obj.video);
+            return false;
+          }
+        });
+      }
 						
 			}
 				 
-		let FAILED_CODE = {
-					1001 : "账号或密码错误",
-					1002 : "该帐号已连接",
-					1004 : "没有鉴权",
-					2001 : "未携带token或token错误",
-					2002 : "视频源id不存在",
-					2003 : "操作指令非法(该账号不允许执行这个指令，或者不支持该指令)",
-					3001 : "nat通道未建立",
-					3002 : "该视频流已在传输",
-					3003 : "无法获取远端视频流",
-					4001 : "视频流断开连接",
-					4002 : "获取视频失败",
-					5000 : "内部错误",
-					8001 : "设备不支持该指令",
-					453  : "videoServer连接失败",
-					454  : "录像回放窗口已占用，请先停止播放",
-					455  : "无视频录像，操作失败",
-					5001 : "呼叫异常断开",
-					5002 : "禁止修改分辨率",
-					4003 : "音频被占用",
-					4004 : "音频被占用",
-					4005 : "客户端已打开对讲",
-					4006 : "终端离开云眼音频"
-			}
+			let CONST_CODE = {
+        //打开失败错误码,面板显示,不做浮窗提示框显示
+        VIDEO_CODE: {
+        2002 : "打开失败，未找到该ID的视频源",
+        2003 : "打开失败，请确认视频服务版本",
+        3001 : "打开失败，未接收到引流包，请检查端口映射",
+        3002 : "",
+        3003 : "打开失败，对方拒绝视频请求",
+        4001 : "打开失败，视频流中断",
+        4002 : "打开失败，终端挂机或超时未接听",
+        7000 : "打开失败，无法连接视频设备",
+        7001 : "打开失败，无法连接视频设备",
+        7002 : "打开失败，无法连接视频设备"
+      },
+  
+      OTHER_CODE: {
+        453 : "videoServer连接失败，错误码453",
+        454 : "视频窗口已被占用，请选择其它窗口打开或停止播放",
+        455 : "操作失败，该段时间无视频录像",
+        499 : "操作异常，错误码499",
+        440 : "操作异常，错误码440",
+        441 : "操作异常，错误码441",
+        442 : "操作异常，错误码442",
+        443 : "操作异常，错误码443",
+        444 : "操作异常，错误码444",
+        445 : "操作异常，错误码445",
+        446 : "操作异常，错误码446",
+        447 : "操作异常，错误码447",
+        448 : "操作异常，错误码448",
+        449 : "操作异常，错误码449",
+        450 : "操作异常，错误码450",
+        451 : "操作异常，错误码451",
+        452 : "操作异常，错误码452",
+        456 : "设备已处于对讲状态或不支持对讲",
+        6001 : "录像失败"
+      },
+			FAILED_CODE: {
+        1001 : "账号或密码错误",
+        1002 : "该帐号已连接",
+        1004 : "没有鉴权",
+        2001 : "未携带token或token错误",
+        2002 : "视频源id不存在",
+        2003 : "操作指令非法(该账号不允许执行这个指令，或者不支持该指令)",
+        3001 : "nat通道未建立",
+        3002 : "该视频流已在传输",
+        3003 : "无法获取远端视频流",
+        4001 : "视频流异常断开连接",
+        4002 : "获取视频失败",
+        5000 : "内部错误",
+        8001 : "该设备不支持云台操作",
+        453  : "videoServer连接失败",
+        454  : "录像回放窗口已占用，请先停止播放",
+        455  : "无视频录像，操作失败",
+        5001 : "呼叫异常断开",
+        5002 : "禁止修改分辨率",
+        401  : "禁止修改分辨率",
+        4003 : "音频重置",
+        4004 : "音频被占用",
+        4005 : "客户端已打开对讲",
+        4006 : "终端离开云眼音频",
+        4008 : "终端拒绝打开视频",
+        6001 : "录像失败",
+        499 : "内部创建失败",
+        440 : "请求消息内容为空",
+        441 : "json格式错误",
+        442 : "无效的请求",
+        443 : "消息内容缺失",
+        444 : "消息缺少参数",
+        445 : "账户已登陆",
+        446 : "收到的videoserver消息有误",
+        447 : "消息参数错误",
+        448 : "SDP创建失败",
+        449 : "未使用",
+        450 : "创建端口失败",
+        451 : "SDP创建失败",
+        452 : "未使用加密的RTP",
+        456 : "对讲未打开",
+        7000 : "URL账号密码错误（RTSP）",
+        7001 : "URL地址不通（RTSP）",
+        7002 : "URL格式错误（RTSP）"
+      },
 			
-			let STATUS_CODE_ARR = ['5002', '4003', '4004', '4005', '4006'];
+			STATUS_CODE_ARR: ['5002', '4003', '4004', '4005', '4006']
+		}
+		/**
+     * 显示播放错误内容, 4002特殊处理
+     * @param videoObj 视频对象
+     * @param code 状态码（包含错误码）
+     * @param isShowReplayBtn 是否显示重新播放按钮
+     * @param video 打开错误的视频Id
+     */
+		 function showResult(videoObj, code, isShowReplayBtn, video) {
+      let videoDom = videoObj.tagBox.parent();
+  
+      videoDom.addClass("result");
+      videoDom.find('.operate-btn .close-btn').show();
+  
+      if (CONST_CODE.FAILED_CODE[code] && code != "4002") {
+        let resultHtml = "<div class='real-result'>错误码" + code + ": " + CONST_CODE.FAILED_CODE[code] + "</div>"
+        videoDom.append(resultHtml);
+      }
+  
+      let resultHtml = "<div class='result'><div class='result-tip'>" + CONST_CODE.VIDEO_CODE[code] + "</div>";
+      if(isShowReplayBtn && code != "4002") {
+        resultHtml += "<div class='result-replay'><span id='replay-" + videoObj.index + "' class='replay'>点击重试</span></div>"
+      }
+      resultHtml += "</div>";
+      videoDom.append(resultHtml);
+      if(isShowReplayBtn && code != "4002") {
+        $("#replay-" + videoObj.index).unbind("click").click(function () {
+          videoObj.videoListener.dispatch("openVideo", {index: videoObj.index, video: video, id: videoObj.id, opts: videoObj.opts});
+        });
+      }
+      if (code == "4002") {
+        setTimeout(function () {
+          clearResult(videoDom);
+        }, 5000);
+      }
+    }
+  
+    /**
+     * 清除显示内容  videoDom: 视频Dom对象
+     */
+    function clearResult(videoDom, videoObj) {
+      videoDom.removeClass("result");
+      videoDom.find(".real-result").remove();
+      videoDom.find(".result").remove();
+          if (!videoObj || !videoObj.playing) {
+        // bug id 18654: 增加是否正在播放判断
+        videoDom.find('.operate-btn .close-btn').hide();
+      }
+    }
 			
 			//window.VIDEO_DATA = [];//记录视频各分屏的状态
 			window.windowsSum = 0; //当前页面的视频总数，可能有多个VideoWebRtc对象
@@ -2667,16 +3204,23 @@
 		let registered = false;
 		let recordAvBusinessId = null;
 			
-			function SVideo (opts) {
+			function SVideo (opts, videoListener) {
 			this.janus = opts.janus;	
 			this.userToken = opts.userToken;
 			this.sipcall = null;
 			this.index = opts.index;
-			this.tagBox = opts.isVideoTag ? $('#video-' + (this.index + 1)) : $('#audio-' + (this.index + 1));
+			this.relativeIndex = opts.relativeIndex;
+			// this.tagBox = opts.isVideoTag ? $('#video-' + (this.index + 1)) : $('#audio-' + (this.index + 1));
+			this.tagBox = opts.isVideoTag ? $(opts.parentSelector + ' #video-' + (this.index + 1)) : $('#audio-' + (this.index + 1));
 			this.windowsNum = opts.windowsNum;
 			this.flag = opts.flag;
 			this.isVideoTag = opts.isVideoTag;
 			this.janusPlugin = opts.janusPlugin;
+			this.isClosing = false; // 当前分屏是否正在关闭视频
+      this.isWaiting = false; // 当前分屏是否有视频在等待播放
+      this.playSucTimeOutIndex = -1; // 超时提示定时器index
+      this.videoTipTimeOut = opts.videoTipTimeOut; // 超时无首屏时间
+          this.videoListener = videoListener;
 			this.init();
 		}
 			
@@ -2699,8 +3243,8 @@
 								console.log("视频插件初始化成功:" + self.index);					
 								self.sipcall = pluginHandle;
 								
-								if (self.index + 1 >= self.windowsNum) {
-									videoListener.dispatch('initsucc', self); 
+								if (self.relativeIndex + 1 >= self.windowsNum) {
+									self.videoListener.dispatch('initsucc', self);
 								}
 							},
 							
@@ -2717,10 +3261,15 @@
 									promptFailed("请先登陆");
 								} 
 								
-									if (msg.error_code) {
-										console.error(msg.error_code + ' ' + msg.error);
-									promptFailed(FAILED_CODE[msg.error_code] || '错误码：' + msg.error_code);
-									videoListener.dispatch('msginfo', {'msg' : FAILED_CODE[msg.error_code] || '错误码：' + msg.error_code});    						
+								let video = self.video;
+								if (msg.error_code) {
+									console.error("错误码：" + msg.error_code + " " + CONST_CODE.FAILED_CODE[msg.error_code]);
+									if (CONST_CODE.VIDEO_CODE[msg.error_code]) {
+								showResult(self, msg.error_code, true, video);
+							} else {
+								promptFailed(CONST_CODE.OTHER_CODE[msg.error_code] || CONST_CODE.FAILED_CODE[msg.error_code] || '错误码：' + msg.error_code);
+							}
+														self.videoListener.dispatch('msginfo', {'code': msg.error_code, 'msg' : CONST_CODE.OTHER_CODE[msg.error_code] || CONST_CODE.FAILED_CODE[msg.error_code] || '错误码：' + msg.error_code});  						
 									return false;
 									}
 									
@@ -2729,21 +3278,28 @@
 							if (result.error_code && result.error_code != 0) {
 									//videoListener.dispatch('afterclose', self); 
 									
-									if (!STATUS_CODE_ARR.includes(result.error_code + '')) {
+									if (!CONST_CODE.STATUS_CODE_ARR.includes(result.error_code + '')) {
 										//videoListener.dispatch('afterclose', self); 
 											//播放失败 关闭视频
-										let video = self.video;
+									
 											self.close('err');
 											
 											if (self.isLockVideo) {
-												self.play(video);
+												setTimeout(function () {
+													self.play(video);
+												}, 1500);
 											} else {
-												videoListener.dispatch('afterclose', self); 
+												self.closeType = 'error';
+												self.videoListener.dispatch('afterclose', self); 
 											}
 									} 
 									
-									videoListener.dispatch('msginfo', {'msg' : FAILED_CODE[result.error_code] || '错误码：' + result.error_code});						
-									promptFailed(FAILED_CODE[result.error_code] || '错误码：' + result.error_code);
+									self.videoListener.dispatch('msginfo', {'code': result.error_code, 'msg' : CONST_CODE.OTHER_CODE[result.error_code] || CONST_CODE.FAILED_CODE[result.error_code] || '错误码：' + result.error_code});
+                  if (CONST_CODE.VIDEO_CODE[result.error_code]) {
+                  showResult(self, result.error_code, true, video);
+                } else {
+                  promptFailed(CONST_CODE.OTHER_CODE[result.error_code] || CONST_CODE.FAILED_CODE[result.error_code] || '错误码：' + result.error_code);
+                }
 									
 										self.tagBox.parent().find('.recv-audio-btn').attr("class", "unrecv-audio-btn");
 										self.tagBox.parent().find('.send-audio-btn').attr("class", "unsend-audio-btn");
@@ -2769,11 +3325,17 @@
 											},
 											error: function(error) {
 												console.error(error);
-												let body = { "request": "decline", "code": 480 };
-												self.sipcall.send({"message": body});
+												// let body = { "request": "decline", "code": 480 };
+												// self.sipcall.send({"message": body});
 											}
 										});
 											break;
+									case 'accepted' :
+                  self.playSucTimeOutIndex = setTimeout(function () {
+                    let _li = self.tagBox.parent();
+                    _li.append('<div class="video-tip">网络环境较差，可能无法正常加载视频</div>');
+                  }, self.videoTipTimeOut * 1000);
+                  break;
 									//呼叫失败  
 									case 'callfaild':
 										//promptFailed(FAILED_CODE[result.error_code] || '错误码：' + result.error_code);
@@ -2788,19 +3350,31 @@
 									case 'start_av_record':
 										if (result && result.filename) {
 											self.videoFileName = result.filename;
-											videoListener.dispatch('recordvideo', self);
+											self.videoListener.dispatch('startRecordVideo', self);
 											console.log('录像地址：' + result.filename);
 										}
 										break;
+									case 'stop_av_record':
+                  if (result && result.filename) {
+                    self.videoFileName = result.filename;
+                                      self.videoListener.dispatch('stopRecordVideo', self);
+                    console.log('录像地址：' + result.filename);
+                  }
+                  break;
 								//修改分辨率
 									case 'ser_notify_resolution':
 										if (result && result.resolution) {
 											self.resolution = result.resolution;
-											videoListener.dispatch('notifyresolution', self);
+											self.videoListener.dispatch('notifyresolution', self);
 											console.log('接收notifyresolution：' + result.resolution);
 												//promptAlarm('当前分辨率：' + result.resolution);
 										}
 										break;
+									case 'change_resolution':
+											if(result) {
+																					self.videoListener.dispatch('notifyResolutionChange', self);
+											}
+																			break;
 									//建立预呼叫响应
 									case 'open_poccall':
 										console.log('建立预呼叫');
@@ -2826,8 +3400,32 @@
 										console.log('预呼叫异常断开');
 										break;
 									case 'ser_stop_audio': 
+										self.tagBox.parent().find('.recv-audio-btn').attr("class", "unrecv-audio-btn");
 										console.log('音频异常关闭！');
 										break;
+									case 'close_down_audio':
+										self.tagBox.parent().find('.send-audio-btn').attr("class", "unsend-audio-btn");
+										promptSuccess("通话时间到");
+										console.log('通话时间到！');
+										break;
+									case 'ser_notify_dispatch_close_ptop_poc':
+										self.tagBox.parent().find('.send-audio-btn').attr("class", "unsend-audio-btn");
+										console.log('调度通知点对点对讲关闭！');
+										break;
+									case 'ser_close_ptop_poc':
+										self.tagBox.parent().find('.send-audio-btn').attr("class", "unsend-audio-btn");
+										console.log('点对点对讲关闭！');
+										break;
+									case 'ser_open_ptop_poc':
+										self.tagBox.parent().find('.unsend-audio-btn').attr("class", "send-audio-btn");
+										console.log('点对点对讲打开！');
+										break;
+										// 视频关闭通知
+									case 'ser_close_video':
+										console.log('视频框 ' + self.index + ' 视频已关闭');
+										self.isClosing = false;
+																		self.videoListener.dispatch('notifyCloseVideo', self);
+										break;
 									default:
 										console.log('event：' + event);
 										break;
@@ -2883,7 +3481,9 @@
 						self.tagBox.bind("canplay play playing", function () {
 							if(self.video){
 								if (self.tagBox.is(':visible')) return;
-								
+								// 清除播放监测定时任务，清除内容
+								self.playSucTimeOutIndex > 0 && clearTimeout(self.playSucTimeOutIndex);
+								self.tagBox.parent().find(".video-tip").remove();
 								console.log('分屏=' + (self.index + 1) + ', ' + self.video + ' 播放成功');
 								promptSuccess('分屏' + (self.index + 1) + ' 播放成功');
 								self.tagBox.show();
@@ -2930,13 +3530,20 @@
 						};
 						this.sipcall.send({"message": body });
 						this.video = video;
+						this.isClosing = false;
 						this.playing = true;
 						this.packetsLostRate = '0.00%';
 						this.packetsLostSum = 0;
 						this.packetsReceivedSum = 0;
+						let numIndex = this.index + 1;
+          let framesDecodedDom = document.getElementById("frame-decoded-" + numIndex);
+          framesDecodedDom.style.display = 'none';
+          this.framesDecodedLast = undefined;
+          this.framesDecodedCount = 0;
 						
 						//loading
 						let _li = this.tagBox.parent();
+						clearResult(_li, this);
 						if(!_li.hasClass("loading")){
 							_li.addClass("loading").append('<div class="stream-loading">等待数据流传送...</div>');						
 						}	
@@ -2950,6 +3557,8 @@
 							this.tagBox.parent().find('.lock-video-btn').attr("class", "unlock-video-btn");
 	
 						}
+						//清除结果提示内容
+						clearResult(this.tagBox.parent(), this);
 						
 						//let reqType = type ? type : "hangup";
 						if(!this.playing) return;
@@ -2962,6 +3571,7 @@
 						this.sipcall.send({"message": _hangup});
 						this.sipcall.hangup();
 						this.tagBox.hide();
+						this.isClosing = true;
 						this.playing = false;
 						this.video = null;
 						this.packetsLostRate = '0.00%';
@@ -2977,6 +3587,15 @@
 						this.tagBox.parent().removeClass("loading").find(".stream-loading").remove();
 						//清除object-fit
 						this.tagBox.css('object-fit', '');
+
+						// 清除内容提示
+						this.playSucTimeOutIndex > 0 && clearTimeout(this.playSucTimeOutIndex);
+						this.tagBox.parent().find(".video-tip").remove();
+						var numIndex = Number(this.index) + 1;
+						var framesDecodedDom = document.getElementById("frame-decoded-" + numIndex);
+						framesDecodedDom.style.display = 'none';
+						this.framesDecodedLast = undefined;
+						this.framesDecodedCount = 0;
 					},
 					
 							/**
@@ -3081,6 +3700,7 @@
 						
 						//loading
 						let _li = this.tagBox.parent();
+						clearResult(_li, this);
 						if(!_li.hasClass("loading")){
 							_li.addClass("loading").append('<div class="stream-loading">等待数据流传送...</div>');						
 						}
@@ -3222,26 +3842,28 @@
 						
 						self.sipcall.send({"message": body });	
 						console.log("预呼叫操作="+ requestType +", 对讲号码=" + pocNo + ",调度中心号码=" + centerTel);
+					},
+  
+					/**
+					 * 点对点对讲
+					 * requstType: open_ptop_poc(开启) close_poc_poc(关闭)
+					 * pocno
+					 */
+					ptopPoc: function(requestType, pocNo) {
+						let self = this;
+		
+						let body = {
+							request: requestType,
+							pocno: pocNo,
+							playseq: self.index,
+							pocmember: self.video,
+							userToken: self.userToken,
+						};
+		
+						self.sipcall.send({"message": body });
+						console.log("点对点对讲操作="+ requestType +", 主叫号码=" + pocNo + ",被叫号码=" + self.video);
 							}
 			}
 			
 			return isIE() ? VideoOcx : VideoWebRtc;
-	}));
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	}));