BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- listen in on breakout room works but there's sometimes a glitch on transferring

Browse Source 
the moderator from breakout room to parent meeting.
This commit is contained in:
Richard Alam 2017-08-03 20:17:26 -07:00
parent 279d3797ef
commit 13ef71c59d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
View File

@ -157,7 +157,11 @@ package org.bigbluebutton.main.model.users
}
public function onMessageFromServer2x(messageName:String, msg:String):void {
if (messageName != "SendCursorPositionEvtMsg") {
if (messageName != "SendCursorPositionEvtMsg" &&
messageName != "UpdateBreakoutUsersEvtMsg" &&
messageName != "BreakoutRoomsTimeRemainingUpdateEvtMsg" &&
messageName != "UserTalkingVoiceEvtMsg" &&
messageName != "MeetingTimeRemainingUpdateEvtMsg") {
LOGGER.debug("onMessageFromServer2x - " + msg);
}
@ -167,8 +171,6 @@ package org.bigbluebutton.main.model.users
var msgName: String = header.name
LOGGER.debug("authTokenValid=" + LiveMeeting.inst().me.authTokenValid + " messageName=" + messageName);
if (!LiveMeeting.inst().me.authTokenValid && (messageName == "ValidateAuthTokenRespMsg")) {
handleValidateAuthTokenReply2x(body)
} else if (messageName == "validateAuthTokenTimedOut") {

2
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
View File

@ -67,7 +67,7 @@ package org.bigbluebutton.modules.users.services
}
public function onMessage(messageName:String, message:Object):void {
LOGGER.debug(" received message " + messageName);
//LOGGER.debug(" received message " + messageName);
switch (messageName) {
case "GetUsersMeetingRespMsg":

11
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindowEventHandler.as
View File

@ -158,10 +158,12 @@ package org.bigbluebutton.modules.users.views
public function handleUserJoinedVoiceConfEvent(userId: String):void {
var webUser: BBBUser2x = findUser(userId);
if (webUser != null) {
trace("****** WEB USER JOINED VOICE CONF " + userId);
addVoiceUserToWebUser(webUser);
} else {
var vu: VoiceUser2x = LiveMeeting.inst().voiceUsers.getUser(userId);
if (vu != null) {
trace("****** VOICE ONLY USER JOINED VOICE CONF " + userId);
addVoiceOnlyUser(users, vu);
}
}
@ -170,10 +172,12 @@ package org.bigbluebutton.modules.users.views
public function handleUserLeftVoiceConfEvent(userId: String):void {
var user: BBBUser2x = findUser(userId);
if (user != null) {
if (user != null && !user.voiceOnlyUser) {
trace("****** WEB USER LEFT VOICE CONF " + userId);
removeVoiceFromWebUser(users, user);
} else {
removeUser(userId, users);
trace("****** VOICE ONLY USER LEFT VOICE CONF " + userId);
removeUser(userId, users);
}
users.refresh();
}
@ -186,7 +190,6 @@ package org.bigbluebutton.modules.users.views
user.listenOnly = false;
user.voiceOnlyUser = false;
// We want to remove the user if it's already in the collection and re-add it.
removeUser(user.userId, users);
@ -209,7 +212,7 @@ package org.bigbluebutton.modules.users.views
buser.callingWith = vu.callingWith;
buser.talking = vu.talking;
buser.listenOnly = vu.listenOnly;
buser.voiceOnlyUser = vu.voiceOnlyUser;
buser.voiceOnlyUser = true;
// We want to remove the user if it's already in the collection and re-add it.
removeUser(buser.userId, users);