YUSHENG/featherVoice
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

解决冲突

Browse Source
This commit is contained in:
启星
2025-12-10 10:16:33 +08:00
parent 011536e8f4
commit aedc48c098
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
QXLive.xcodeproj/project.pbxproj
View File

@@ -787,11 +787,7 @@
"$(inherited)", "$(inherited)",
"$(SDKROOT)/usr/lib/swift", "$(SDKROOT)/usr/lib/swift",
); );
<<<<<<< HEAD
MARKETING_VERSION = 1.1.4;
=======
MARKETING_VERSION = 1.1.6; MARKETING_VERSION = 1.1.6;
>>>>>>> dev
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -857,11 +853,7 @@
"$(inherited)", "$(inherited)",
"$(SDKROOT)/usr/lib/swift", "$(SDKROOT)/usr/lib/swift",
); );
<<<<<<< HEAD
MARKETING_VERSION = 1.1.4;
=======
MARKETING_VERSION = 1.1.6; MARKETING_VERSION = 1.1.6;
>>>>>>> dev
PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive; PRODUCT_BUNDLE_IDENTIFIER = com.qxcm.qxlive;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

4
QXLive/Room(房间)/View/QXRoomChatListView.m
View File

@@ -207,11 +207,7 @@ NSInteger maxMessageCount = 20;
if (model.messageType == QXRoomChatMessageTypeGift || model.messageType == QXRoomChatMessageTypeSystem) { if (model.messageType == QXRoomChatMessageTypeGift || model.messageType == QXRoomChatMessageTypeSystem) {
text = model.text; text = model.text;
}else{ }else{
<<<<<<< HEAD
text = [NSString stringWithFormat:@"%@说，%@",model.FromUserInfo.nickname,model.text];
=======
text = [NSString stringWithFormat:@"%@说:%@",model.FromUserInfo.nickname,model.text]; text = [NSString stringWithFormat:@"%@说:%@",model.FromUserInfo.nickname,model.text];
>>>>>>> dev
} }
AVSpeechUtterance *utterance = [[AVSpeechUtterance alloc] initWithString:text]; AVSpeechUtterance *utterance = [[AVSpeechUtterance alloc] initWithString:text];
utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:@"zh-CN"]; utterance.voice = [AVSpeechSynthesisVoice voiceWithLanguage:@"zh-CN"];