ucservice 1.6.2 → 1.6.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ucservice",
   "private": false,
-  "version": "1.6.2",
+  "version": "1.6.5",
   "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);
@@ -1332,7 +1333,10 @@
 						entries.forEach((item, index) =>{ 
 							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
 									if (!tel&&item.id) {
@@ -1362,7 +1366,10 @@
 							entries.forEach((item, index) =>{ 
 								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
 										if (!tel&&item.id) {
@@ -1664,7 +1671,7 @@
 					//设置旋转了的视频样式
 					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) => {
@@ -2121,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")){
@@ -2129,7 +2137,12 @@
 							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);
 									target.insertAfter($(me.selector +' .video-main li.screen').eq(srcIndex));
@@ -2137,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, targetIndex)
+							videoData.splice(targetIndex, 1, ...srcVideo)
 					})
 					},