ucservice 1.1.8 → 1.2.2

package/package.json

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

package/src/common-request.js

@@ -122,20 +122,20 @@ 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,
           //共有哪几种分屏
-          windowsArr: [1, 4, 9, 16],
+          windowsArr: [1, 2, 4, 9, 16],
           //总的窗口数
           windowsNum: 16,
           conf: {
@@ -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;
@@ -106,7 +98,7 @@ html, body{
     color: #fff;
 	font-size: 16px;
 	padding-left: 30px;	
-    /* background: transparent url(../../js/lib/zTree/img/loading.gif) no-repeat 10px center; */
+    /* background: transparent url("~@/img/loading.gif") no-repeat 10px center; */
 }
 .info{
     position: absolute;
@@ -140,7 +132,7 @@ html, body{
 	width: 48px;
     height: 48px;
     float: left;
-	/* background:url(../../image/video/audio/yy.png); */
+	/* background:url("~@/img/yy.png"); */
 	background-size: 100% 100%;
 	background-color: rgba(0,0,0,0);
 }
@@ -153,7 +145,7 @@ html, body{
 	width: 48px;
     height: 48px;
     float: left;
-	/* background-image: url(../../image/video/audio/yy_gb.png); */
+	/* background-image: url("~@/img/yy_gb.png"); */
     background-size: 100% 100%;
     background-color: rgba(0,0,0,0);
 }
@@ -165,7 +157,7 @@ html, body{
 	width: 48px;
     height: 48px;
     float: left;
-	/* background:url(../../image/video/audio/hm_shengyin_sel.png); */
+	/* background:url("~@/img/hm_shengyin_sel.png"); */
 	background-size: 100% 100%;
 	background-color: rgba(0,0,0,0);
 }
@@ -178,7 +170,7 @@ html, body{
 	width: 48px;
     height: 48px;
     float: left;
-	/* background-image: url(../../image/video/audio/hm_jingyin_sel.png); */
+	/* background-image: url("~@/img/hm_jingyin_sel.png"); */
     background-size: 100% 100%;
     background-color: rgba(0,0,0,0);
 }
@@ -191,7 +183,7 @@ html, body{
 	width: 20px;
     height: 20px;
     float: left;
-	/* background-image: url("../img/close.png"); */
+	/* background-image: url("~@/img/close.png"); */
     background-size: 100% 100%;
     background-color: rgba(0,0,0,0);
 }

package/src/scooper.video.js

@@ -2354,7 +2354,9 @@
 							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服务连接成功！");
 									me._initSVideo(me._opts.janus);