ucservice 1.1.6 → 1.1.9

package/dist/ucservice.common.js

@@ -11794,6 +11794,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
   } else {}
 })(this, function ($, Janus, adapter) {
+  console.log(Janus);
+  console.log(adapter);
+  Janus = Janus.default;
+  adapter = adapter.default;
+  console.log("=====after default====");
   console.log(Janus);
   console.log(adapter);
   "use strict";
@@ -30153,17 +30158,17 @@ 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,
         //共有哪几种分屏
@@ -30185,6 +30190,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);