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

Send RequestBreakoutJoinUrl from client to server.

Browse Source
This commit is contained in:
Ghazi Triki 2016-01-12 20:18:23 +01:00
parent c0055c848f
commit 48844648ee
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageDecoder.scala
View File

@ -60,6 +60,9 @@ object JsonMessageDecoder {
case CreateBreakoutRoomsRequest.NAME => {
msg.payload.convertTo[CreateBreakoutRooms]
}
case RequestBreakoutJoinURL.NAME => {
msg.payload.convertTo[RequestBreakoutJoinURLInMessage]
}
case _ => throw MessageProcessException("Cannot parse JSON message: [" + msg + "]")
}
}

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
View File

@ -4,6 +4,7 @@ import spray.json.{ DefaultJsonProtocol, JsValue, JsString, DeserializationExcep
import org.bigbluebutton.core.api.BreakoutRoomInPayload
import org.bigbluebutton.core.api.CreateBreakoutRooms
import org.bigbluebutton.core.api.InMessageHeader
import org.bigbluebutton.core.api.RequestBreakoutJoinURLInMessage
object UserMessagesProtocol extends DefaultJsonProtocol {
/*
@ -28,6 +29,7 @@ object UserMessagesProtocol extends DefaultJsonProtocol {
implicit val breakoutRoomInPayloadFormat = jsonFormat2(BreakoutRoomInPayload)
implicit val createBreakoutRoomsFormat = jsonFormat3(CreateBreakoutRooms)
implicit val requestBreakoutJoinURLInMessageFormat = jsonFormat3(RequestBreakoutJoinURLInMessage)
implicit val inMsgHeaderFormat = jsonFormat1(InMessageHeader)
implicit val outMsgHeaderFormat = jsonFormat1(OutMsgHeader)
implicit val outMsgEnvelopeHeaderFormat = jsonFormat2(OutMsgEnvelopeHeader)

14
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
View File

@ -18,6 +18,10 @@
*/
package org.bigbluebutton.red5.service;
import org.bigbluebutton.messages.CreateBreakoutRoomsRequest;
import org.bigbluebutton.messages.EndAllBreakoutRoomsRequest;
import org.bigbluebutton.messages.ListenInOnBreakout;
import org.bigbluebutton.messages.RequestBreakoutJoinURL;
import org.bigbluebutton.red5.pubsub.MessagePublisher;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@ -35,21 +39,21 @@ public class BreakoutRoomService extends AbstractService {
public void createBreakoutRooms(String jsonMessage) {
red5GW.createBreakoutRooms(addHeaderToMessage(jsonMessage,
"CreateBreakoutRoomsRequest"));
CreateBreakoutRoomsRequest.NAME));
}
public void requestBreakoutJoinURL(String jsonMessage) {
public void requestBreakoutJoinUrl(String jsonMessage) {
red5GW.requestBreakoutJoinURL(addHeaderToMessage(jsonMessage,
"RequestBreakoutJoinURL"));
RequestBreakoutJoinURL.NAME));
}
public void listenInOnBreakout(String jsonMessage) {
red5GW.listenInOnBreakout(addHeaderToMessage(jsonMessage,
"ListenInOnBreakout"));
ListenInOnBreakout.NAME));
}
public void endAllBreakoutRooms(String jsonMessage) {
red5GW.endAllBreakoutRooms(addHeaderToMessage(jsonMessage,
"EndAllBreakoutRooms"));
EndAllBreakoutRoomsRequest.NAME));
}
}

16
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/RoomActionsRenderer.mxml
View File

@ -5,25 +5,27 @@
verticalAlign="middle">
<mx:Script>
<![CDATA[
import com.asfusion.mate.events.Dispatcher;
import org.bigbluebutton.common.Images;
import org.bigbluebutton.main.events.BreakoutRoomEvent;
import org.bigbluebutton.util.i18n.ResourceUtil;
private var globalDispatch:Dispatcher = new Dispatcher();
[Bindable]
private var images:Images = new Images();
protected function listenToBreakoutRoom(event:MouseEvent):void {
var e:BreakoutRoomEvent=new BreakoutRoomEvent(BreakoutRoomEvent.LISTEN_IN);
e.breakoutId=data as String;
dispatchEvent(e);
var e:BreakoutRoomEvent = new BreakoutRoomEvent(BreakoutRoomEvent.LISTEN_IN);
e.breakoutId = data.breakoutId as String;
globalDispatch.dispatchEvent(e);
}
protected function requestBreakoutJoinUrl(event:MouseEvent):void {
var e:BreakoutRoomEvent=new BreakoutRoomEvent(BreakoutRoomEvent.REQUEST_BREAKOUT_JOIN_URL);
e.breakoutId=data as String;
dispatchEvent(e);
var e:BreakoutRoomEvent = new BreakoutRoomEvent(BreakoutRoomEvent.REQUEST_BREAKOUT_JOIN_URL);
e.breakoutId = data.breakoutId as String;
globalDispatch.dispatchEvent(e);
}
]]>
</mx:Script>