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 2019/07/30 04:32:49 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2091] video
window is small for audio-only users
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new cb65e5e [OPENMEETINGS-2091] video window is small for audio-only users
cb65e5e is described below
commit cb65e5e58540fae59d544abbdc49b76ddd84f10a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Jul 30 11:32:39 2019 +0700
[OPENMEETINGS-2091] video window is small for audio-only users
---
.../openmeetings/db/dao/server/SessiondataDao.java | 15 +++--------
.../openmeetings/db/entity/basic/Client.java | 9 +++----
.../org/apache/openmeetings/web/room/raw-video.js | 9 ++++---
.../org/apache/openmeetings/userdata/TestAuth.java | 29 ++++++++++++++++------
4 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
index 1ace9eb..fd67e9b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
@@ -20,13 +20,11 @@ package org.apache.openmeetings.db.dao.server;
import static java.util.UUID.randomUUID;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.slf4j.Logger;
@@ -99,7 +97,7 @@ public class SessiondataDao {
List<Sessiondata> sessions = em.createNamedQuery("getSessionById", Sessiondata.class)
.setParameter("sessionId", String.format("%%%s%%", sid)).getResultList();
- if (sessions == null || sessions.isEmpty()) {
+ if (sessions.isEmpty()) {
return null;
}
Sessiondata sd = sessions.get(0);
@@ -129,14 +127,9 @@ public class SessiondataDao {
* @return - the list of all expired session data
*/
private List<Sessiondata> getSessionToDelete(Date refreshed) {
- try {
- TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionToDelete", Sessiondata.class);
- query.setParameter("refreshed", refreshed);
- return query.getResultList();
- } catch (Exception ex2) {
- log.error("[getSessionToDelete]: ", ex2);
- }
- return new ArrayList<>();
+ return em.createNamedQuery("getSessionToDelete", Sessiondata.class)
+ .setParameter("refreshed", refreshed)
+ .getResultList();
}
/**
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 97b7427..b0bdcb9 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
@@ -457,14 +457,13 @@ public class Client implements IDataProviderEntity, IWsClient {
} else {
sactivities.addAll(Arrays.asList(activities));
}
- if (StreamType.WEBCAM == type) {
- boolean interview = room != null && Room.Type.interview == room.getType();
- this.swidth = interview ? 320 : width;
- this.sheight = interview ? 260 : height;
- }
if (StreamType.SCREEN == type) {
this.swidth = 800;
this.sheight = 600;
+ } else if (StreamType.WEBCAM == type) {
+ boolean interview = room != null && Room.Type.interview == room.getType();
+ this.swidth = interview ? 320 : width;
+ this.sheight = interview ? 260 : height;
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index efddec4..951133e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -23,15 +23,13 @@ var Video = (function() {
_resizeDlgArea(pw, ph);
}
function _resizeLm(h) {
- if (!!lm) {
- lm.attr('height', h).height(h);
- }
+ lm && lm.attr('height', h).height(h);
return lm;
}
function _resize(w, h) {
vc.width(w).height(h);
_resizeLm(h - 10);
- video.width(w).height(h);
+ video && video.width(w).height(h);
}
function _micActivity(level) {
const speaks = level > 5;
@@ -289,6 +287,7 @@ var Video = (function() {
v.on('dialogresizestop', function(event, ui) {
const w = ui.size.width - 2
, h = ui.size.height - t.height() - 4 - (f.is(':visible') ? f.height() : 0);
+ size = {width: w, height: h};
_resize(w, h);
});
if (VideoUtil.isSharing(sd)) {
@@ -422,6 +421,8 @@ var Video = (function() {
_cleanup();
const _id = VideoUtil.getVid(sd.uid);
const hasVideo = VideoUtil.hasVideo(sd) || VideoUtil.isSharing(sd) || VideoUtil.isRecording(sd);
+ _resizeDlgArea(hasVideo ? size.width : 120
+ , hasVideo ? size.height : 90);
video = $(hasVideo ? '<video>' : '<audio>').attr('id', 'vid' + _id)
.width(vc.width()).height(vc.height())
.prop('autoplay', true).prop('controls', false);
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
index 2a603bb..be166aa 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
@@ -18,10 +18,13 @@
*/
package org.apache.openmeetings.userdata;
+import static java.util.UUID.randomUUID;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.entity.server.Sessiondata;
-import org.apache.openmeetings.util.crypt.CryptProvider;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,15 +33,25 @@ public class TestAuth extends AbstractJUnitDefaults {
private SessiondataDao sessionDao;
@Test
- public void testTestAuth() {
- Sessiondata sessionData = sessionDao.create(1L, 1L);
-
- System.out.println("sessionData: " + sessionData.getSessionId());
-
- String tTemp = CryptProvider.get().hash("test");
+ public void test() {
+ Sessiondata sd = sessionDao.create(1L, 1L);
+ assertNotNull(sd);
+ sessionDao.clearSessionTable(-1L);
+ }
- System.out.println("tTemp: " + tTemp);
+ @Test
+ public void testNotExistent() {
+ Sessiondata sd = sessionDao.check(randomUUID().toString());
+ assertNotNull(sd);
+ }
+ @Test
+ public void testFind1() {
+ assertNull(sessionDao.find(null));
}
+ @Test
+ public void testFind2() {
+ assertNull(sessionDao.find(randomUUID().toString()));
+ }
}