zouxuan %!s(int64=5) %!d(string=hai) anos
pai
achega
25506a90b7

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

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

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

@@ -201,7 +201,7 @@ public class RoomServiceImpl implements RoomService {
             }
             userResult.setMicrophone(true);
             userResult.setCamera(!isDisableCamera);
-            userResult.setHandUp(false);
+            userResult.setHandUpOn(false);
             userResult.setJoinTime(curTime);
             log.info("user join the room: roomId={} , userId={}, roleEnum={}, memCount: {}", roomId, userId, roleEnum, count);
         } else {
@@ -213,7 +213,7 @@ public class RoomServiceImpl implements RoomService {
 //            roomMemberDao.updateCameraByRidAndUid(roomId, userId, !isDisableCamera);
             userResult.setCamera(roomMember.isCamera());
             handUp = roomMember.isHand();
-            userResult.setHandUp(roomMember.isHand());
+            userResult.setHandUpOn(roomMember.isHand());
             userResult.setJoinTime(roomMember.getJoinDt());
             log.info("user exist in the room: roomId={} , userId={}, use the last role={}", roomId, userId, roleEnum);
         }