ucservice 1.4.1 → 1.4.4

package/dist/ucservice.common.js

@@ -13951,45 +13951,53 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       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', 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('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('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('width', liHeight);
+          $(video).css('height', 'auto');
+          $(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) {
           //视频横向留白
@@ -14088,7 +14096,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       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);
       }); //接收音频事件
@@ -14327,7 +14336,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       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>' + '<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>' + '</li>';
       }