ucservice 1.7.1 → 1.7.4

package/package.json

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

package/src/css/scooper.video.css

@@ -159,22 +159,22 @@
 }
 
 .video-main.mode-4 .scale-btn {
-	bottom: 3px;
-	right: 6.8rem;
-	width: 1.5rem;
-	height: 1.5rem;
+	bottom: 7px;
+	right: 7.5rem;
+	width: 1rem;
+	height: 1rem;
 }
 .video-main.mode-9 .scale-btn {
-	bottom: 3px;
-	right: 6.2rem;
-	width: 1.42rem;
-	height: 1.42rem;
+	bottom: 6px;
+	right: 7rem;
+	width: 0.9rem;
+	height: 0.9rem;
 }
 .video-main.mode-16 .scale-btn {
-	bottom: 3px;
-	right: 5.7rem;
-	width: 1.3rem;
-	height: 1.3rem;
+	bottom: 7px;
+	right: 6rem;
+	width: 0.8rem;
+	height: 0.8rem;
 }
 .video-main.mode-9 .stream-loading {
 	width: 11.4rem;	
@@ -269,16 +269,16 @@
 	background-size: 100% 100%;
 	background-color: rgba(0,0,0,0);
 }
-.rotate-btn .bggray, .scale-btn .bggray{
-	filter: grayscale(100%);
+.rotate-btn.bggray, .scale-btn.bggray{
+	filter: contrast(0.5);
 }
 .scale-btn {
 	position: absolute;
-	bottom: 1px;
-	right: 8.6rem;
+	bottom: 5px;
+	right: 9.5rem;
 	border: 0;
-	width: 1.75rem;
-	height: 1.75rem;
+	width: 1.25rem;
+	height: 1.25rem;
 	float: left;
 /* background-image: url("~@/img/yy_gb.png"); */
 	background-size: 100% 100%;

package/src/scooper.video.js

@@ -1569,6 +1569,11 @@
 						}
 						
 						this.VIDEO_DATA[index].close();
+						let video = $(me.selector + ' li ')[index].find('video')
+						if(video.hasClass('scale-scene')) {
+							video.removeClass('scale-scene');
+							video.parent().find('.scale-btn').addClass('bggray')
+						}
 		 
 							if (!isSave) {
 								this.VIDEO_DATA[index].closeType = 'close';
@@ -2367,6 +2372,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(){