diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m b/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m index fb11f9c8..2baac55d 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m +++ b/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m @@ -176,7 +176,7 @@ self.pageView.currentPage = 0; } -- (void)sendNewFaceCustomMessage:(ChatFaceVo *)vo { +- (void)sendVIPFaceCustomMessage:(ChatFaceVo *)vo { NSMutableArray *faceRecieveInfos = [NSMutableArray array]; RoomFaceSendInfoModel *sendInfo = [[RoomFaceSendInfoModel alloc]init]; sendInfo.svgaURL = vo.faceUrl; @@ -231,8 +231,9 @@ NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[AccountInfoStorage instance].getUid]; - RoomFaceSendInfoModel *sendInfo = [[RoomFaceSendInfoModel alloc]init]; + RoomFaceSendInfoModel *sendInfo = [[RoomFaceSendInfoModel alloc] init]; NSMutableArray *resultIndexs = [NSMutableArray array]; + sendInfo.resultIndexes = [resultIndexs copy]; if (faceInfo.resultStartPos > 0 && faceInfo.resultEndPos > 0) { int value; if (faceInfo.canResultRepeat) { //结果可以重复 @@ -381,7 +382,7 @@ if (self.selectTitleItem.tabModel) { ChatFaceVo *vo = [self.selectTitleItem.tabModel.faceNewVoList xpSafeObjectAtIndex:indexPath.row]; if (vo) { - [self sendNewFaceCustomMessage:vo]; + [self sendVIPFaceCustomMessage:vo]; } } else { if (self.selectTitleItem.faceType == RoomFaceTitleItemType_Normal) { diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m index 784b1738..e4fafc67 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m @@ -795,17 +795,6 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey"; return NO; } -// if (attachment.first == CustomMessageType_Face && attachment.second == Custom_Message_Sub_Face_Send) { -// if ([attachment.data[@"data"] isKindOfClass:[NSArray class]]) { -// NSArray * array = [RoomFaceSendInfoModel modelsWithArray:attachment.data[@"data"]]; -// for (int i = 0; i< array.count; i++) { -// RoomFaceSendInfoModel * sendInfo = [array xpSafeObjectAtIndex:i]; -// if (sendInfo.resultIndexes.count <=0) { -// return NO; -// } -// } -// } -// } if (attachment.first == CustomMessageType_Room_PK && attachment.second == Custom_Message_Sub_Room_PK_Manager_Up_Mic) { if (attachment.data && [attachment.data allKeys].count > 0) { for (NSDictionary * dic in [attachment.data allValues]) { diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index a6317e4e..f221477e 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -4240,11 +4240,11 @@ ineHeadView12" = "الحمل"; "20.20.62_text_9" = "تشغيل/إيقاف المؤثرات"; "20.20.62_text_9.1" = "وضع Turbo (السرعة الفائقة)"; "20.20.62_text_9.2" = "وضع عادي"; -"20.20.62_text_10" = "Gift effects"; -"20.20.62_text_11" = "Global gift screen"; -"20.20.62_text_12" = "Global game screen"; -"20.20.62_text_13" = "Turbo mode"; -"20.20.62_text_14" = "我的特效"; +"20.20.62_text_10" = "تأثيرات الهدايا"; +"20.20.62_text_11" = "شاشة الهدايا العالمية"; +"20.20.62_text_12" = "شاشة اللعبة العالمية"; +"20.20.62_text_13" = "وضع التربو"; +"20.20.62_text_14" = "التأثيرات"; "20.20.62_text_15.1" = "تمكين وضع Turbo يمكن أن يجعل التطبيق يعمل بسلاسة أكبر.\nوضع Turbo: يُوقف رسوميات الهدايا في الغرفة، البث داخل الغرفة، عروض CP، وعروض المؤثرات الأخرى."; "20.20.62_text_15.2" = "لجعل التطبيق يعمل بسلاسة أكبر، تم التبديل تلقائيًا إلى وضع Turbo لك (وضع Turbo: يُوقف تلقائيًا مؤثرات الهدايا، مؤثرات غطاء الرأس، ويدمج رسائل الهدايا في الدردشة العامة). يمكنك إيقاف هذا الوضع في إعدادات الغرفة."; "20.20.62_text_16" = "أنا أدرك"; diff --git a/YuMi/pt-BR.lproj/Localizable.strings b/YuMi/pt-BR.lproj/Localizable.strings index a42da3e2..e4a91657 100644 --- a/YuMi/pt-BR.lproj/Localizable.strings +++ b/YuMi/pt-BR.lproj/Localizable.strings @@ -3321,11 +3321,11 @@ "20.20.62_text_9" = "Ativar/Desativar efeitos"; "20.20.62_text_9.1" = "Modo turbo"; "20.20.62_text_9.2" = "Modo normal"; -"20.20.62_text_10" = "Gift effects"; -"20.20.62_text_11" = "Global gift screen"; -"20.20.62_text_12" = "Global game screen"; -"20.20.62_text_13" = "Turbo mode"; -"20.20.62_text_14" = "我的特效"; +"20.20.62_text_10" = "Efeitos de presente"; +"20.20.62_text_11" = "Tela de presente global"; +"20.20.62_text_12" = "Tela de jogo global"; +"20.20.62_text_13" = "Modo Turbo"; +"20.20.62_text_14" = "Meus efeitos"; "20.20.62_text_15.1" = "Ativar o Modo turbo pode fazer com que o aplicativo funcione de forma mais suave.\nModo turbo: Desativa as animações de presentes na sala, transmissões na sala, exibições de CP e outros efeitos animados."; "20.20.62_text_15.2" = "Para fazer o aplicativo funcionar de forma mais suave, mudou automaticamente para o Modo turbo para si (Modo turbo: Desativa automaticamente os efeitos de presentes, os efeitos de chapéu e funde as mensagens de presentes no chat público). Pode desativar este modo nas definições da sala."; "20.20.62_text_16" = "Compreendo"; diff --git a/YuMi/tr.lproj/Localizable.strings b/YuMi/tr.lproj/Localizable.strings index 060dde71..84a97a16 100644 --- a/YuMi/tr.lproj/Localizable.strings +++ b/YuMi/tr.lproj/Localizable.strings @@ -3821,11 +3821,11 @@ "20.20.62_text_9" = "Efektleri Aç/Kapat"; "20.20.62_text_9.1" = "Turbo mod"; "20.20.62_text_9.2" = "Normal mod"; -"20.20.62_text_10" = "Gift effects"; -"20.20.62_text_11" = "Global gift screen"; -"20.20.62_text_12" = "Global game screen"; -"20.20.62_text_13" = "Turbo mode"; -"20.20.62_text_14" = "我的特效"; +"20.20.62_text_10" = "Hediye efektleri"; +"20.20.62_text_11" = "Genel hediye ekranı"; +"20.20.62_text_12" = "Genel oyun ekranı"; +"20.20.62_text_13" = "Turbo modu"; +"20.20.62_text_14" = "Benim etkilerim"; "20.20.62_text_15.1" = "Turbo modu etkinleştirmek, uygulamanın daha sorunsuz çalışmasını sağlayabilir.\nTurbo mod: Oda hediye animasyonlarını, odadaki yayınları, CP görüntülerini ve diğer animasyonlu efektleri kapatır."; "20.20.62_text_15.2" = "Uygulamanın daha sorunsuz çalışması için sizin için otomatik olarak Turbo moda geçildi (Turbo mod: Hediye animasyonlarını, başlık efektlerini otomatik olarak kapatır ve genel sohbetteki hediye mesajlarını birleştirir). Bu modu oda ayarlarından kapatabilirsiniz."; "20.20.62_text_16" = "Anladım";