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

reuse hover string from other ds method; skip chat notific on ds start/end

Browse Source
This commit is contained in:
Anton Georgiev 2015-12-14 20:45:46 +00:00
parent 7b15231cdb
commit 09a870296d
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/DeskShareMessageSender.java
View File

@ -13,7 +13,7 @@ import com.google.gson.JsonParser;
public class DeskShareMessageSender {
private ConnectionInvokerService service;
public DeskShareMessageSender(ConnectionInvokerService service) {
this.service = service;
}
@ -45,31 +45,14 @@ public class DeskShareMessageSender {
private void processDeskShareNotifyViewersRTMPEventMessage(DeskShareNotifyViewersRTMPEventMessage msg) {
Map<String, Object> messageInfo = new HashMap<String, Object>();
System.out.println("RedisPubSubMessageHandler - " + msg.toJson());
System.out.println("RedisPubSubMessageHandler - processDeskShareNotifyViewersRTMPEventMessage \n" +msg.streamPath+ "\n");
messageInfo.put(ChatKeyUtil.CHAT_TYPE, "PUBLIC_CHAT");
messageInfo.put(ChatKeyUtil.FROM_USERID, "enm6bgnif0d4_2");
messageInfo.put(ChatKeyUtil.FROM_USERNAME, "User 4526544");
messageInfo.put(ChatKeyUtil.TO_USERID, "public_chat_userid");
messageInfo.put(ChatKeyUtil.TO_USERNAME, "public_chat_username");
messageInfo.put(ChatKeyUtil.FROM_TIME, "1.435851039645E12");
messageInfo.put(ChatKeyUtil.FROM_TZ_OFFSET, "240");
messageInfo.put(ChatKeyUtil.FROM_COLOR, "0");
messageInfo.put(ChatKeyUtil.MESSAGE, "BROADCASTING_RTMP:"+msg.broadcasting + " " + msg.streamPath
+ " vw=" + msg.vw + " vh=" + msg.vh);
BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "ChatReceivePublicMessageCommand", messageInfo);
messageInfo.put("rtmpUrl", msg.streamPath);
messageInfo.put("broadcasting", msg.broadcasting);
messageInfo.put("width", msg.vw);
messageInfo.put("height", msg.vh);
BroadcastClientMessage m = new BroadcastClientMessage(msg.meetingId, "DeskShareRTMPBroadcastNotification", messageInfo);
service.sendMessage(m);
Map<String, Object> messageInfo2 = new HashMap<String, Object>();
messageInfo2.put("rtmpUrl", msg.streamPath);
messageInfo2.put("broadcasting", msg.broadcasting);
messageInfo2.put("width", msg.vw);
messageInfo2.put("height", msg.vh);
BroadcastClientMessage m2 = new BroadcastClientMessage(msg.meetingId, "DeskShareRTMPBroadcastNotification", messageInfo2);
service.sendMessage(m2);
}
}

10
bigbluebutton-client/src/org/bigbluebutton/modules/webrtcDeskshare/view/components/ToolbarButton.mxml
View File

@ -24,7 +24,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xmlns:mate="http://mate.asfusion.com/"
styleName="deskshareDefaultButtonStyle"
height="24"
toolTip="{ResourceUtil.getInstance().getString('bbb.toolbar.webrtcDeskshare.toolTip.start')}"
toolTip="{ResourceUtil.getInstance().getString('bbb.toolbar.deskshare.toolTip.start')}"
click="startDeskShare()"
mouseOver = "mouseOverHandler(event)"
mouseOut = "mouseOutHandler(event)"
@ -65,14 +65,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
_currentState = ON_STATE;
this.selected = true;
this.enabled = true;
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.webrtcDeskshare.toolTip.stop');
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.deskshare.toolTip.stop');
styleName="deskshareOnButtonStyle"
}
else {
_currentState = OFF_STATE;
this.selected = false;
this.enabled = true;
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.webrtcDeskshare.toolTip.start');
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.deskshare.toolTip.start');
styleName="deskshareDefaultButtonStyle"
}
}
@ -89,7 +89,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if(_currentState == OFF_STATE) {
this.selected = true;
this.enabled = true;
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.webrtcDeskshare.toolTip.stop');
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.deskshare.toolTip.stop');
styleName="deskshareOnButtonStyle"
_currentState = ON_STATE;
dispatchEvent(new ShareEvent(ShareEvent.START_SHARING));
@ -98,7 +98,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
this.selected = false;
this.enabled = true;
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.webrtcDeskshare.toolTip.start');
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.deskshare.toolTip.start');
styleName="deskshareDefaultButtonStyle"
_currentState = OFF_STATE;