You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2015/01/13 13:26:02 UTC

svn commit: r1651327 - /openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java

Author: vdegtyarev
Date: Tue Jan 13 12:26:02 2015
New Revision: 1651327

URL: http://svn.apache.org/r1651327
Log:
openmeetings - 954 : Mobile video is displayed correctly in the interview room.

Modified:
    openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java

Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java?rev=1651327&r1=1651326&r2=1651327&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java Tue Jan 13 12:26:02 2015
@@ -190,8 +190,27 @@ public class MobileService {
 	
 	public Map<String, Object> roomConnect(String SID, Long userId) {
 		Map<String, Object> result = new Hashtable<String, Object>();
+		boolean isInterview = false;
 		User u = userDao.get(userId);
 		Client c = scopeAdapter.setUsernameReconnect(SID, userId, u.getLogin(), u.getFirstname(), u.getLastname(), u.getPictureuri());
+		// TODO check interview room
+		Room r = roomDao.get(Long.parseLong(c.getScope()));
+		if (r.getRoomtype().getRoomtypes_id() == 4) {
+			int pods[] = {-1, -1};
+			for (Client rcl : sessionManager.getClientListByRoom(r.getRooms_id())) {
+				if (!rcl.getStreamid().equals(c.getStreamid()) 
+						&& rcl.getInterviewPodId() != null) {
+					pods[rcl.getInterviewPodId() - 1] = 1;
+				}
+			}
+			if (pods[0] < 0) { 
+				c.setInterviewPodId(1);
+			} else if (pods[1] < 0) {
+				c.setInterviewPodId(2);
+			} else {
+				isInterview = true;
+			}
+		}
 		 //TODO check if we need anything here
 		long broadcastId = scopeAdapter.getBroadCastId();
 		c.setSipTransport(true);
@@ -200,6 +219,7 @@ public class MobileService {
 		c.setBroadCastID(broadcastId);
 		c.setIsBroadcasting(true);
 		sessionManager.updateClientByStreamId(c.getStreamid(), c, false, null);
+		result.put("isInterview", isInterview);
 		result.put("broadcastId", broadcastId);
 
 		scopeAdapter.syncMessageToCurrentScope("addNewUser", c, false, false);