You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/02/23 04:43:16 UTC

svn commit: r1784082 - in /openmeetings/application: branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ branches/3.2.x/openmeetings-flash/src/main/swf/ branches/3.2.x/openmeetings-web/src/main/java/org/apache/openm...

Author: solomax
Date: Thu Feb 23 04:43:16 2017
New Revision: 1784082

URL: http://svn.apache.org/viewvc?rev=1784082&view=rev
Log:
[OPENMEETINGS-1574] external video should work as expected

Modified:
    openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
    openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
    openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
    openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css

Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Thu Feb 23 04:43:16 2017
@@ -187,12 +187,16 @@ public class ScopeApplicationAdapter ext
 		if (parentSid == null) {
 			parentSid = (String)connParams.get("parentSid");
 		}
+		Client rcm = new Client();
 		if (!Strings.isEmpty(securityCode)) {
 			//FIXME TODO add better mechanism, this is for external applications like ffmpeg
 			Client parent = sessionManager.getClientByPublicSID(securityCode, null);
 			if (parent == null || !parent.getScope().equals(conn.getScope().getName())) {
 				log.warn("Security code is invalid, client is rejected");
 				return rejectClient();
+			} else {
+				rcm.setUserId(parent.getUserId());
+				rcm.setPublicSID(UUID.randomUUID().toString());
 			}
 		}
 		if (Strings.isEmpty(uid) && Strings.isEmpty(securityCode) && Strings.isEmpty(parentSid)) {
@@ -203,15 +207,14 @@ public class ScopeApplicationAdapter ext
 			return true;
 		}
 
-		Client rcm = new Client();
 		if (map.containsKey("screenClient")) {
-			Client parentClient = sessionManager.getClientByPublicSID(parentSid, null);
-			if (parentClient == null) {
+			Client parent = sessionManager.getClientByPublicSID(parentSid, null);
+			if (parent == null) {
 				log.warn("Bad parent for screen-sharing client, client is rejected");
 				return rejectClient();
 			}
 			SessionVariablesUtil.setIsScreenClient(conn.getClient());
-			rcm.setUserId(parentClient.getUserId());
+			rcm.setUserId(parent.getUserId());
 			rcm.setScreenClient(true);
 			rcm.setPublicSID(UUID.randomUUID().toString());
 			rcm.setStreamPublishName(parentSid);
@@ -695,6 +698,7 @@ public class ScopeApplicationAdapter ext
 			}
 			if (!Strings.isEmpty(currentClient.getSecurityCode())) {
 				currentClient.setBroadCastID(Long.parseLong(stream.getPublishedName()));
+				currentClient.setAvsettings("av");
 				currentClient.setIsBroadcasting(true);
 				currentClient.setVWidth(320);
 				currentClient.setVHeight(240);
@@ -717,7 +721,7 @@ public class ScopeApplicationAdapter ext
 
 					log.debug("check send to "+rcl);
 
-					if (rcl.getPublicSID() == "") {
+					if (Strings.isEmpty(rcl.getPublicSID())) {
 						log.debug("publicSID IS NULL newStream SEND");
 						return true;
 					}

Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx Thu Feb 23 04:43:16 2017
@@ -349,13 +349,7 @@
 		//value.publicSID,value.broadCastID,value.firstname,value.lastname,value.interviewPodId,value.VWidth,value.VHeight
 
 		if ($debug) Debug.write("startStream: ", value);
-		var obj = null;
-		if (!!value.securityCode) {
-			obj = createVideoObject(value.publicSID, true, -1, value);
-			obj.setAttribute('visible', true);
-		} else {
-			createVideo(value);
-		}
+		createVideo(value);
 	]]>
 	</method>
 

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Thu Feb 23 04:43:16 2017
@@ -38,6 +38,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.directory.api.util.Strings;
 import org.apache.openmeetings.IApplication;
 import org.apache.openmeetings.core.remote.MainService;
 import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
@@ -252,7 +253,9 @@ public class Application extends Authent
 		if (!rcl.isScreenClient() && (!rcl.isMobile() || (rcl.isMobile() && rcl.getUserId() != null))) {
 			Client client = getOnlineClient(rcl.getPublicSID());
 			if (client == null) {
-				if (rcl.isMobile()) {
+				if (!Strings.isEmpty(rcl.getSecurityCode())) {
+					client = getOnlineClient(rcl.getSecurityCode());
+				} else if (rcl.isMobile()) {
 					//Mobile client enters the room
 					client = new Client(rcl, getBean(UserDao.class));
 					addOnlineUser(client);

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Thu Feb 23 04:43:16 2017
@@ -21,7 +21,7 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="room holder">
-		<div class="room container" wicket:id="roomContainer">
+		<div class="room box" wicket:id="roomContainer">
 			<div class="room menu" wicket:id="menu"></div>
 			<div class="room sidebar left" wicket:id="sidebar"></div>
 			<div wicket:id="wb-area" class="room wb area">

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js Thu Feb 23 04:43:16 2017
@@ -34,7 +34,7 @@ function roomReload(event, ui) {
 }
 function roomClosed(jqEvent, msg) {
 	roomUnload();
-	$(".room.container").remove();
+	$(".room.holder").remove();
 	$("#chatPanel").remove();
 	var dlg = $('#disconnected-dlg');
 	dlg.dialog({

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js Thu Feb 23 04:43:16 2017
@@ -38,7 +38,7 @@ var Chat = function() {
 
 	function doneTyping () {
 		typingTimer = null;
-		chatActivity('typing_stop', $('.room.container').data('room-id'));
+		chatActivity('typing_stop', $('.room.box').data('room-id'));
 	}
 	function emtClick(emoticon) {
 		var editor = $('#chatMessage .wysiwyg-editor');
@@ -102,7 +102,7 @@ var Chat = function() {
 				}
 			});
 			$('#chatMessage').off().on('input propertychange paste', function () {
-				var room = $('.room.container');
+				var room = $('.room.box');
 				if (room.length) {
 					if (!!typingTimer) {
 						clearTimeout(typingTimer);

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css Thu Feb 23 04:43:16 2017
@@ -22,7 +22,7 @@
 .room.holder {
 	width: 100%;
 }
-.room.container {
+.room.box {
 	height: 100%;
 }
 .ui-icon.room.menu.exit {

Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Thu Feb 23 04:43:16 2017
@@ -187,12 +187,16 @@ public class ScopeApplicationAdapter ext
 		if (parentSid == null) {
 			parentSid = (String)connParams.get("parentSid");
 		}
+		Client rcm = new Client();
 		if (!Strings.isEmpty(securityCode)) {
 			//FIXME TODO add better mechanism, this is for external applications like ffmpeg
 			Client parent = sessionManager.getClientByPublicSID(securityCode, null);
 			if (parent == null || !parent.getScope().equals(conn.getScope().getName())) {
 				log.warn("Security code is invalid, client is rejected");
 				return rejectClient();
+			} else {
+				rcm.setUserId(parent.getUserId());
+				rcm.setPublicSID(UUID.randomUUID().toString());
 			}
 		}
 		if (Strings.isEmpty(uid) && Strings.isEmpty(securityCode) && Strings.isEmpty(parentSid)) {
@@ -203,15 +207,14 @@ public class ScopeApplicationAdapter ext
 			return true;
 		}
 
-		Client rcm = new Client();
 		if (map.containsKey("screenClient")) {
-			Client parentClient = sessionManager.getClientByPublicSID(parentSid, null);
-			if (parentClient == null) {
+			Client parent = sessionManager.getClientByPublicSID(parentSid, null);
+			if (parent == null) {
 				log.warn("Bad parent for screen-sharing client, client is rejected");
 				return rejectClient();
 			}
 			SessionVariablesUtil.setIsScreenClient(conn.getClient());
-			rcm.setUserId(parentClient.getUserId());
+			rcm.setUserId(parent.getUserId());
 			rcm.setScreenClient(true);
 			rcm.setPublicSID(UUID.randomUUID().toString());
 			rcm.setStreamPublishName(parentSid);
@@ -695,6 +698,7 @@ public class ScopeApplicationAdapter ext
 			}
 			if (!Strings.isEmpty(currentClient.getSecurityCode())) {
 				currentClient.setBroadCastID(Long.parseLong(stream.getPublishedName()));
+				currentClient.setAvsettings("av");
 				currentClient.setIsBroadcasting(true);
 				currentClient.setVWidth(320);
 				currentClient.setVHeight(240);
@@ -717,7 +721,7 @@ public class ScopeApplicationAdapter ext
 
 					log.debug("check send to "+rcl);
 
-					if (rcl.getPublicSID() == "") {
+					if (Strings.isEmpty(rcl.getPublicSID())) {
 						log.debug("publicSID IS NULL newStream SEND");
 						return true;
 					}

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Thu Feb 23 04:43:16 2017
@@ -38,6 +38,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.directory.api.util.Strings;
 import org.apache.openmeetings.IApplication;
 import org.apache.openmeetings.core.remote.MainService;
 import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
@@ -252,7 +253,9 @@ public class Application extends Authent
 		if (!rcl.isScreenClient() && (!rcl.isMobile() || (rcl.isMobile() && rcl.getUserId() != null))) {
 			Client client = getOnlineClient(rcl.getPublicSID());
 			if (client == null) {
-				if (rcl.isMobile()) {
+				if (!Strings.isEmpty(rcl.getSecurityCode())) {
+					client = getOnlineClient(rcl.getSecurityCode());
+				} else if (rcl.isMobile()) {
 					//Mobile client enters the room
 					client = new Client(rcl, getBean(UserDao.class));
 					addOnlineUser(client);

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Thu Feb 23 04:43:16 2017
@@ -21,7 +21,7 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
 	<div class="room holder">
-		<div class="room container" wicket:id="roomContainer">
+		<div class="room box" wicket:id="roomContainer">
 			<div class="room menu" wicket:id="menu"></div>
 			<div class="room sidebar left" wicket:id="sidebar"></div>
 			<div wicket:id="wb-area" class="room wb area">

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js Thu Feb 23 04:43:16 2017
@@ -74,7 +74,7 @@ function roomReload(event, ui) {
 }
 function roomClosed(jqEvent, msg) {
 	roomUnload();
-	$(".room.container").remove();
+	$(".room.holder").remove();
 	$("#chatPanel").remove();
 	var dlg = $('#disconnected-dlg');
 	dlg.dialog({

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js Thu Feb 23 04:43:16 2017
@@ -38,7 +38,7 @@ var Chat = function() {
 
 	function doneTyping () {
 		typingTimer = null;
-		chatActivity('typing_stop', $('.room.container').data('room-id'));
+		chatActivity('typing_stop', $('.room.box').data('room-id'));
 	}
 	function emtClick(emoticon) {
 		var editor = $('#chatMessage .wysiwyg-editor');
@@ -102,7 +102,7 @@ var Chat = function() {
 				}
 			});
 			$('#chatMessage').off().on('input propertychange paste', function () {
-				var room = $('.room.container');
+				var room = $('.room.box');
 				if (room.length) {
 					if (!!typingTimer) {
 						clearTimeout(typingTimer);

Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css?rev=1784082&r1=1784081&r2=1784082&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css Thu Feb 23 04:43:16 2017
@@ -22,7 +22,7 @@
 .room.holder {
 	width: 100%;
 }
-.room.container {
+.room.box {
 	height: 100%;
 }
 .ui-icon.room.menu.exit {