ucservice 1.7.6 → 1.7.9

package/dist/ucservice.common.js

@@ -13449,6 +13449,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       if (video.hasClass('scale-scene')) {
         video.removeClass('scale-scene');
         video.parent().find('.scale-btn').addClass('bggray');
+        video.parent().find('.scale-btn').attr('title', '视频画面铺满');
       }
 
       if (!isSave) {
@@ -13575,12 +13576,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
       for (let k = 0; k < _li.length; k++) {
-        let rotateIndex = _li.eq(k).find('button[name=rotateVideo]').attr('rotate-index'); // if(rotateIndex != 0 && rotateIndex != 2){
+        let rotateIndex = _li.eq(k).find('button[name=rotateVideo]').attr('rotate-index');
 
+        let scaleBtn = _li.eq(k).find('button[name=scaleVideo]').hasClass('bggray');
 
-        setTimeout(() => {
-          me.videoRotateSize(_li.eq(k)[0], rotateIndex);
-        }, 200); // }
+        if (scaleBtn) {
+          setTimeout(() => {
+            me.videoRotateSize(_li.eq(k)[0], rotateIndex);
+          }, 200);
+        }
       }
     },
 
@@ -14037,8 +14041,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         src.removeClass('screen-' + (srcIndex + 1)).addClass('screen-' + (targetIndex + 1));
         target.attr('index', srcIndex);
         src.attr('index', targetIndex);
-        src.children('#frame-decoded-' + (srcIndex + 1)).attr('id', '#frame-decoded-' + (targetIndex + 1));
-        target.children('#frame-decoded-' + (targetIndex + 1)).attr('id', '#frame-decoded-' + (srcIndex + 1));
+        src.children('#frame-decoded-' + (srcIndex + 1)).attr('id', 'frame-decoded-' + (targetIndex + 1));
+        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 (srcIndex > targetIndex) {
@@ -14292,7 +14298,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       });
       videoFlagObj.find('button[name=scaleVideo]').click(function () {
         let isgray = $(this).hasClass('bggray');
-        if (isgray) $(this).parent().parent().find('.video-box').addClass('scale-scene');else $(this).parent().parent().find('.video-box').removeClass('scale-scene');
+
+        if (isgray) {
+          $(this).parent().parent().find('.video-box').addClass('scale-scene');
+          $(this).attr('title', '原视频分辨率展示');
+        } else {
+          $(this).parent().parent().find('.video-box').removeClass('scale-scene');
+          $(this).attr('title', '视频画面铺满');
+        }
+
         $(this).toggleClass("bggray"); //jquery方式阻止默认事件 & 冒泡事件
 
         return false;
@@ -14764,7 +14778,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       let index = me._opts.windowsBeginIndex + 1;
 
       for (let i = index; i < index + me._opts.windowsNum; i++) {
-        videoHtml += '<li class="screen screen-' + i + '" index="' + (i - 1) + '" draggable="true"><video muted class="video-box" id="video-' + i + '" autoplay ></video>' + '<div class="hide info ' + position + '" id="info-' + i + '"></div>' + '<div class="hide frame-decoded" id="frame-decoded-' + i + '"style="position:absolute;float:left;color:#fff;width:67%;z-index:1;top:135px;left:180px">网络信号不佳</div>' + '<div class="operate-btn">'; //videoHtml +='<button type="button" class="unlock-video-btn hide" name="lockVideo"></button>';
+        videoHtml += '<li class="screen screen-' + i + '" index="' + (i - 1) + '" draggable="true"><video muted class="video-box" id="video-' + i + '" autoplay ></video>' + '<div class="hide info ' + position + '" id="info-' + i + '"></div><div class="hide info-self info-top" id="info-self-' + i + '"></div>' + '<div class="hide frame-decoded" id="frame-decoded-' + i + '"style="position:absolute;float:left;color:#fff;width:67%;z-index:1;top:135px;left:180px">网络信号不佳</div>' + '<div class="operate-btn">'; //videoHtml +='<button type="button" class="unlock-video-btn hide" name="lockVideo"></button>';
         // checkUserMediaAvailable() && 
 
         videoHtml += '<button type="button" class="scale-btn bggray hide" name="scaleVideo" title="视频画面铺满"></button><button type="button" class="rotate-btn hide" name="rotateVideo" rotate-index="0" title="视频旋转"></button><button type="button" class="unsend-audio-btn hide" name="sendAudio"></button>';
@@ -15556,7 +15570,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
           self.tagBox.parent().find(".stream-loading").remove(); //显示视频信息
 
-          self.tagBox.parent().find('.info').show(); //显示音频按钮
+          self.tagBox.parent().find('.info').show();
+          self.tagBox.parent().find('.info-self').show(); //显示音频按钮
 
           self.tagBox.parent().find('.operate-btn button').show();
 
@@ -15651,7 +15666,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
       if (document.getElementById('info-' + (Number(this.index) + Number(1)))) document.getElementById('info-' + (Number(this.index) + Number(1))).innerHTML = ''; //隐藏视频信息
 
-      this.tagBox.parent().find('.info').hide(); //隐藏音频喇叭
+      this.tagBox.parent().find('.info').hide();
+      if (document.getElementById('info-self-' + (Number(this.index) + Number(1)))) document.getElementById('info-self-' + (Number(this.index) + Number(1))).innerHTML = ''; //隐藏视频信息
+
+      this.tagBox.parent().find('.info-self').hide(); //隐藏音频喇叭
 
       this.tagBox.parent().find('.operate-btn button').hide(); //避免没收到成功时就点击关闭，清除loading框
 
@@ -15812,7 +15830,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         self.packetsReceivedSum = 0;
         self.isPlayBack = false; //清除显示的视频信息
 
-        document.getElementById('info-' + (Number(self.index) + Number(1))).innerHTML = ''; //隐藏音频喇叭
+        document.getElementById('info-' + (Number(self.index) + Number(1))).innerHTML = '';
+        document.getElementById('info-self-' + (Number(self.index) + Number(1))).innerHTML = ''; //隐藏音频喇叭
 
         this.tagBox.parent().find('.operate-btn button').hide(); //避免没收到成功时就点击关闭，清除loading框
 
@@ -29561,6 +29580,52 @@ let meet = {
       data: {}
     }
   },
+  MeetPrivateTalkNet: {
+    //会场成员单独通话
+
+    /***会场成员单独通话 坐席号码与会场成员单独通话，坐席号码与会场成员单独通话后可通过回到会场方法，让会场成员回到会场
+    **/
+    url: '/dispatch-web/api/meet/privateTalk',
+    method: 'POST',
+    requestParam: {
+      token: '',
+      meetId: '',
+      //会场id
+      tel: '' //成员号码
+
+    },
+    responseParam: {
+      code: '',
+      //返回结果状态码
+      message: '',
+      systemTime: '',
+      //yyyy-MM-dd HH:mm:ss
+      data: {}
+    }
+  },
+  MeetBackToNet: {
+    //回到会场
+
+    /***回到会场，坐席号码与会场成员单独通话后执行该方法可让该成员回到会场
+    **/
+    url: '/dispatch-web/api/meet/backToMeet',
+    method: 'POST',
+    requestParam: {
+      token: '',
+      meetId: '',
+      //会场id
+      tel: '' //成员号码
+
+    },
+    responseParam: {
+      code: '',
+      //返回结果状态码
+      message: '',
+      systemTime: '',
+      //yyyy-MM-dd HH:mm:ss
+      data: {}
+    }
+  },
   endMeetNet: {
     //结束会议
 
@@ -32323,6 +32388,34 @@ const meetOp = sip => {
         }, '', net.method);
       });
     },
+    privateTalk: function (param) {
+      let net = meet_url.MeetPrivateTalkNet;
+      return new Promise((resolve, reject) => {
+        loadJson(server_ + net.url, { ...param
+        }, function (ret) {
+          if (ret.code == 0) {
+            resolve(ret);
+          } else {
+            console.log("设置会场成员单独通话失败", ret.code);
+            reject(ret.code);
+          }
+        }, '', net.method);
+      });
+    },
+    back: function (param) {
+      let net = meet_url.MeetBackToNet;
+      return new Promise((resolve, reject) => {
+        loadJson(server_ + net.url, { ...param
+        }, function (ret) {
+          if (ret.code == 0) {
+            resolve(ret);
+          } else {
+            console.log("会场成员单独通话后回到会场失败", ret.code);
+            reject(ret.code);
+          }
+        }, '', net.method);
+      });
+    },
     end: function (param) {
       let net = meet_url.endMeetNet;
       return new Promise((resolve, reject) => {