ucservice 1.1.7 → 1.2.1
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 +10 -4
- 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 +10 -4
- 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 +5 -4
- package/src/css/scooper.video.css +6 -14
- package/src/scooper.video.js +5 -0
package/dist/ucservice.css
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
.video-main{position:absolute;top:0;left:-25px;right:-12px;bottom:-18px}.video-main-full{position:absolute;top:1px;left:1px;right:1px;bottom:1px}.video-main-full>li,.video-main>li{border:1px solid #aaa;float:left;position:relative}.video-main-full>li.loading,.video-main>li.loading{background:#000}.video-main-full>li:hover,.video-main>li:hover{border:1px solid #ffb951}.video-main-full>li.sel,.video-main>li.sel{border:1px solid #ef8601}.video-main-full.mode-1>li,.video-main.mode-1>li{width:98.5%;height:98.5%;list-style:none}.video-main-full.mode-1>li .info,.video-main.mode-1>li .info{font-size:20px;bottom:40px}.video-main.mode-4>li{width:49%;height:49%;list-style:none}.video-main.mode-4>li .info{font-size:18px;bottom:20px}.video-main.mode-6>li{width:33.33%;height:33.33%}.video-main.mode-6>li .info{font-size:14px;bottom:13px}.video-main.mode-6 .screen-1{width:66.66%;height:66.65%}.video-main.mode-6 .screen-1 .info{font-size:18px;bottom:30px}.video-main.mode-9>li{width:32.5%;height:32.5%;list-style:none}.video-main.mode-9>li .info{font-size:12px;bottom:14px}.video-main.mode-16>li{width:24.5%;height:24.5%;list-style:none}.video-main.mode-16>li .info{font-size:8px;bottom:10px}.video-box{-o-object-fit:fill;object-fit:fill;display:none;width:100%;height:100%}.stream-loading{width:200px;height:30px;line-height:30px;position:absolute;top:50%;left:50%;margin-top:-15px;margin-left:-100px;color:#fff;font-size:16px;padding-left:30px}.info{color:#fff;left:10px;width:67%}.info,.operate-btn{position:absolute;float:left;z-index:1}.operate-btn{width:24px;height:24x;right:1px;bottom:2px;cursor:pointer}.send-audio-btn,.unsend-audio-btn{position:absolute;bottom:-8px;right:70px;border:0;width:48px;height:48px;float:left;background-size:100% 100%;background-color:transparent}.recv-audio-btn,.unrecv-audio-btn{bottom:-8px;right:30px;width:48px;height:48px}.close-btn,.recv-audio-btn,.unrecv-audio-btn{position:absolute;border:0;float:left;background-size:100% 100%;background-color:transparent}.close-btn{bottom:5px;right:5px;width:20px;height:20px}.operation{position:absolute;width:100%;height:12%;bottom:0;background:rgba(0,0,0,.3);color:#fff}.hide{display:none}
|
package/dist/ucservice.umd.js
CHANGED
|
@@ -11803,6 +11803,11 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
|
|
|
11803
11803
|
__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
|
|
11804
11804
|
} else {}
|
|
11805
11805
|
})(this, function ($, Janus, adapter) {
|
|
11806
|
+
console.log(Janus);
|
|
11807
|
+
console.log(adapter);
|
|
11808
|
+
Janus = Janus.default;
|
|
11809
|
+
adapter = adapter.default;
|
|
11810
|
+
console.log("=====after default====");
|
|
11806
11811
|
console.log(Janus);
|
|
11807
11812
|
console.log(adapter);
|
|
11808
11813
|
"use strict";
|
|
@@ -30162,21 +30167,21 @@ function doSubscribe(_cometd, callback) {
|
|
|
30162
30167
|
*/
|
|
30163
30168
|
|
|
30164
30169
|
|
|
30165
|
-
const initVideo = function (token, videoArea, sip) {
|
|
30170
|
+
const initVideo = function (token, videoArea, videoOpts_, sip) {
|
|
30166
30171
|
//读取视频服务配置初始化视频
|
|
30167
30172
|
let server_ = sip || server;
|
|
30168
30173
|
return new Promise((resolve, reject) => {
|
|
30169
30174
|
let url = server_ + '/scooper-video/conf/data';
|
|
30170
|
-
|
|
30175
|
+
let param = {};
|
|
30171
30176
|
$.getJSON(url, param, function (conf) {
|
|
30172
30177
|
// 初始化视频播放方式
|
|
30173
30178
|
// initplaVideoType();
|
|
30174
30179
|
let janusUrl = conf['video.janus.url'];
|
|
30175
|
-
|
|
30180
|
+
let videoOpts = {
|
|
30176
30181
|
//初始化时的界面显示的分屏树
|
|
30177
30182
|
windows: 4,
|
|
30178
30183
|
//共有哪几种分屏
|
|
30179
|
-
windowsArr: [1, 4, 9, 16],
|
|
30184
|
+
windowsArr: [1, 2, 4, 9, 16],
|
|
30180
30185
|
//总的窗口数
|
|
30181
30186
|
windowsNum: 16,
|
|
30182
30187
|
conf: {
|
|
@@ -30194,6 +30199,7 @@ const initVideo = function (token, videoArea, sip) {
|
|
|
30194
30199
|
videoCapImagePath: conf['video.cap.image.path'],
|
|
30195
30200
|
videoInfoInBottom: false
|
|
30196
30201
|
};
|
|
30202
|
+
if (videoOpts_) Object.assign(videoOpts, videoOpts_);
|
|
30197
30203
|
conf['video.poll.time'] && (videoOpts.pollInterval = conf['video.poll.time']);
|
|
30198
30204
|
let videoController = new Video($(videoArea), videoOpts);
|
|
30199
30205
|
resolve(videoController);
|
package/dist/ucservice.umd.js.gz
CHANGED
|
Binary file
|