Merge branch 'feature/0414-trtc' into master_saas

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

@@ -2115,15 +2115,20 @@ public class RoomServiceImpl implements RoomService {
 
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
 
-        String roomServiceProviter = getRoomServiceProviter(roomId);
-        if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(roomServiceProviter)) {
-            // 获取RTC服务提供方
-            RTCRoomPluginService pluginService = rtcRoomPluginContext.getPluginService(TencentCloudRTCPlugin.PLUGIN_NAME);
-            // 腾讯云RTC服务
-
-            RTCRoomMessage.MessageContent messageContent = JSONObject.parseObject(content, RTCRoomMessage.MessageContent.class);
-            messageContent.setSendUserInfo(getSendUser(roomMember.getUid(),RoleEnum.getEnumByValue(roomMember.getRole())));
+        // 获取RTC服务提供方
+        RTCRoomPluginService pluginService = rtcRoomPluginContext.getPluginService(getRoomServiceProviter(roomId));
+        if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
 
+            // 腾讯云RTC服务
+            RTCRoomMessage.MessageContent messageContent = RTCRoomMessage.MessageContent
+                    .builder()
+                    .enable(customMessage.getEnable())
+                    .rate(customMessage.getRate())
+                    .customType(customMessage.getCustomType())
+                    .userId(customMessage.getUserId())
+                    .playVolume(customMessage.getPlayVolume())
+                    .sendUserInfo(getSendUser(roomMember.getUid(), RoleEnum.getEnumByValue(roomMember.getRole())))
+                    .build();
 
             RTCRoomMessage roomMessage = RTCRoomMessage.builder()
                     .objectName(RTCRoomMessage.PLAY_MIDI_MESSAGE)