ucservice 1.1.8 → 1.2.2

package/dist/ucservice.common.js

@@ -14233,7 +14233,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           let janusUrl = me._opts.conf.janusUrl;
           checkIsHttps() && (janusUrl = janusUrl.replace('ws:', 'wss:'));
           me._opts.janus = new Janus({
-            server: janusUrl.indexOf("127.0.0.1") == -1 ? janusUrl : janusUrl.split("//")[0] + "//" + location.hostname + ":" + janusUrl.split(":")[2],
+            // server: janusUrl.indexOf("127.0.0.1") == -1 ? janusUrl : janusUrl.split("//")[0] + "//" + (location.hostname)+":"+janusUrl.split(":")[2],
+            //使用项目必须定义window.janusHttpsHost来适应https
+            server: location.protocol == "https:" ? janusUrl.split("//")[0] + "//" + window.janusHttpsHost + "/janus/" : janusUrl,
             success: function () {
               console.log("Janus服务连接成功！");
 
@@ -30158,21 +30160,21 @@ function doSubscribe(_cometd, callback) {
  */
 
 
-const initVideo = function (token, videoArea, sip) {
+const initVideo = function (token, videoArea, videoOpts_, sip) {
   //读取视频服务配置初始化视频
   let server_ = sip || server;
   return new Promise((resolve, reject) => {
     let url = server_ + '/scooper-video/conf/data';
-    var param = {};
+    let param = {};
     $.getJSON(url, param, function (conf) {
       // 初始化视频播放方式
       // initplaVideoType();
       let janusUrl = conf['video.janus.url'];
-      var videoOpts = {
+      let videoOpts = {
         //初始化时的界面显示的分屏树
         windows: 4,
         //共有哪几种分屏
-        windowsArr: [1, 4, 9, 16],
+        windowsArr: [1, 2, 4, 9, 16],
         //总的窗口数
         windowsNum: 16,
         conf: {
@@ -30190,6 +30192,7 @@ const initVideo = function (token, videoArea, sip) {
         videoCapImagePath: conf['video.cap.image.path'],
         videoInfoInBottom: false
       };
+      if (videoOpts_) Object.assign(videoOpts, videoOpts_);
       conf['video.poll.time'] && (videoOpts.pollInterval = conf['video.poll.time']);
       let videoController = new Video($(videoArea), videoOpts);
       resolve(videoController);