ucservice 2.5.0 → 2.5.1

package/dist/ucservice.common.js

@@ -14178,6 +14178,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       let vHeight = video.offsetHeight;
       let liWidth = li.offsetWidth;
       let liHeight = li.offsetHeight;
+      let isScale = video.classList.contains('scale-scene');
 
       if (rotateIndex == 0) {
         //0
@@ -14191,6 +14192,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         $(video).css('top', '50%');
         if (videoWidth / videoHeight < liWidth / liHeight) $(video).css('height', '100%');else $(video).css('width', '100%');
         video.style.transform = 'translate(-50%, -50%)';
+
+        if (isScale) {
+          $(video).css('height', '100%');
+          $(video).css('width', '100%');
+        }
       } else if (rotateIndex == 3) {
         //3
         // $(video).attr('class', 'video-box');
@@ -14212,6 +14218,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           $(video).css('left', 'calc(-' + videoWidth * liWidth / videoHeight / 2 + 'px + ' + liWidth + 'px / 2)');
           $(video).css('top', 'calc(' + liHeight + 'px / 2' + ' - ' + liWidth + 'px / 2)');
         }
+
+        if (isScale) {
+          $(video).css('height', liWidth);
+          $(video).css('width', liHeight);
+        }
       } else if (rotateIndex == 2) {
         //2
         // $(video).attr('class', 'video-box');
@@ -14224,6 +14235,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         $(video).css('top', '50%');
         if (videoWidth / videoHeight < liWidth / liHeight) $(video).css('height', '100%');else $(video).css('width', '100%');
         video.style.transform = 'translate(-50%, -50%) rotate(180deg)';
+
+        if (isScale) {
+          $(video).css('height', '100%');
+          $(video).css('width', '100%');
+        }
       } else if (rotateIndex == 1) {
         //1
         // $(video).attr('class', 'video-box');
@@ -14245,6 +14261,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           $(video).css('left', 'calc(-' + videoWidth * liWidth / videoHeight / 2 + 'px + ' + liWidth + 'px / 2)');
           $(video).css('top', 'calc(' + liHeight + 'px / 2' + ' - ' + liWidth + 'px / 2)');
         }
+
+        if (isScale) {
+          $(video).css('height', liWidth);
+          $(video).css('width', liHeight);
+        }
       }
     },
 
@@ -14323,6 +14344,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           $(this).attr('title', '视频画面铺满');
         }
 
+        this.videoRotateSize($(this).parent().parent(), $(this).parent().find('button[name=rotateVideo]').attr('rotate-index'));
         $(this).toggleClass("bggray"); //jquery方式阻止默认事件 & 冒泡事件
 
         return false;
@@ -14336,9 +14358,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         } else {
           $(this).attr('class', 'fullscreen-btn');
           $(this).attr('title', '全屏');
-        } //jquery方式阻止默认事件 & 冒泡事件
-        // return false;
+        }
 
+        this.videoRotateSize($(this).parent().parent(), $(this).parent().find('button[name=rotateVideo]').attr('rotate-index')); //jquery方式阻止默认事件 & 冒泡事件
+        // return false;
       }); //接收音频事件
 
       videoFlagObj.find("button[name='recvAudio']").click(function () {