ucservice 1.6.6 → 1.6.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.
Files changed (13) hide show
  1. package/dist/ucservice.common.js +5 -3
  2. package/dist/ucservice.common.js.gz +0 -0
  3. package/dist/ucservice.common.js.map +1 -1
  4. package/dist/ucservice.css +1 -1
  5. package/dist/ucservice.umd.js +5 -3
  6. package/dist/ucservice.umd.js.gz +0 -0
  7. package/dist/ucservice.umd.js.map +1 -1
  8. package/dist/ucservice.umd.min.js +1 -1
  9. package/dist/ucservice.umd.min.js.gz +0 -0
  10. package/dist/ucservice.umd.min.js.map +1 -1
  11. package/package.json +1 -1
  12. package/src/css/scooper.video.css +96 -12
  13. package/src/scooper.video.js +5 -3
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ucservice",
3
3
  "private": false,
4
- "version": "1.6.6",
4
+ "version": "1.6.9",
5
5
  "description": "统一通信服务",
6
6
  "main": "dist/ucservice.common.js",
7
7
  "style": "ucservice.css",
package/src/css/scooper.video.css CHANGED
@@ -86,18 +86,102 @@
86
86
  width: 100%;
87
87
  height: 100%;
88
88
  }
89
+ .video-main.mode-4 .close-btn {
90
+ width: 1.1rem;
91
+ height: 1.1rem;
92
+ }
93
+ .video-main.mode-9 .close-btn {
94
+ width: 0.95rem;
95
+ height: 0.95rem;
96
+ }
97
+ .video-main.mode-16 .close-btn {
98
+ width: 0.85rem;
99
+ height: 0.85rem;
100
+ }
101
+ .video-main.mode-4 .recv-audio-btn {
102
+ bottom: -4px;
103
+ right: 1.8rem;
104
+ width: 2.5rem;
105
+ height: 2.5rem;
106
+ }
107
+ .video-main.mode-9 .recv-audio-btn {
108
+ bottom: -3px;
109
+ right: 1.6rem;
110
+ width: 2.2rem;
111
+ height: 2.2rem;
112
+ }
113
+ .video-main.mode-16 .recv-audio-btn {
114
+ bottom: -2px;
115
+ right: 1.4rem;
116
+ width: 2rem;
117
+ height: 2rem;
118
+ }
119
+ .video-main.mode-4 .unrecv-audio-btn {
120
+ bottom: -4px;
121
+ right: 1.8rem;
122
+ width: 2.5rem;
123
+ height: 2.5rem;
124
+ }
125
+ .video-main.mode-9 .unrecv-audio-btn {
126
+ bottom: -3px;
127
+ right: 1.6rem;
128
+ width: 2.2rem;
129
+ height: 2.2rem;
130
+ }
131
+ .video-main.mode-16 .unrecv-audio-btn {
132
+ bottom: -2px;
133
+ right: 1.4rem;
134
+ width: 2rem;
135
+ height: 2rem;
136
+ }
137
+ .video-main.mode-4 .rotate-btn {
138
+ bottom: 3px;
139
+ right: 4.8rem;
140
+ width: 1.5rem;
141
+ height: 1.5rem;
142
+ }
143
+ .video-main.mode-9 .rotate-btn {
144
+ bottom: 3px;
145
+ right: 4.2rem;
146
+ width: 1.42rem;
147
+ height: 1.42rem;
148
+ }
149
+ .video-main.mode-16 .rotate-btn {
150
+ bottom: 3px;
151
+ right: 3.7rem;
152
+ width: 1.3rem;
153
+ height: 1.3rem;
154
+ }
155
+ .video-main.mode-9 .stream-loading {
156
+ width: 11.4rem;
157
+ height: 2.1rem;
158
+ line-height: 2.1rem;
159
+ font-size: 15px;
160
+ background-size: 15px;
161
+ }
162
+ .video-main.mode-16 .stream-loading {
163
+ width: 9.3rem;
164
+ height: 2.1rem;
165
+ line-height: 2.1rem;
166
+ font-size: 14px;
167
+ background-size: 14px;
168
+ margin-left: 5.7rem;
169
+ }
170
+ .video-main.mode-16 .real-result, .video-main.mode-16 .result {
171
+ font-size: 12px;
172
+ }
89
173
  .stream-loading{
90
- width: 200px;
91
- height: 30px;
92
- line-height: 30px;
174
+ width: 14rem;
175
+ height: 2.1rem;
176
+ line-height: 2.1rem;
93
177
  position: absolute;
94
178
  top: 50%;
95
179
  left: 50%;
96
- margin-top: -15px;
97
- margin-left: -100px;
180
+ margin-top: -1rem;
181
+ margin-left: -7.1rem;
98
182
  color: #fff;
99
- font-size: 16px;
100
- padding-left: 30px;
183
+ font-size: 1.14rem;
184
+ padding-left: 2.1rem;
101
185
  /* background: transparent url("~@/img/loading.gif") no-repeat 10px center; */
102
186
  }
103
187
  .info{
@@ -129,8 +213,8 @@
129
213
  bottom: -8px;
130
214
  right: 70px;
131
215
  border: 0;
132
- width: 3rem;
133
- height: 3rem;
216
+ width: 2rem;
217
+ height: 2rem;
134
218
  float: left;
135
219
  /* background:url("~@/img/yy.png"); */
136
220
  background-size: 100% 100%;
@@ -152,7 +236,7 @@
152
236
  .rotate-btn {
153
237
  position: absolute;
154
238
  bottom: 1px;
155
- right: 76px;
239
+ right: 6.07rem;
156
240
  border: 0;
157
241
  width: 1.75rem;
158
242
  height: 1.75rem;
@@ -166,8 +250,8 @@
166
250
  bottom: -8px;
167
251
  right: 30px;
168
252
  border: 0;
169
- width: 3rem;
170
- height: 3rem;
253
+ width: 2rem;
254
+ height: 2rem;
171
255
  float: left;
172
256
  /* background:url("~@/img/hm_shengyin_sel.png"); */
173
257
  background-size: 100% 100%;
package/src/scooper.video.js CHANGED
@@ -2137,10 +2137,12 @@
2137
2137
  let target = $(this);
2138
2138
  let srcIndex = src.index();
2139
2139
  let targetIndex = target.index();
2140
- target.removeClass('screen-' + (targetIndex + 1)).addClass('screen-' + srcIndex)
2141
- src.removeClass('screen-' + (srcIndex + 1)).addClass('screen-' + targetIndex)
2140
+ target.removeClass('screen-' + (targetIndex + 1)).addClass('screen-' + (srcIndex + 1))
2141
+ src.removeClass('screen-' + (srcIndex + 1)).addClass('screen-' + (targetIndex + 1))
2142
2142
  target.attr('index', srcIndex)
2143
2143
  src.attr('index', targetIndex)
2144
+ src.children('#frame-decoded-' + (srcIndex + 1)).attr('id', '#frame-decoded-' + (targetIndex + 1))
2145
+ target.children('#frame-decoded-' + (targetIndex + 1)).attr('id', '#frame-decoded-' + (srcIndex + 1))
2144
2146
 
2145
2147
  let videoData = me.VIDEO_DATA;
2146
2148
  if (srcIndex > targetIndex) {
@@ -2527,7 +2529,7 @@
2527
2529
  if(!me.VIDEO_DATA || !me.VIDEO_DATA.length) return;
2528
2530
  for (let i = 0; i < me.VIDEO_DATA.length; i++) {
2529
2531
  if (me.VIDEO_DATA[i].playing) {
2530
- let number = Number(i) + Number(1);
2532
+ let number = Number(me.VIDEO_DATA[i].index) + Number(1);
2531
2533
  //获取视频video标签
2532
2534
  let $videoList = $(me.selector + " .video-main #video-" + number);
2533
2535
  if(!$videoList.length) {