ucservice 1.7.8 → 1.8.1

package/dist/ucservice.css

@@ -1 +1 @@
-.video-main{position:absolute;top:0;left:-25px;right:-12px;bottom:-18px}.video-main-full{position:absolute;top:1px;left:1px;right:1px;bottom:1px}.video-main-full>li,.video-main>li{border:1px solid #aaa;float:left;position:relative}.video-main-full>li.loading,.video-main>li.loading{background:#000}.video-main-full>li:hover,.video-main>li:hover{border:1px solid #ffb951}.video-main-full>li.sel,.video-main>li.sel{border:1px solid #ef8601}.video-main-full.mode-1>li,.video-main.mode-1>li{width:98.5%;height:98.5%;list-style:none}.video-main-full.mode-1>li .info,.video-main.mode-1>li .info{font-size:20px;bottom:40px}.video-main.mode-4>li{width:49%;height:49%;list-style:none}.video-main.mode-4>li .info{font-size:18px;bottom:20px}.video-main.mode-6>li{width:33.33%;height:33.33%}.video-main.mode-6>li .info{font-size:14px;bottom:13px}.video-main.mode-6 .screen-1{width:66.66%;height:66.65%}.video-main.mode-6 .screen-1 .info{font-size:18px;bottom:30px}.video-main.mode-9>li{width:32.5%;height:32.5%;list-style:none}.video-main.mode-9>li .info{font-size:12px;bottom:14px}.video-main.mode-16>li{width:24.5%;height:24.5%;list-style:none}.video-main.mode-16>li .info{font-size:8px;bottom:10px}.video-box{-o-object-fit:fill;object-fit:fill;display:none;width:100%;height:100%}.video-main .video-box.scale-scene{width:100%!important;height:100%!important;-o-object-fit:fill!important;object-fit:fill!important}.video-main.mode-4 .close-btn{width:1.1rem;height:1.1rem}.video-main.mode-9 .close-btn{width:.95rem;height:.95rem}.video-main.mode-16 .close-btn{width:.85rem;height:.85rem}.video-main.mode-4 .recv-audio-btn{bottom:-4px;right:1.8rem;width:2.5rem;height:2.5rem}.video-main.mode-9 .recv-audio-btn{bottom:-3px;right:1.6rem;width:2.2rem;height:2.2rem}.video-main.mode-16 .recv-audio-btn{bottom:-2px;right:1.4rem;width:2rem;height:2rem}.video-main.mode-4 .unrecv-audio-btn{bottom:-4px;right:1.8rem;width:2.5rem;height:2.5rem}.video-main.mode-9 .unrecv-audio-btn{bottom:-3px;right:1.6rem;width:2.2rem;height:2.2rem}.video-main.mode-16 .unrecv-audio-btn{bottom:-2px;right:1.4rem;width:2rem;height:2rem}.video-main.mode-4 .rotate-btn{bottom:3px;right:4.8rem;width:1.5rem;height:1.5rem}.video-main.mode-9 .rotate-btn{bottom:3px;right:4.2rem;width:1.42rem;height:1.42rem}.video-main.mode-16 .rotate-btn{bottom:3px;right:3.7rem;width:1.3rem;height:1.3rem}.video-main.mode-4 .scale-btn{bottom:7px;right:7.5rem;width:1rem;height:1rem}.video-main.mode-9 .scale-btn{bottom:6px;right:7rem;width:.9rem;height:.9rem}.video-main.mode-16 .scale-btn{bottom:7px;right:6rem;width:.8rem;height:.8rem}.video-main.mode-9 .stream-loading{width:11.4rem;height:2.1rem;line-height:2.1rem;font-size:15px;background-size:15px}.video-main.mode-16 .stream-loading{width:9.3rem;height:2.1rem;line-height:2.1rem;font-size:14px;background-size:14px;margin-left:5.7rem}.video-main.mode-16 .real-result,.video-main.mode-16 .result{font-size:12px}.stream-loading{width:14rem;height:2.1rem;line-height:2.1rem;position:absolute;top:50%;left:50%;margin-top:-1rem;margin-left:-7.1rem;color:#fff;font-size:1.14rem;padding-left:2.1rem}.info{color:#fff;left:10px;width:67%}.info,.operate-btn{position:absolute;float:left;z-index:1}.operate-btn{width:1.5rem;height:1.5rem;right:1px;bottom:2px;cursor:pointer}.send-audio-btn,.unsend-audio-btn{bottom:-8px;right:70px;width:3rem;height:3rem}.rotate-btn,.send-audio-btn,.unsend-audio-btn{position:absolute;border:0;float:left;background-size:100% 100%;background-color:transparent}.rotate-btn{bottom:1px;right:6.07rem;width:1.75rem;height:1.75rem}.rotate-btn.bggray,.scale-btn.bggray{filter:contrast(.5)}.scale-btn{position:absolute;bottom:5px;right:9.5rem;border:0;width:1.25rem;height:1.25rem;float:left;background-size:100% 100%;background-color:transparent}.recv-audio-btn,.unrecv-audio-btn{bottom:-8px;right:30px;width:3rem;height:3rem}.close-btn,.recv-audio-btn,.unrecv-audio-btn{position:absolute;border:0;float:left;background-size:100% 100%;background-color:transparent}.close-btn{bottom:5px;right:5px;width:1.25rem;height:1.25rem}.operation{position:absolute;width:100%;height:12%;bottom:0;background:rgba(0,0,0,.3);color:#fff}.hide{display:none}
+.video-main{position:absolute;top:0;left:-25px;right:-12px;bottom:-18px}.video-main-full{position:absolute;top:1px;left:1px;right:1px;bottom:1px}.video-main-full>li,.video-main>li{border:1px solid #aaa;float:left;position:relative}.video-main-full>li.loading,.video-main>li.loading{background:#000}.video-main-full>li:hover,.video-main>li:hover{border:1px solid #ffb951}.video-main-full>li.sel,.video-main>li.sel{border:1px solid #ef8601}.video-main-full.mode-1>li,.video-main.mode-1>li{width:98.5%;height:98.5%;list-style:none}.video-main-full.mode-1>li .info,.video-main.mode-1>li .info{font-size:20px;bottom:40px}.video-main>li .info-self{position:absolute;left:3.2rem;top:.26rem;font-size:1rem;z-index:9}.video-main.mode-4>li{width:49%;height:49%;list-style:none}.video-main.mode-4>li .info{font-size:18px;bottom:20px}.video-main.mode-6>li{width:33.33%;height:33.33%}.video-main.mode-6>li .info{font-size:14px;bottom:13px}.video-main.mode-6 .screen-1{width:66.66%;height:66.65%}.video-main.mode-6 .screen-1 .info{font-size:18px;bottom:30px}.video-main.mode-9>li{width:32.5%;height:32.5%;list-style:none}.video-main.mode-9>li .info{font-size:12px;bottom:14px}.video-main.mode-16>li{width:24.5%;height:24.5%;list-style:none}.video-main.mode-16>li .info{font-size:8px;bottom:10px}.video-box{-o-object-fit:fill;object-fit:fill;display:none;width:100%;height:100%}.video-main .video-box.scale-scene{width:100%!important;height:100%!important;-o-object-fit:fill!important;object-fit:fill!important}.video-main.mode-4 .close-btn{width:1.1rem;height:1.1rem}.video-main.mode-9 .close-btn{width:.95rem;height:.95rem}.video-main.mode-16 .close-btn{width:.85rem;height:.85rem}.video-main.mode-4 .recv-audio-btn{bottom:-4px;right:1.8rem;width:2.5rem;height:2.5rem}.video-main.mode-9 .recv-audio-btn{bottom:-3px;right:1.6rem;width:2.2rem;height:2.2rem}.video-main.mode-16 .recv-audio-btn{bottom:-2px;right:1.4rem;width:2rem;height:2rem}.video-main.mode-4 .unrecv-audio-btn{bottom:-4px;right:1.8rem;width:2.5rem;height:2.5rem}.video-main.mode-9 .unrecv-audio-btn{bottom:-3px;right:1.6rem;width:2.2rem;height:2.2rem}.video-main.mode-16 .unrecv-audio-btn{bottom:-2px;right:1.4rem;width:2rem;height:2rem}.video-main.mode-4 .rotate-btn{bottom:3px;right:4.8rem;width:1.5rem;height:1.5rem}.video-main.mode-9 .rotate-btn{bottom:3px;right:4.2rem;width:1.42rem;height:1.42rem}.video-main.mode-16 .rotate-btn{bottom:3px;right:3.7rem;width:1.3rem;height:1.3rem}.video-main.mode-4 .scale-btn{bottom:7px;right:7.5rem;width:1rem;height:1rem}.video-main.mode-9 .scale-btn{bottom:6px;right:7rem;width:.9rem;height:.9rem}.video-main.mode-16 .scale-btn{bottom:7px;right:6rem;width:.8rem;height:.8rem}.video-main.mode-9 .stream-loading{width:11.4rem;height:2.1rem;line-height:2.1rem;font-size:15px;background-size:15px}.video-main.mode-16 .stream-loading{width:9.3rem;height:2.1rem;line-height:2.1rem;font-size:14px;background-size:14px;margin-left:5.7rem}.video-main.mode-16 .real-result,.video-main.mode-16 .result{font-size:12px}.stream-loading{width:14rem;height:2.1rem;line-height:2.1rem;position:absolute;top:50%;left:50%;margin-top:-1rem;margin-left:-7.1rem;color:#fff;font-size:1.14rem;padding-left:2.1rem}.info{color:#fff;left:10px;width:67%}.info,.operate-btn{position:absolute;float:left;z-index:1}.operate-btn{width:1.5rem;height:1.5rem;right:1px;bottom:2px;cursor:pointer}.send-audio-btn,.unsend-audio-btn{bottom:-8px;right:70px;width:3rem;height:3rem}.rotate-btn,.send-audio-btn,.unsend-audio-btn{position:absolute;border:0;float:left;background-size:100% 100%;background-color:transparent}.rotate-btn{bottom:1px;right:6.07rem;width:1.75rem;height:1.75rem}.rotate-btn.bggray,.scale-btn.bggray{filter:contrast(.5)}.scale-btn{position:absolute;bottom:5px;right:9.5rem;border:0;width:1.25rem;height:1.25rem;float:left;background-size:100% 100%;background-color:transparent}.recv-audio-btn,.unrecv-audio-btn{bottom:-8px;right:30px;width:3rem;height:3rem}.close-btn,.recv-audio-btn,.unrecv-audio-btn{position:absolute;border:0;float:left;background-size:100% 100%;background-color:transparent}.close-btn{bottom:5px;right:5px;width:1.25rem;height:1.25rem}.operation{position:absolute;width:100%;height:12%;bottom:0;background:rgba(0,0,0,.3);color:#fff}.hide{display:none}

package/dist/ucservice.umd.js

@@ -14052,6 +14052,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         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('#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) {
@@ -14785,7 +14787,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>';
@@ -15577,7 +15579,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();
 
@@ -15672,7 +15675,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框
 
@@ -15833,7 +15839,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框
 
@@ -29582,6 +29589,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: {
     //结束会议
 
@@ -32344,6 +32397,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) => {