[OPENMEETINGS-1553] more work on mobile client
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6360e962 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6360e962 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6360e962 Branch: refs/heads/3.2.x Commit: 6360e962c0242a7b73e952697a40554ab3f241d6 Parents: a5d2b13 Author: Maxim Solodovnik <[email protected]> Authored: Wed Mar 15 05:38:48 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Mar 15 05:38:48 2017 +0000 ---------------------------------------------------------------------- .../org/apache/openmeetings/core/remote/MobileService.java | 8 +++++++- .../core/remote/red5/ScopeApplicationAdapter.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6360e962/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java index 8cbc78a..c3cb022 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java @@ -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) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6360e962/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java index c854997..b00e9a7 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java @@ -794,7 +794,7 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp 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); }
