|
@@ -251,7 +251,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
userResult.setCamera(true);
|
|
|
userResult.setHandUpOn(false);
|
|
|
userResult.setJoinTime(curTime);
|
|
|
- saveRoomMember(userId, sysUser.getAvatar(), userName, roomId, roleEnum.getValue(), curTime);
|
|
|
+ saveRoomMember(userId, sysUser.getAvatar(), userName, roomId, roleEnum.getValue(), curTime, !muteAll);
|
|
|
} else {
|
|
|
roleEnum = RoleEnum.getEnumByValue(member.getRole());
|
|
|
if (roleEnum == RoleTeacher) {
|
|
@@ -484,7 +484,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
roleEnum = RoleStudent;
|
|
|
userName = sysUser.getUsername();
|
|
|
}
|
|
|
- member = saveRoomMember(userId, sysUser.getAvatar(), userName, roomId, roleEnum.getValue(), curTime);
|
|
|
+ member = saveRoomMember(userId, sysUser.getAvatar(), userName, roomId, roleEnum.getValue(), curTime, !courseSchedule.getMuteAll());
|
|
|
}
|
|
|
return member;
|
|
|
}
|
|
@@ -651,7 +651,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
roomDao.save(room);
|
|
|
}
|
|
|
|
|
|
- public RoomMember saveRoomMember(String userId, String headUrl, String userName, String roomId, int role, Date joinTime) {
|
|
|
+ public RoomMember saveRoomMember(String userId, String headUrl, String userName, String roomId, int role, Date joinTime, Boolean muteAll) {
|
|
|
RoomMember roomMember = new RoomMember();
|
|
|
roomMember.setUid(userId);
|
|
|
roomMember.setName(userName);
|
|
@@ -661,6 +661,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
roomMember.setJoinDt(joinTime);
|
|
|
roomMember.setMusicMode(false);
|
|
|
roomMember.setHeadUrl(headUrl);
|
|
|
+ roomMember.setMic(!muteAll);
|
|
|
roomMemberDao.save(roomMember);
|
|
|
return roomMember;
|
|
|
}
|