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

Merge pull request #4136 from ritzalam/put-back-old-messages

Browse Source 
Fix compile issue with bbb-video and video-broadcast app
This commit is contained in:
Richard Alam 2017-07-24 21:05:31 -04:00 committed by GitHub
commit 14218464b9
2 changed files with 116 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserSharedWebcamMessage.java Executable file
View File

@ -0,0 +1,57 @@
package org.bigbluebutton.common.messages;
import java.util.HashMap;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
public class UserSharedWebcamMessage implements ISubscribedMessage {
public static final String USER_SHARED_WEBCAM = "user_shared_webcam_message";
public static final String VERSION = "0.0.1";
public final String meetingId;
public final String userId;
public final String stream;
public UserSharedWebcamMessage(String meetingId, String userId, String stream) {
this.meetingId = meetingId;
this.userId = userId;
this.stream = stream;
}
public String toJson() {
HashMap<String, Object> payload = new HashMap<String, Object>();
payload.put(Constants.MEETING_ID, meetingId);
payload.put(Constants.USER_ID, userId);
payload.put(Constants.STREAM, stream);
java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_SHARED_WEBCAM, VERSION, null);
return MessageBuilder.buildJson(header, payload);
}
public static UserSharedWebcamMessage fromJson(String message) {
JsonParser parser = new JsonParser();
JsonObject obj = (JsonObject) parser.parse(message);
if (obj.has("header") && obj.has("payload")) {
JsonObject header = (JsonObject) obj.get("header");
JsonObject payload = (JsonObject) obj.get("payload");
if (header.has("name")) {
String messageName = header.get("name").getAsString();
if (USER_SHARED_WEBCAM.equals(messageName)) {
if (payload.has(Constants.MEETING_ID)
&& payload.has(Constants.USER_ID)
&& payload.has(Constants.STREAM)) {
String id = payload.get(Constants.MEETING_ID).getAsString();
String userid = payload.get(Constants.USER_ID).getAsString();
String stream = payload.get(Constants.STREAM).getAsString();
return new UserSharedWebcamMessage(id, userid, stream);
}
}
}
}
return null;
}
}

59
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/UserUnshareWebcamRequestMessage.java Executable file
View File

@ -0,0 +1,59 @@
package org.bigbluebutton.common.messages;
import java.util.HashMap;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
public class UserUnshareWebcamRequestMessage implements ISubscribedMessage {
public static final String USER_UNSHARE_WEBCAM_REQUEST = "user_unshare_webcam_request_message";
public static final String VERSION = "0.0.1";
public final String meetingId;
public final String userId;
public final String stream;
public UserUnshareWebcamRequestMessage(String meetingId, String userId, String stream) {
this.meetingId = meetingId;
this.userId = userId;
this.stream = stream;
}
public String toJson() {
HashMap<String, Object> payload = new HashMap<String, Object>();
payload.put(Constants.MEETING_ID, meetingId);
payload.put(Constants.USER_ID, userId);
payload.put(Constants.STREAM, stream);
java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_UNSHARE_WEBCAM_REQUEST, VERSION, null);
return MessageBuilder.buildJson(header, payload);
}
public static UserUnshareWebcamRequestMessage fromJson(String message) {
JsonParser parser = new JsonParser();
JsonObject obj = (JsonObject) parser.parse(message);
if (obj.has("header") && obj.has("payload")) {
JsonObject header = (JsonObject) obj.get("header");
JsonObject payload = (JsonObject) obj.get("payload");
if (header.has("name")) {
String messageName = header.get("name").getAsString();
if (USER_UNSHARE_WEBCAM_REQUEST.equals(messageName)) {
if (payload.has(Constants.MEETING_ID)
&& payload.has(Constants.USER_ID)
&& payload.has(Constants.STREAM)) {
String id = payload.get(Constants.MEETING_ID).getAsString();
String userid = payload.get(Constants.USER_ID).getAsString();
String stream = payload.get(Constants.STREAM).getAsString();
return new UserUnshareWebcamRequestMessage(id, userid, stream);
}
}
}
}
return null;
}
}