You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/08/25 17:20:31 UTC
openmeetings git commit: [OPENMEETINGS-1644] bg user profile image is
added to av window
Repository: openmeetings
Updated Branches:
refs/heads/master 2e073a782 -> 15b17b1da
[OPENMEETINGS-1644] bg user profile image is added to av window
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/15b17b1d
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/15b17b1d
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/15b17b1d
Branch: refs/heads/master
Commit: 15b17b1da117d66f7222363fa98adac710832390
Parents: 2e073a7
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Aug 26 00:20:22 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Aug 26 00:20:22 2017 +0700
----------------------------------------------------------------------
.../openmeetings/db/entity/basic/Client.java | 3 ++-
openmeetings-flash/src/main/flex/main.mxml | 20 +++++++++++++++++---
.../apache/openmeetings/web/room/RoomPanel.java | 3 +--
.../org/apache/openmeetings/web/room/room.js | 1 +
4 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/15b17b1d/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index 92d1504..3895cb0 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -443,7 +443,8 @@ public class Client implements IClient {
JSONObject u = new JSONObject();
if (user != null) {
JSONObject a = new JSONObject();
- u.put("firstName", user.getFirstname())
+ u.put("id", user.getId())
+ .put("firstName", user.getFirstname())
.put("lastName", user.getLastname())
.put("address", a);
if (user.getAddress() != null) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/15b17b1d/openmeetings-flash/src/main/flex/main.mxml
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/flex/main.mxml b/openmeetings-flash/src/main/flex/main.mxml
index 3c69a43..2d369ac 100644
--- a/openmeetings-flash/src/main/flex/main.mxml
+++ b/openmeetings-flash/src/main/flex/main.mxml
@@ -49,6 +49,7 @@
private var activities:Array = [];
private var activityTimer:Timer = new Timer(100);
private var active:Boolean = false;
+ private var userId:String = null;
[Bindable]
private var interview:Boolean = false;
@@ -97,6 +98,7 @@
micRate = getIntParam(params.micRate, 22);
video = new OmVideo(videoDisplay, params);
activities = params.av == null ? [] : params.av.split(',');
+ userId = params.userId;
switch (params.mode) {
case 'settings': {
ExternalInterface.addCallback("getDevices", function ():Object {
@@ -155,6 +157,7 @@
}
});
attachCamera(function ():void {
+ addImage(params.width, params.height);
video.resize(params.width, params.height);
video.reset();
var broadcastId:String = UIDUtil.createUID();
@@ -175,17 +178,27 @@
}
break;
case OmVideo.PLAY: {
+ addImage(params.width, params.height);
video.resize(params.width, params.height);
video.play(params.broadcastId); // TODO audio/video
}
break;
}
- ExternalInterface.addCallback("vidResize", function (width:int, height:int):void {
- video.resize(width, height);
- video.vidResize(width, height);
+ ExternalInterface.addCallback("vidResize", function (_width:int, _height:int):void {
+ userImage.width = _width;
+ userImage.height = _height;
+ video.resize(_width, _height);
+ video.vidResize(_width, _height);
});
}
+ private function addImage(_width:int, _height:int):void {
+ userImage.source = 'profile/' + userId + '?anti=' + new Date().time;
+ userImage.width = _width;
+ userImage.height = _height;
+ userImage.visible = true;
+ }
+
private function uncaughtError(e:UncaughtErrorEvent):void {
debug("Unexpected ERROR", e);
}
@@ -395,6 +408,7 @@
}
]]></fx:Script>
+ <s:Image id="userImage" visible="false" width="0" height="0" />
<mx:UIComponent id="videoDisplay" width="0" height="0" />
<s:Rect id="volumeRect" x="5" y="5" width="10" height="100" visible="false" />
<s:Label id="timerText" height="20" width="45" x="20" y="5" paddingLeft="5" paddingTop="5"
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/15b17b1d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index c3a5de2..e8eb4fd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -129,7 +129,6 @@ public class RoomPanel extends BasePanel {
, getUserId(), "0", r.getId()
, cp.getRemoteAddress()
, "" + r.getId());
- //TODO add all broadcasting clients
JSONObject options = VideoSettings.getInitJson(cp, "" + r.getId(), getClient().getSid());
options.put("interview", Room.Type.interview == r.getType());
options.put("showMicStatus", !r.getHiddenElements().contains(RoomElement.MicrophoneStatus));
@@ -564,7 +563,7 @@ public class RoomPanel extends BasePanel {
return;
}
if (!getClient().getUid().equals(c.getUid())) {
- handler.appendJavaScript(String.format("VideoManager.micActivity('%s', %s);", c.getUid(), obj.getBoolean("active")));
+ handler.appendJavaScript(String.format("if (!!VideoManager) {VideoManager.micActivity('%s', %s);}", c.getUid(), obj.getBoolean("active")));
}
}
break;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/15b17b1d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
index 5ddc669..635bf92 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
@@ -284,6 +284,7 @@ var Video = (function() {
o.height = c.height;
o.sid = c.sid;
o.uid = c.uid;
+ o.userId = c.user.id;
o.broadcastId = c.broadcastId;
swf = initVideo(vc, _id + '-swf', o);
swf.attr('width', _w).attr('height', _h);