update

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

@@ -247,14 +247,13 @@ public class IMHelper {
         }
         JSONObject paramJson = new JSONObject();
 
-
-        /*String sessionId = redisTemplate.opsForValue().get("sessionId:" + roomId);
+        String sessionId = redisTemplate.opsForValue().get("sessionId:" + roomId);
         if(StringUtils.isEmpty(sessionId)){
             sessionId = roomQuery(roomId);
             redisTemplate.opsForValue().set("sessionId:" + roomId,sessionId);
-        }*/
-
-        paramJson.put("sessionId",roomQuery(roomId));
+        }
+        paramJson.put("sessionId",sessionId);
+//        paramJson.put("sessionId",roomQuery(roomId));
 
         JSONObject config = new JSONObject();
         config.put("mode",3);
@@ -298,13 +297,13 @@ public class IMHelper {
             throw new IllegalArgumentException("Paramer 'roomMembers' is can not be null");
         }
         JSONObject paramJson = new JSONObject();
-        /*String sessionId = redisTemplate.opsForValue().get("sessionId:" + roomId);
+        String sessionId = redisTemplate.opsForValue().get("sessionId:" + roomId);
         if(StringUtils.isEmpty(sessionId)){
             sessionId = roomQuery(roomId);
             redisTemplate.opsForValue().set("sessionId:" + roomId,sessionId);
-        }*/
-
-        paramJson.put("sessionId",roomQuery(roomId));
+        }
+        paramJson.put("sessionId",sessionId);
+//        paramJson.put("sessionId",roomQuery(roomId));
         paramJson.put("mixLayout",1);
         paramJson.put("renderMode",1);
         paramJson.put("hostUserId","");
@@ -323,21 +322,6 @@ public class IMHelper {
         JSONArray videos = new JSONArray();
         boolean isMaster = true;
 
-        List<RoomMember> students = roomMembers.stream().filter(e -> e.getRole() == 3).collect(Collectors.toList());
-        if(students != null && students.size() > 0){
-            RoomMember roomMember = students.get(0);
-            JSONObject video = new JSONObject();
-            video.put("userId",roomMember.getUid());
-            video.put("streamId",roomMember.getUid() + "_RongCloudRTC");
-            video.put("x",0);
-            video.put("y",0);
-            video.put("width",1);
-            video.put("height",1);
-            videos.add(video);
-            students.remove(0);
-        }
-        List<RoomMember> teachers = roomMembers.stream().filter(e -> e.getRole() != 3).collect(Collectors.toList());
-        teachers.addAll(students);
         int size = roomMembers.size();
         float y = -0.2f;
         float x = -0.2f;
@@ -365,11 +349,11 @@ public class IMHelper {
                 video.put("width",0.2);
                 video.put("height",0.2);
                 if(num <= 5){
-                    y += 0.2;
+                    y = y + 0.2f;
                     video.put("x",0.8);
                     video.put("y",y);
                 }else if(num <= 9){
-                    x += 0.2;
+                    x = x + 0.2f;
                     video.put("x",x);
                     video.put("y",0.8);
                 }else {
@@ -395,12 +379,13 @@ public class IMHelper {
             throw new IllegalArgumentException("Paramer 'roomId' is required");
         }
         JSONObject paramJson = new JSONObject();
-        /*String sessionId = redisTemplate.opsForValue().get("sessionId:" + roomId);
+        String sessionId = redisTemplate.opsForValue().get("sessionId:" + roomId);
         if(StringUtils.isEmpty(sessionId)){
             sessionId = roomQuery(roomId);
             redisTemplate.opsForValue().set("sessionId:" + roomId,sessionId);
-        }*/
-        paramJson.put("sessionId",roomQuery(roomId));
+        }
+        paramJson.put("sessionId",sessionId);
+//        paramJson.put("sessionId",roomQuery(roomId));
 
         String body = paramJson.toJSONString();
 

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

@@ -120,7 +120,7 @@ public class RoomServiceImpl implements RoomService {
             }else {
                 roleEnum = Student;
             }
-            saveRoomMember(userId,sysUser.getAvatar(), realName, roomId, roleEnum.getValue(),roomMember.isCamera(), curTime,registrationId);
+            saveRoomMember(userId,sysUser.getAvatar(), realName, roomId, roleEnum.getValue(),true, curTime,registrationId);
         } else {
             roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
         }
@@ -128,7 +128,7 @@ public class RoomServiceImpl implements RoomService {
         MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Join, userId, roleEnum.getValue());
         msg.setTimestamp(curTime);
         msg.setUserName(realName);
-        msg.setCamera(roomMember.isCamera());
+        msg.setCamera(true);
         imHelper.publishMessage(userId, roomId, msg);
 
         List<UserInfo> userInfoList = userDao.findByUid(userId);