ucservice 1.6.4 → 1.6.7

package/dist/ucservice.common.js

@@ -12248,6 +12248,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
      * 在鼠标选中的窗口中播放视频
      */
     playInChoice: function (video, id, opts) {
+      console.log("==调用playInChoice播放===");
+
       let index = this._obj.SCWebGetCurrentWindowIndex();
 
       this.videoStatus[index] && this.close(index);
@@ -14014,6 +14016,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         ev.preventDefault();
       });
       $(me.selector + ' li').bind("drop", function (ev) {
+        //拖拽交换位置后，更改index，更改相应的video_data数组中对应的对象索引位置
         console.log(ev);
         ev.preventDefault();
 
@@ -14024,6 +14027,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         let target = $(this);
         let srcIndex = src.index();
         let targetIndex = target.index();
+        target.removeClass('screen-' + (targetIndex + 1)).addClass('screen-' + (srcIndex + 1));
+        src.removeClass('screen-' + (srcIndex + 1)).addClass('screen-' + (targetIndex + 1));
+        target.attr('index', srcIndex);
+        src.attr('index', targetIndex);
+        let videoData = me.VIDEO_DATA;
 
         if (srcIndex > targetIndex) {
           src.insertBefore(target);
@@ -14033,7 +14041,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           target.insertBefore($(me.selector + ' .video-main li.screen').eq(srcIndex));
         }
 
-        let videoData = me.VIDEO_DATA;
+        let targetVideo = videoData[targetIndex];
+        let srcVideo = videoData.splice(srcIndex, 1, targetVideo);
+        videoData.splice(targetIndex, 1, ...srcVideo);
       });
     },
 
@@ -14442,7 +14452,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
         for (let i = 0; i < me.VIDEO_DATA.length; i++) {
           if (me.VIDEO_DATA[i].playing) {
-            let number = Number(i) + Number(1); //获取视频video标签
+            let number = Number(me.VIDEO_DATA[i].index) + Number(1); //获取视频video标签
 
             let $videoList = $(me.selector + " .video-main #video-" + number);
 
@@ -15521,8 +15531,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
       self.tagBox.bind("canplay play playing", function () {
         if (self.video) {
-          // if (self.tagBox.is(':visible')) return;
-          // 清除播放监测定时任务，清除内容
+          if (self.tagBox.is(':visible')) return; // 清除播放监测定时任务，清除内容
+
           self.playSucTimeOutIndex > 0 && clearTimeout(self.playSucTimeOutIndex);
           self.tagBox.parent().find(".video-tip").remove();
           console.log('分屏=' + (self.index + 1) + ', ' + self.video + ' 播放成功');