Author: solomax
Date: Wed Mar 15 05:38:48 2017
New Revision: 1786982
URL: http://svn.apache.org/viewvc?rev=1786982&view=rev
Log:
[OPENMEETINGS-1553] more work on mobile client
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1786982&r1=1786981&r2=1786982&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Wed Mar 15 05:38:48 2017
@@ -335,7 +335,13 @@ public class MobileService {
* @param userId - redundant userId
*/
public Map<String, Object> roomConnect(String SID, Long userId) {
- return new HashMap<>();
+ // publicSid is changed on mobile room connect
+ IConnection current = Red5.getConnectionLocal();
+ Client c =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
+ Map<String, Object> result = new HashMap<>();
+ result.put("publicSid", c.getPublicSID());
+ result.put("broadCastId", c.getBroadCastID());
+ return result;
}
public Map<String, Object> updateAvMode(String avMode, String width,
String height, Integer interviewPodId) {
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=1786982&r1=1786981&r2=1786982&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
Wed Mar 15 05:38:48 2017
@@ -794,7 +794,7 @@ public class ScopeApplicationAdapter ext
rcl.setAvsettings("n");
sessionManager.updateClientByStreamId(streamId, rcl,
false, null);
// Notify all clients of the same scope (room)
- sendMessageToCurrentScope("closeStream", rcl, false);
+ sendMessageToCurrentScope("closeStream", rcl,
rcl.isMobile());
} catch (Exception e) {
log.error("[streamBroadcastClose]", e);
}
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1786982&r1=1786981&r2=1786982&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Wed Mar 15 05:38:48 2017
@@ -335,7 +335,13 @@ public class MobileService {
* @param userId - redundant userId
*/
public Map<String, Object> roomConnect(String SID, Long userId) {
- return new HashMap<>();
+ // publicSid is changed on mobile room connect
+ IConnection current = Red5.getConnectionLocal();
+ Client c =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
+ Map<String, Object> result = new HashMap<>();
+ result.put("publicSid", c.getPublicSID());
+ result.put("broadCastId", c.getBroadCastID());
+ return result;
}
public Map<String, Object> updateAvMode(String avMode, String width,
String height, Integer interviewPodId) {
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=1786982&r1=1786981&r2=1786982&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
Wed Mar 15 05:38:48 2017
@@ -794,7 +794,7 @@ public class ScopeApplicationAdapter ext
rcl.setAvsettings("n");
sessionManager.updateClientByStreamId(streamId, rcl,
false, null);
// Notify all clients of the same scope (room)
- sendMessageToCurrentScope("closeStream", rcl, false);
+ sendMessageToCurrentScope("closeStream", rcl,
rcl.isMobile());
} catch (Exception e) {
log.error("[streamBroadcastClose]", e);
}
