ucservice 1.1.6 → 1.1.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ucservice",
   "private": false,
-  "version": "1.1.6",
+  "version": "1.1.9",
   "description": "统一通信服务",
   "main": "dist/ucservice.common.js",
   "style": "ucservice.css",

package/src/common-request.js

@@ -122,16 +122,16 @@ function doSubscribe(_cometd, callback) {
  * @param {*} videoArea //展示视频的容器模块
  * 使用该方法前提是videoArea等相关dom节点必须已加载完毕
  */
-export const initVideo = function(token, videoArea, sip){ //读取视频服务配置初始化视频
+export 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,
           //共有哪几种分屏
@@ -153,6 +153,7 @@ export 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);

package/src/css/scooper.video.css

@@ -1,12 +1,4 @@
 @charset "UTF-8";
-html, body{  
-	padding:0;  
-	margin:0;  
-	height:100%;  
-	width:100%;  
-	overflow: hidden;  
-}
-
 .video-main{
 	position: absolute;
 	top: 0px;

package/src/scooper.video.js

@@ -12,7 +12,7 @@
 			define(['jquery', './lib/janus', 'webrtc-adapter'], factory);
 	} else if (typeof exports === 'object') {
 			// Node, CommonJS之类的
-			module.exports = factory(require('jquery'), require('./lib/janus').default, require('webrtc-adapter'));
+			module.exports = factory(require('jquery'), require('./lib/janus'), require('webrtc-adapter'));
 	} else {
 			// 浏览器全局变量(root 即 window)
 			root.scooper = root.scooper || {};
@@ -20,6 +20,11 @@
 			root.scooper.video = factory(root.jQuery, root.Janus, root.adapter);
 	}
 	}(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";