|  | @@ -1258,7 +1258,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |                  .build();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          // 消息内容
 | 
	
		
			
				|  |  | -        RTCRoomMessage.MessageContent messageContent = RTCRoomMessage.MessageContent
 | 
	
		
			
				|  |  | +        /*RTCRoomMessage.MessageContent messageContent = RTCRoomMessage.MessageContent
 | 
	
		
			
				|  |  |                  .builder()
 | 
	
		
			
				|  |  |                  .type(typeEnum.ordinal())
 | 
	
		
			
				|  |  |                  .enable(enable)
 | 
	
	
		
			
				|  | @@ -1267,14 +1267,14 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |                          .sendUserName(authUser.getUsername())
 | 
	
		
			
				|  |  |                          .avatarUrl(authUser.getAvatar())
 | 
	
		
			
				|  |  |                          .build())
 | 
	
		
			
				|  |  | -                .build();
 | 
	
		
			
				|  |  | +                .build();*/
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          // 腾讯云消息推送
 | 
	
		
			
				|  |  |          RTCRoomMessage message = RTCRoomMessage.builder()
 | 
	
		
			
				|  |  |                  .objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE)
 | 
	
		
			
				|  |  |                  .fromUserId(userId)
 | 
	
		
			
				|  |  |                  .toChatRoomId(roomId)
 | 
	
		
			
				|  |  | -                .content(messageContent)
 | 
	
		
			
				|  |  | +                .content(notifyContent)
 | 
	
		
			
				|  |  |                  .isPersisted(1)
 | 
	
		
			
				|  |  |                  .isIncludeSender(0)
 | 
	
		
			
				|  |  |                  .build();
 | 
	
	
		
			
				|  | @@ -1297,7 +1297,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |                  // 消息发送
 | 
	
		
			
				|  |  |                  if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
 | 
	
		
			
				|  |  |                      // 腾讯云推送
 | 
	
		
			
				|  |  | -                    pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(messageContent));
 | 
	
		
			
				|  |  | +                    pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(notifyContent));
 | 
	
		
			
				|  |  |                  } else {
 | 
	
		
			
				|  |  |                      // 融云推送
 | 
	
		
			
				|  |  |                      imHelper.publishMessage(authUser.getId().toString(), roomId, deviceResourceMessage, 1);
 | 
	
	
		
			
				|  | @@ -1315,7 +1315,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |                  // 消息发送
 | 
	
		
			
				|  |  |                  if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
 | 
	
		
			
				|  |  |                      // 腾讯云推送
 | 
	
		
			
				|  |  | -                    pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(messageContent));
 | 
	
		
			
				|  |  | +                    pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(notifyContent));
 | 
	
		
			
				|  |  |                  } else {
 | 
	
		
			
				|  |  |                      // 融云推送
 | 
	
		
			
				|  |  |                      imHelper.publishMessage(authUser.getId().toString(), roomId, deviceResourceMessage, 1);
 | 
	
	
		
			
				|  | @@ -1331,7 +1331,7 @@ public class RoomServiceImpl implements RoomService {
 | 
	
		
			
				|  |  |                  deviceResourceMessage.setSoundVolume(data.getSoundVolume());// 消息发送
 | 
	
		
			
				|  |  |                  if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
 | 
	
		
			
				|  |  |                      // 腾讯云推送
 | 
	
		
			
				|  |  | -                    pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(messageContent));
 | 
	
		
			
				|  |  | +                    pluginService.sendChatRoomMessage(message.objectName(RTCRoomMessage.CONTROL_DEVICE_NOTIFY_MESSAGE).content(notifyContent));
 | 
	
		
			
				|  |  |                  } else {
 | 
	
		
			
				|  |  |                      // 融云推送
 | 
	
		
			
				|  |  |                      imHelper.publishMessage(authUser.getId().toString(), roomId, deviceResourceMessage, 1);
 |