|
@@ -563,9 +563,9 @@ public class RoomServiceImpl implements RoomService {
|
|
|
.action(EMemberAction.JOIN.getValue());
|
|
|
|
|
|
if (roleEnum == RoleTeacher) {
|
|
|
- action.role(EMemberRole.TEACHER.getValue());
|
|
|
+ action.role(roleEnum.getValue());
|
|
|
} else {
|
|
|
- action.role(EMemberRole.STUDENT.getValue());
|
|
|
+ action.role(roleEnum.getValue());
|
|
|
}
|
|
|
action.handUpOn(roomMember.isHand())
|
|
|
.microphone(playMidi)
|
|
@@ -715,7 +715,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
RTCRoomMessage.MessageContent messageContent = RTCRoomMessage.MessageContent
|
|
|
.builder()
|
|
|
.action(EMemberAction.LEAVE.getValue())
|
|
|
- .role(EMemberRole.STUDENT.getValue())
|
|
|
+ .role(roleEnum.getValue())
|
|
|
.handUpOn(false)
|
|
|
.timestamp(System.currentTimeMillis())
|
|
|
.microphone(false)
|
|
@@ -723,10 +723,6 @@ public class RoomServiceImpl implements RoomService {
|
|
|
.sendUserInfo(getSendUser(userId, roleEnum))
|
|
|
.build();
|
|
|
|
|
|
- if (roleEnum == RoleTeacher) {
|
|
|
- messageContent.setRole(EMemberRole.TEACHER.getValue());
|
|
|
- }
|
|
|
-
|
|
|
RTCRoomMessage roomMessage = RTCRoomMessage.builder()
|
|
|
.objectName(RTCRoomMessage.MEMBER_CHANGE_MESSAGE)
|
|
|
.toChatRoomId(roomId)
|