ucservice 1.1.8 → 1.1.9
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/dist/ucservice.common.js +4 -3
- package/dist/ucservice.common.js.gz +0 -0
- package/dist/ucservice.common.js.map +1 -1
- package/dist/ucservice.css +1 -1
- package/dist/ucservice.umd.js +4 -3
- package/dist/ucservice.umd.js.gz +0 -0
- package/dist/ucservice.umd.js.map +1 -1
- package/dist/ucservice.umd.min.js +1 -1
- package/dist/ucservice.umd.min.js.gz +0 -0
- package/dist/ucservice.umd.min.js.map +1 -1
- package/package.json +1 -1
- package/src/common-request.js +4 -3
- package/src/css/scooper.video.css +0 -8
package/dist/ucservice.common.js
CHANGED
|
@@ -30158,17 +30158,17 @@ function doSubscribe(_cometd, callback) {
|
|
|
30158
30158
|
*/
|
|
30159
30159
|
|
|
30160
30160
|
|
|
30161
|
-
const initVideo = function (token, videoArea, sip) {
|
|
30161
|
+
const initVideo = function (token, videoArea, videoOpts_, sip) {
|
|
30162
30162
|
//读取视频服务配置初始化视频
|
|
30163
30163
|
let server_ = sip || server;
|
|
30164
30164
|
return new Promise((resolve, reject) => {
|
|
30165
30165
|
let url = server_ + '/scooper-video/conf/data';
|
|
30166
|
-
|
|
30166
|
+
let param = {};
|
|
30167
30167
|
$.getJSON(url, param, function (conf) {
|
|
30168
30168
|
// 初始化视频播放方式
|
|
30169
30169
|
// initplaVideoType();
|
|
30170
30170
|
let janusUrl = conf['video.janus.url'];
|
|
30171
|
-
|
|
30171
|
+
let videoOpts = {
|
|
30172
30172
|
//初始化时的界面显示的分屏树
|
|
30173
30173
|
windows: 4,
|
|
30174
30174
|
//共有哪几种分屏
|
|
@@ -30190,6 +30190,7 @@ const initVideo = function (token, videoArea, sip) {
|
|
|
30190
30190
|
videoCapImagePath: conf['video.cap.image.path'],
|
|
30191
30191
|
videoInfoInBottom: false
|
|
30192
30192
|
};
|
|
30193
|
+
if (videoOpts_) Object.assign(videoOpts, videoOpts_);
|
|
30193
30194
|
conf['video.poll.time'] && (videoOpts.pollInterval = conf['video.poll.time']);
|
|
30194
30195
|
let videoController = new Video($(videoArea), videoOpts);
|
|
30195
30196
|
resolve(videoController);
|
|
Binary file
|