ucservice 1.6.9 → 1.7.2

package/package.json

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

package/src/css/scooper.video.css

@@ -86,6 +86,11 @@
 	width: 100%;
     height: 100%;
 }
+.video-main .video-box.scale-scene{
+	width: 100%!important;
+	height: 100%!important;
+	object-fit: fill!important;
+}
 .video-main.mode-4 .close-btn {
 	width: 1.1rem;
 	height: 1.1rem;
@@ -152,6 +157,25 @@
 	width: 1.3rem;
 	height: 1.3rem;
 }
+
+.video-main.mode-4 .scale-btn {
+	bottom: 3px;
+	right: 6.8rem;
+	width: 1.5rem;
+	height: 1.5rem;
+}
+.video-main.mode-9 .scale-btn {
+	bottom: 3px;
+	right: 6.2rem;
+	width: 1.42rem;
+	height: 1.42rem;
+}
+.video-main.mode-16 .scale-btn {
+	bottom: 3px;
+	right: 5.7rem;
+	width: 1.3rem;
+	height: 1.3rem;
+}
 .video-main.mode-9 .stream-loading {
 	width: 11.4rem;	
 	height: 2.1rem;
@@ -213,8 +237,8 @@
 	bottom: -8px;
 	right: 70px;
 	border: 0;
-	width: 2rem;
-    height: 2rem;
+	width: 3rem;
+    height: 3rem;
     float: left;
 	/* background:url("~@/img/yy.png"); */
 	background-size: 100% 100%;
@@ -245,13 +269,28 @@
 	background-size: 100% 100%;
 	background-color: rgba(0,0,0,0);
 }
+.rotate-btn .bggray, .scale-btn .bggray{
+	filter: grayscale(100%);
+}
+.scale-btn {
+	position: absolute;
+	bottom: 1px;
+	right: 8.6rem;
+	border: 0;
+	width: 1.75rem;
+	height: 1.75rem;
+	float: left;
+/* background-image: url("~@/img/yy_gb.png"); */
+	background-size: 100% 100%;
+	background-color: rgba(0,0,0,0);
+}
 .recv-audio-btn {
 	position: absolute;
 	bottom: -8px;
 	right: 30px;
 	border: 0;
-	width: 2rem;
-    height: 2rem;
+	width: 3rem;
+    height: 3rem;
     float: left;
 	/* background:url("~@/img/hm_shengyin_sel.png"); */
 	background-size: 100% 100%;

package/src/scooper.video.js

@@ -2367,6 +2367,14 @@
 							//jquery方式阻止默认事件 & 冒泡事件
 							return false;
 						})
+						videoFlagObj.find('button[name=scaleVideo]').click(function(){
+							let isgray = $(this).hasClass('bggray')
+							if(isgray) $(this).parent().parent().find('.video-box').addClass('scale-scene')
+							else $(this).parent().parent().find('.video-box').removeClass('scale-scene')
+							$(this).toggleClass("bggray")
+							//jquery方式阻止默认事件 & 冒泡事件
+							return false;
+						})
 						
 						//接收音频事件
 						videoFlagObj.find("button[name='recvAudio']").click(function(){
@@ -2803,7 +2811,7 @@
 							'<div class="operate-btn">';
 							//videoHtml +='<button type="button" class="unlock-video-btn hide" name="lockVideo"></button>';
 							// checkUserMediaAvailable() && 
-							videoHtml += '<button type="button" class="rotate-btn hide" name="rotateVideo" rotate-index="0" title="视频旋转"></button><button type="button" class="unsend-audio-btn hide" name="sendAudio"></button>';
+							videoHtml += '<button type="button" class="scale-btn bggray hide" name="scaleVideo" title="视频画面铺满"></button><button type="button" class="rotate-btn hide" name="rotateVideo" rotate-index="0" title="视频旋转"></button><button type="button" class="unsend-audio-btn hide" name="sendAudio"></button>';
 							videoHtml += '<button type="button" class="unrecv-audio-btn hide" name="recvAudio"></button>' +
 							'<button type="button" class="close-btn hide" name="closeVideo"></button>' +
 							'</div>' +