shangke 2 лет назад
Родитель
Сommit
c5ad08d460
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

+ 2 - 2
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -593,7 +593,7 @@ public class RoomServiceImpl implements RoomService {
                 action.role(roleEnum.getValue());
             }
             action.handUpOn(roomMember.isHand())
-                    .microphone(playMidi)
+                    .microphone(!schedule.getMuteAll())
                     .timestamp(curTime.getTime())
                     .camera(true)
                     .sendUserInfo(getSendUser(userId,roleEnum));
@@ -1012,11 +1012,11 @@ public class RoomServiceImpl implements RoomService {
             display += "?userId=" + userId + "?uri=" + uri;
 //            CheckUtils.checkArgument(uri != null, "uri must't be null");
 //            CheckUtils.checkArgument(whiteboardDao.findByRidAndWbid(roomId, uri).size() > 0, "whiteboard not exist");
+            roomDao.updateDisplayByRid(roomId, display);
             if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(roomServiceProviter)) {
 
                 sendDisplayMessage(display, roomMember);
             } else {
-                roomDao.updateDisplayByRid(roomId, display);
                 DisplayMessage displayMessage = new DisplayMessage(display);
                 imHelper.publishMessage(userId, roomId, displayMessage);
             }