ucservice 1.1.9 → 1.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ucservice",
3
3
  "private": false,
4
- "version": "1.1.9",
4
+ "version": "1.2.3",
5
5
  "description": "统一通信服务",
6
6
  "main": "dist/ucservice.common.js",
7
7
  "style": "ucservice.css",
@@ -135,7 +135,7 @@ export const initVideo = function(token, videoArea, videoOpts_, sip){ //读取
135
135
  //初始化时的界面显示的分屏树
136
136
  windows: 4,
137
137
  //共有哪几种分屏
138
- windowsArr: [1, 4, 9, 16],
138
+ windowsArr: [1, 2, 4, 9, 16],
139
139
  //总的窗口数
140
140
  windowsNum: 16,
141
141
  conf: {
@@ -98,7 +98,7 @@
98
98
  color: #fff;
99
99
  font-size: 16px;
100
100
  padding-left: 30px;
101
- /* background: transparent url(../../js/lib/zTree/img/loading.gif) no-repeat 10px center; */
101
+ /* background: transparent url("~@/img/loading.gif") no-repeat 10px center; */
102
102
  }
103
103
  .info{
104
104
  position: absolute;
@@ -132,7 +132,7 @@
132
132
  width: 48px;
133
133
  height: 48px;
134
134
  float: left;
135
- /* background:url(../../image/video/audio/yy.png); */
135
+ /* background:url("~@/img/yy.png"); */
136
136
  background-size: 100% 100%;
137
137
  background-color: rgba(0,0,0,0);
138
138
  }
@@ -145,7 +145,7 @@
145
145
  width: 48px;
146
146
  height: 48px;
147
147
  float: left;
148
- /* background-image: url(../../image/video/audio/yy_gb.png); */
148
+ /* background-image: url("~@/img/yy_gb.png"); */
149
149
  background-size: 100% 100%;
150
150
  background-color: rgba(0,0,0,0);
151
151
  }
@@ -157,7 +157,7 @@
157
157
  width: 48px;
158
158
  height: 48px;
159
159
  float: left;
160
- /* background:url(../../image/video/audio/hm_shengyin_sel.png); */
160
+ /* background:url("~@/img/hm_shengyin_sel.png"); */
161
161
  background-size: 100% 100%;
162
162
  background-color: rgba(0,0,0,0);
163
163
  }
@@ -170,7 +170,7 @@
170
170
  width: 48px;
171
171
  height: 48px;
172
172
  float: left;
173
- /* background-image: url(../../image/video/audio/hm_jingyin_sel.png); */
173
+ /* background-image: url("~@/img/hm_jingyin_sel.png"); */
174
174
  background-size: 100% 100%;
175
175
  background-color: rgba(0,0,0,0);
176
176
  }
@@ -183,7 +183,7 @@
183
183
  width: 20px;
184
184
  height: 20px;
185
185
  float: left;
186
- /* background-image: url("../img/close.png"); */
186
+ /* background-image: url("~@/img/close.png"); */
187
187
  background-size: 100% 100%;
188
188
  background-color: rgba(0,0,0,0);
189
189
  }
@@ -2354,7 +2354,9 @@
2354
2354
  let janusUrl = me._opts.conf.janusUrl;
2355
2355
  checkIsHttps() && (janusUrl = janusUrl.replace('ws:','wss:'));
2356
2356
  me._opts.janus = new Janus({
2357
- server: janusUrl.indexOf("127.0.0.1") == -1 ? janusUrl : janusUrl.split("//")[0] + "//" + (location.hostname)+":"+janusUrl.split(":")[2],
2357
+ // server: janusUrl.indexOf("127.0.0.1") == -1 ? janusUrl : janusUrl.split("//")[0] + "//" + (location.hostname)+":"+janusUrl.split(":")[2],
2358
+ //使用项目必须定义window.janusHttpsHost来适应https
2359
+ server: location.protocol == "https:" ? janusUrl.split("//")[0] + "//" + "112.124.244.179:9999" + "/janus/" : janusUrl,
2358
2360
  success: function(){
2359
2361
  console.log("Janus服务连接成功!");
2360
2362
  me._initSVideo(me._opts.janus);