ucservice 1.3.7 → 1.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ucservice",
   "private": false,
-  "version": "1.3.7",
+  "version": "1.4.0",
   "description": "统一通信服务",
   "main": "dist/ucservice.common.js",
   "style": "ucservice.css",

package/src/css/scooper.video.css

@@ -151,15 +151,15 @@
 }
 .rotate-btn {
 	position: absolute;
-	bottom: -8px;
-	right: 70px;
+	bottom: 1px;
+	right: 76px;
 	border: 0;
-	width: 48px;
-    height: 48px;
-    float: left;
-	/* background-image: url("~@/img/yy_gb.png"); */
-    background-size: 100% 100%;
-    background-color: rgba(0,0,0,0);
+	width: 28px;
+	height: 28px;
+	float: left;
+/* background-image: url("~@/img/yy_gb.png"); */
+	background-size: 100% 100%;
+	background-color: rgba(0,0,0,0);
 }
 .recv-audio-btn {
 	position: absolute;

package/src/scooper.video.js

@@ -1598,7 +1598,7 @@
 					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)
-							videoRotateSize(_li.eq(k), rotateIndex);
+							me.videoRotateSize(_li.eq(k)[0], rotateIndex);
 					}
 				},
 					
@@ -2013,6 +2013,11 @@
 				 */
 					_init: function($dom,opts){
 						let me = this;
+						//保存dom元素的selector用作后续所有子集对象的定位(在多组件对讲模式下有用)
+						if($dom.length == 0 || !me.getDomSelector($dom)) {
+							console.error("父doom元素为空,无法进行视频初始化", $dom);
+							return ;
+						}
 						//配置项
 							me._opts = {
 									windows: 4,
@@ -2105,16 +2110,44 @@
 							if(videoWidth / videoHeight > liWidth / liHeight){ //视频横向留白
 								$(video).css('width', liHeight);
 								$(video).css('height', 'auto');
-								$(video).css('left', 'calc(' + liWidth + ' / 2' + ' - ' + liHeight + ' / 2)');
-								$(video).css('top', 'calc(-' + liHeight / 2 + ' / ' + vWidth + ' * ' +  vHeight + ' + ' + liHeight + ' / 2)');
+								$(video).css('left', 'calc(' + liWidth + 'px / 2' + ' - ' + liHeight + 'px / 2)');
+								$(video).css('top', 'calc(-' + liHeight / 2 + ' / ' + vWidth + ' * ' +  vHeight + 'px + ' + liHeight + 'px / 2)');
 							}else { //视频纵向留白
 								$(video).css('height', liWidth);
 								$(video).css('width', 'auto');
-								$(video).css('left', 'calc(' + liHeight + ' / 2' + ' - ' + liWidth + ' / 2)');
-								$(video).css('top', 'calc(-' + liWidth / 2 + ' / ' + vHeight + ' * ' +  vWidth + ' + ' + liWidth + ' / 2)');
+								$(video).css('left', 'calc(' + liHeight + 'px / 2' + ' - ' + liWidth + 'px / 2)');
+								$(video).css('top', 'calc(-' + liWidth / 2 + ' / ' + vHeight + ' * ' +  vWidth + 'px + ' + liWidth + 'px / 2)');
 							}
 						}
 					},
+					 /**
+					 * 获取父窗口传入dom的唯一selector(针对jquery高版本dom对象没有selector属性的问题)
+					 * @param $dom
+					 * @return {boolean}
+					*/
+						getDomSelector: function($dom) {
+							var me = this;
+							if($dom.selector) {
+									me.selector = $dom.selector;
+							}
+							else {
+									if($dom.attr("id")) {
+											me.selector = "#" + $dom.attr("id");
+									}
+									else {
+											if(!$dom.attr("class")) return false;
+											var classNames = $dom.attr("class").split(/\s+/);
+											$.each(classNames, function (i, className) {
+													if ($("." + className).length == 1) {
+															me.selector = "." + className;
+															return true;
+													}
+											});
+									}
+							}
+							if(!me.selector) return false;
+							else return true;
+						},
 					
 					/**
 					 * 初始化按钮点击事件
@@ -2174,7 +2207,7 @@
 							rotateIndex++
 							$(this).attr("rotate-index", rotateIndex % 4);
 							let li = $(this).parent().parent()[0];
-							videoRotateSize(li, rotateIndex)
+							me.videoRotateSize(li, rotateIndex)
 						})
 						
 						//接收音频事件
@@ -2401,7 +2434,7 @@
 						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) +'"><video class="video-box" id="video-' + i +'" autoplay ></video>' +
+							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>' +
 							'<div class="operate-btn">';
 							//videoHtml +='<button type="button" class="unlock-video-btn hide" name="lockVideo"></button>';