解决冲突

2025-12-10 10:16:33 +08:00
parent 011536e8f4
commit aedc48c098
2 changed files with 0 additions and 12 deletions
--- a/QXLive/Room(房间)/View/QXRoomChatListView.m
+++ b/QXLive/Room(房间)/View/QXRoomChatListView.m
@@ -207,11 +207,7 @@ NSInteger maxMessageCount = 20;
        if (model.messageType == QXRoomChatMessageTypeGift || model.messageType == QXRoomChatMessageTypeSystem) {
            text = model.text;
        }else{
-<<<<<<< HEAD
-            text = [NSString stringWithFormat:@"%@说，%@",model.FromUserInfo.nickname,model.text];
-=======
            text = [NSString stringWithFormat:@"%@说:%@",model.FromUserInfo.nickname,model.text];
->>>>>>> dev
        }
        AVSpeechUtterance *utterance = [[AVSpeechUtterance alloc] initWithString:text];
        utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:@"zh-CN"];