Merge remote-tracking branch 'origin/master'

mec-im/src/main/java/com/ym/pojo/RoomResult.java

@@ -32,6 +32,7 @@ public class RoomResult {
         Date joinTime;
         boolean camera;
         boolean microphone;
+        boolean handUp;
         CustomMessage playMidiJson;
     }
 
@@ -51,6 +52,7 @@ public class RoomResult {
             result.setMicrophone(member.isMic());
             result.setCamera(member.isCamera());
             result.setUserName(member.getName());
+            result.setHandUp(member.isHand());
             result.setPlayMidiJson(JSONObject.parseObject(midiMap.get(Integer.parseInt(member.getUid())),CustomMessage.class));
             members.add(result);
         }

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

@@ -192,6 +192,7 @@ public class RoomServiceImpl implements RoomService {
             }
             userResult.setMicrophone(true);
             userResult.setCamera(!isDisableCamera);
+            userResult.setHandUp(false);
             userResult.setJoinTime(curTime);
             log.info("user join the room: roomId={} , userId={}, roleEnum={}, memCount: {}", roomId, userId, roleEnum, count);
         } else {
@@ -199,6 +200,7 @@ public class RoomServiceImpl implements RoomService {
             roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
 //            roomMemberDao.updateCameraByRidAndUid(roomId, userId, !isDisableCamera);
             userResult.setCamera(roomMember.isCamera());
+            userResult.setHandUp(roomMember.isHand());
             userResult.setJoinTime(roomMember.getJoinDt());
             log.info("user exist in the room: roomId={} , userId={}, use the last role={}", roomId, userId, roleEnum);
         }
@@ -626,7 +628,7 @@ public class RoomServiceImpl implements RoomService {
             imHelper.publishMessage(userId, roomId, displayMessage);
             log.info("change display to screen: roomId={}, display={}", roomId, display);
         } else {
-            display += "?userId=" + "?uri=" + uri;
+            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");