ucservice 2.2.5 → 2.2.7

package/dist/ucservice.common.js

@@ -14034,6 +14034,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         //拖拽交换位置后，更改index，更改相应的video_data数组中对应的对象索引位置
         console.log(ev);
         ev.preventDefault();
+        let videoData = me.VIDEO_DATA;
 
         if (src.prop("outerHTML") === $(this).prop("outerHTML")) {
           return;
@@ -14041,7 +14042,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
         let target = $(this);
         let srcIndex = src.index();
-        let targetIndex = target.index();
+        let targetIndex = target.index(); // if(target.hasClass('main-screen'))
+
         target.removeClass('screen-' + (targetIndex + 1)).addClass('screen-' + (srcIndex + 1));
         src.removeClass('screen-' + (srcIndex + 1)).addClass('screen-' + (targetIndex + 1));
         target.attr('index', srcIndex);
@@ -14050,7 +14052,16 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         target.children('#frame-decoded-' + (targetIndex + 1)).attr('id', 'frame-decoded-' + (srcIndex + 1));
         src.children('#info-self' + (srcIndex + 1)).attr('id', 'info-self-' + (targetIndex + 1));
         target.children('#info-self-' + (targetIndex + 1)).attr('id', 'info-self-' + (srcIndex + 1));
-        let videoData = me.VIDEO_DATA;
+
+        if (target.hasClass('main-screen')) {
+          target.removeClass('main-screen');
+          src.addClass('main-screen');
+        }
+
+        if (src.hasClass('main-screen')) {
+          src.removeClass('main-screen');
+          target.addClass('main-screen');
+        }
 
         if (srcIndex > targetIndex) {
           src.insertBefore(target);
@@ -15375,7 +15386,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
             if (!CONST_CODE.STATUS_CODE_ARR.includes(result.error_code + '')) {
               //videoListener.dispatch('afterclose', self); 
               //播放失败 关闭视频
-              if (result.error_code + '' != '4001') self.close('err');
+              self.close('err', result.error_code + '');
 
               if (self.isLockVideo) {
                 setTimeout(function () {
@@ -15684,7 +15695,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
       console.log("视频播放：分屏=" + (this.index + 1) + ",设备ID=" + video);
     },
-    close: function (type) {
+    close: function (type, code) {
       if (!type) {
         this.isLockVideo = false;
         this.tagBox.parent().find('.lock-video-btn').attr("class", "unlock-video-btn");
@@ -15704,7 +15715,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         "message": _hangup
       });
       this.sipcall.hangup();
-      this.tagBox.hide();
+      code != '4001' && this.tagBox.hide();
       this.isClosing = true;
       this.playing = false;
       this.video = null;