zouxuan 5 years ago
parent
commit
9a16788f92

+ 2 - 10
edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/IMHelper.java

@@ -323,7 +323,6 @@ public class IMHelper {
         boolean isMaster = true;
 
         int size = roomMembers.size();
-        float y = -0.2f;
         float x = -0.2f;
         int num = 1;
         for (int i = 0; i < size; i++) {
@@ -331,17 +330,14 @@ public class IMHelper {
             JSONObject video = new JSONObject();
             video.put("userId",roomMember.getUid());
             video.put("streamId",roomMember.getUid() + "_RongCloudRTC");
-            if((roomMember.getRole() == 3 && isMaster) || (i == size - 1 && isMaster) || (i == 9 && isMaster)){
+            if((roomMember.getRole() == 3 && isMaster) || (i == size - 1 && isMaster) || (i == 5 && isMaster)){
                 video.put("x",0);
                 video.put("y",0);
                 if(size == 1){
                     video.put("width",1);
                     video.put("height",1);
-                }else if(size <= 6){
-                    video.put("width",0.8);
-                    video.put("height",1);
                 }else {
-                    video.put("width",0.8);
+                    video.put("width",1);
                     video.put("height",0.8);
                 }
                 isMaster = false;
@@ -349,10 +345,6 @@ public class IMHelper {
                 video.put("width",0.2);
                 video.put("height",0.2);
                 if(num <= 5){
-                    y = y + 0.2f;
-                    video.put("x",0.8);
-                    video.put("y",y);
-                }else if(num <= 9){
                     x = x + 0.2f;
                     video.put("x",x);
                     video.put("y",0.8);

+ 1 - 1
edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -1284,7 +1284,7 @@ public class RoomServiceImpl implements RoomService {
 
     @Override
     public void publishMessage(PublishMessageDto publishMessageDto) throws Exception {
-        IMApiResultInfo apiResultInfo = imHelper.publishMessage(publishMessageDto.getUserId(),
+        imHelper.publishMessage(publishMessageDto.getUserId(),
                 publishMessageDto.getRoomId(),
                 publishMessageDto.getMemberChangedMessage(),
                 publishMessageDto.getIncludeSender());