ucservice 1.7.5 → 1.7.8

package/dist/ucservice.common.js

@@ -13444,11 +13444,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       }
 
       this.VIDEO_DATA[index].close();
-      let video = $(this.selector + ' li ')[index].find('video');
+      let video = $(this.selector + ' li ').eq(index).find('video');
 
       if (video.hasClass('scale-scene')) {
         video.removeClass('scale-scene');
         video.parent().find('.scale-btn').addClass('bggray');
+        video.parent().find('.scale-btn').attr('title', '视频画面铺满');
       }
 
       if (!isSave) {
@@ -13575,12 +13576,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
       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){
+        let rotateIndex = _li.eq(k).find('button[name=rotateVideo]').attr('rotate-index');
 
+        let scaleBtn = _li.eq(k).find('button[name=scaleVideo]').hasClass('bggray');
 
-        setTimeout(() => {
-          me.videoRotateSize(_li.eq(k)[0], rotateIndex);
-        }, 200); // }
+        if (scaleBtn) {
+          setTimeout(() => {
+            me.videoRotateSize(_li.eq(k)[0], rotateIndex);
+          }, 200);
+        }
       }
     },
 
@@ -14037,8 +14041,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         src.removeClass('screen-' + (srcIndex + 1)).addClass('screen-' + (targetIndex + 1));
         target.attr('index', srcIndex);
         src.attr('index', targetIndex);
-        src.children('#frame-decoded-' + (srcIndex + 1)).attr('id', '#frame-decoded-' + (targetIndex + 1));
-        target.children('#frame-decoded-' + (targetIndex + 1)).attr('id', '#frame-decoded-' + (srcIndex + 1));
+        src.children('#frame-decoded-' + (srcIndex + 1)).attr('id', 'frame-decoded-' + (targetIndex + 1));
+        target.children('#frame-decoded-' + (targetIndex + 1)).attr('id', 'frame-decoded-' + (srcIndex + 1));
         let videoData = me.VIDEO_DATA;
 
         if (srcIndex > targetIndex) {
@@ -14292,7 +14296,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       });
       videoFlagObj.find('button[name=scaleVideo]').click(function () {
         let isgray = $(this).hasClass('bggray');
-        if (isgray) $(this).parent().parent().find('.video-box').addClass('scale-scene');else $(this).parent().parent().find('.video-box').removeClass('scale-scene');
+
+        if (isgray) {
+          $(this).parent().parent().find('.video-box').addClass('scale-scene');
+          $(this).attr('title', '原视频分辨率展示');
+        } else {
+          $(this).parent().parent().find('.video-box').removeClass('scale-scene');
+          $(this).attr('title', '视频画面铺满');
+        }
+
         $(this).toggleClass("bggray"); //jquery方式阻止默认事件 & 冒泡事件
 
         return false;