ucservice 1.6.2 → 1.6.5

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);
@@ -13194,7 +13196,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
             let target = item.target;
 
             if (document.querySelector(_self.selector)) {
-              let videoLi = document.querySelector(_self.selector).querySelectorAll('li');
+              let videoLi = {};
+              Array.prototype.slice.call(document.querySelector(_self.selector).querySelectorAll('li'), 0).forEach(liItem => {
+                videoLi[$(liItem).attr('index')] = liItem;
+              });
 
               _self.VIDEO_DATA.forEach((item, index) => {
                 let tel = item.video;
@@ -13228,7 +13233,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
               let target = item.target;
 
               if (document.querySelector(_self.selector)) {
-                let videoLi = document.querySelector(_self.selector).querySelectorAll('li');
+                let videoLi = {};
+                Array.prototype.slice.call(document.querySelector(_self.selector).querySelectorAll('li'), 0).forEach(liItem => {
+                  videoLi[$(liItem).attr('index')] = liItem;
+                });
 
                 _self.VIDEO_DATA.forEach((item, index) => {
                   let tel = item.video;
@@ -13544,7 +13552,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
       if (document.querySelector(me.selector)) {
         let videoLi = {};
-        Array.prototype.slice.call(document.getElementById('videoRef').querySelectorAll('li'), 0).forEach(liItem => {
+        Array.prototype.slice.call(document.querySelector(me.selector).querySelectorAll('li'), 0).forEach(liItem => {
           videoLi[$(liItem).attr('index')] = liItem;
         });
         me.VIDEO_DATA.forEach((item, index) => {
@@ -14008,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();
 
@@ -14018,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).addClass('screen-' + srcIndex);
+        src.removeClass('screen-' + srcIndex).addClass('screen-' + targetIndex);
+        target.attr('index', srcIndex);
+        src.attr('index', targetIndex);
+        let videoData = me.VIDEO_DATA;
 
         if (srcIndex > targetIndex) {
           src.insertBefore(target);
@@ -14027,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, targetIndex);
+        videoData.splice(targetIndex, 1, ...srcVideo);
       });
     },