ucservice 1.6.4 → 1.6.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ucservice",
   "private": false,
-  "version": "1.6.4",
+  "version": "1.6.7",
   "description": "统一通信服务",
   "main": "dist/ucservice.common.js",
   "style": "ucservice.css",

package/src/scooper.video.js

@@ -425,6 +425,7 @@
 					 * 在鼠标选中的窗口中播放视频
 					 */
 					playInChoice: function(video,id,opts){
+						console.log("==调用playInChoice播放===")
 							let index = this._obj.SCWebGetCurrentWindowIndex();
 							this.videoStatus[index] && this.close(index);
 							return this.play(index,video,id,opts);
@@ -2127,6 +2128,7 @@
 					})
 
 					$(me.selector + ' li').bind("drop", function (ev) {
+							//拖拽交换位置后，更改index，更改相应的video_data数组中对应的对象索引位置
 							console.log(ev)
 							ev.preventDefault();
 							if(src.prop("outerHTML") === $(this).prop("outerHTML")){
@@ -2135,7 +2137,12 @@
 							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);
 									target.insertAfter($(me.selector +' .video-main li.screen').eq(srcIndex));
@@ -2143,7 +2150,9 @@
 									src.insertAfter(target);
 									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)
 					})
 					},
 					
@@ -2518,7 +2527,7 @@
 								if(!me.VIDEO_DATA || !me.VIDEO_DATA.length) return;
 									for (let i = 0; i < me.VIDEO_DATA.length; i++) {
 										if (me.VIDEO_DATA[i].playing) {
-											let number = Number(i) + Number(1);
+											let number = Number(me.VIDEO_DATA[i].index) + Number(1);
 											//获取视频video标签
                       let $videoList = $(me.selector + " .video-main #video-" + number);
                           if(!$videoList.length) {
@@ -3507,7 +3516,7 @@
 						//<video>注册playing/canplay事件，用于判断视频播放成功
 						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();