ucservice 1.4.1 → 1.4.4

package/package.json

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

package/src/css/scooper.video.css

@@ -115,8 +115,8 @@
 
 .operate-btn{
     position: absolute;
-    width: 24px;
-    height: 24x;
+    width: 1.5rem;
+    height: 1.5rem;
     float: left;
     right: 1px;
     bottom: 2px;
@@ -129,8 +129,8 @@
 	bottom: -8px;
 	right: 70px;
 	border: 0;
-	width: 48px;
-    height: 48px;
+	width: 3rem;
+    height: 3rem;
     float: left;
 	/* background:url("~@/img/yy.png"); */
 	background-size: 100% 100%;
@@ -142,8 +142,8 @@
 	bottom: -8px;
 	right: 70px;
 	border: 0;
-	width: 48px;
-    height: 48px;
+	width: 3rem;
+    height: 3rem;
     float: left;
 	/* background-image: url("~@/img/yy_gb.png"); */
     background-size: 100% 100%;
@@ -154,8 +154,8 @@
 	bottom: 1px;
 	right: 76px;
 	border: 0;
-	width: 28px;
-	height: 28px;
+	width: 1.75rem;
+	height: 1.75rem;
 	float: left;
 /* background-image: url("~@/img/yy_gb.png"); */
 	background-size: 100% 100%;
@@ -166,8 +166,8 @@
 	bottom: -8px;
 	right: 30px;
 	border: 0;
-	width: 48px;
-    height: 48px;
+	width: 3rem;
+    height: 3rem;
     float: left;
 	/* background:url("~@/img/hm_shengyin_sel.png"); */
 	background-size: 100% 100%;
@@ -179,8 +179,8 @@
 	bottom: -8px;
 	right: 30px;
 	border: 0;
-	width: 48px;
-    height: 48px;
+	width: 3rem;
+    height: 3rem;
     float: left;
 	/* background-image: url("~@/img/hm_jingyin_sel.png"); */
     background-size: 100% 100%;
@@ -192,8 +192,8 @@
 	bottom: 5px;
 	right: 5px;
 	border: 0;
-	width: 20px;
-    height: 20px;
+	width: 1.25rem;
+    height: 1.25rem;
     float: left;
 	/* background-image: url("~@/img/close.png"); */
     background-size: 100% 100%;

package/src/scooper.video.js

@@ -2074,39 +2074,47 @@
 						let liHeight = li.offsetHeight;
 						if(rotateIndex == 0){  //0
 							$(video).attr('class', 'video-box');
-							$(video).css('height', '');
+							$(video).css('height', 'auto');
 							$(video).css('width', 'auto');
-							video.style.position = 'static';
-							video.style.transform = 'none';
-							$(video).css('left', '');
-							$(video).css('top', '');
+							$(video).css('max-height', '100%');
+							$(video).css('max-width', '100%');
+							video.style.position = 'absolute';
+							$(video).css('left', '50%');
+							$(video).css('top', '50%');
+							video.style.transform = 'translate(-50%, -50%)';
 						}else if(rotateIndex == 3){ //3
 							$(video).attr('class', 'video-box');
 							video.style.position = 'absolute';
 							video.style.transform = 'rotate(270deg)';
+							$(video).css('max-height', '');
+							$(video).css('max-width', '');
 							if(videoWidth / videoHeight > liWidth / liHeight){ //视频横向留白
+								$(video).css('width', 'auto');
+								$(video).css('height', liWidth);
+								$(video).css('left', 'calc(' + liHeight + 'px / 2' + ' - ' + liWidth + 'px / 2)');
+								$(video).css('top', 'calc(-' + liWidth / 2 + ' / ' + vHeight + ' * ' +  vWidth + 'px + ' + liWidth + 'px / 2)');
+							}else { //视频纵向留白
 								$(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)');
-							}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(' + liWidth + 'px / 2' + ' - ' + liHeight + 'px / 2)');
+								$(video).css('top', 'calc(-' + liHeight / 2 + ' / ' + vWidth + ' * ' +  vHeight + 'px + ' + liHeight + 'px / 2)');
 							}
 						}else if(rotateIndex == 2){ //2
 							$(video).attr('class', 'video-box');
-							$(video).css('height', '');
+							$(video).css('height', 'auto');
 							$(video).css('width', 'auto');
-							video.style.position = 'static';
-							video.style.transform = 'rotate(180deg)';
-							$(video).css('left', '');
-							$(video).css('top', '');
+							$(video).css('max-height', '100%');
+							$(video).css('max-width', '100%');
+							video.style.position = 'absolute';
+							$(video).css('left', '50%');
+							$(video).css('top', '50%');
+							video.style.transform = 'translate(-50%, -50%) rotate(180deg)';
 						}else if(rotateIndex == 1){ //1
 							$(video).attr('class', 'video-box');
 							video.style.position = 'absolute';
 							video.style.transform = 'rotate(90deg)';
+							$(video).css('max-height', '');
+							$(video).css('max-width', '');
 							if(videoWidth / videoHeight > liWidth / liHeight){ //视频横向留白
 								$(video).css('width', 'auto');
 								$(video).css('height', liWidth);
@@ -2205,7 +2213,8 @@
 						videoFlagObj.find('button[name=rotateVideo]').click(function(){
 							let rotateIndex = Number($(this).attr("rotate-index"));
 							rotateIndex++
-							$(this).attr("rotate-index", rotateIndex % 4);
+							rotateIndex %= 4
+							$(this).attr("rotate-index", rotateIndex);
 							let li = $(this).parent().parent()[0];
 							me.videoRotateSize(li, rotateIndex)
 						})
@@ -2438,7 +2447,7 @@
 							'<div class="info hide" id="info-' + i +'"></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"></button><button type="button" class="unsend-audio-btn hide" name="sendAudio"></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>');
 							videoHtml += '<button type="button" class="unrecv-audio-btn hide" name="recvAudio"></button>' +
 							'<button type="button" class="close-btn hide" name="closeVideo"></button>' +
 							'</div>' +