yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了福袋礼物显示异常的问题

Browse Source
This commit is contained in:
fengshuo
2022-01-25 15:23:20 +08:00
parent 9f7f8a6e2d
commit 4f2fd388ba
1 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m
View File

@@ -93,90 +93,102 @@
#pragma mark - Send Custom Message
- (void)sendCustomMessage:(GiftReceiveInfoModel *)receiveModel oringinDic:(NSDictionary *)originDic {
AttachmentModel *attachement = [[AttachmentModel alloc] init];
NSDictionary * dict = originDic;
if (receiveModel.roomSendGiftType == RoomSendGiftType_AllMic) { // 全麦
NSMutableDictionary *data = [NSMutableDictionary dictionary];
[data addEntriesFromDictionary:dict];
if (receiveModel.gift.giftType == GiftType_Lucky) { // 如果是福袋 需要分开发送消息
attachement.first = CustomMessageType_AllMicroSend;
attachement.second = Custom_Message_Sub_AllMicroLuckySend;
NSArray *luckyBagGifts = (NSArray *)[data objectForKey:@"luckyBagGifts"];
if (luckyBagGifts.count >0) {
[luckyBagGifts enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
[data setObject:idx == 0 ? @(YES):@(NO) forKey:@"isShowAnimation"];
[data setObject:obj forKey:@"luckyGiftList"];
[data setObject:receiveModel.gift.giftName forKey:@"giftName"];
[data setObject:[obj valueForKeyPath:@"user.uid"] forKey:@"targetUid"];
[data setObject:[dict valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"];
[data removeObjectForKey:@"luckyBagGifts"];
[data removeObjectForKey:@"targetUsers"];
attachement.data = data;
[self sendCustomMessage:attachement];
}];
for (int i = 0; i < luckyBagGifts.count; i++) {
NSMutableDictionary * data1 = [NSMutableDictionary dictionary];
[data1 addEntriesFromDictionary:dict];
AttachmentModel * attachment = [[AttachmentModel alloc] init];
attachment.first = CustomMessageType_AllMicroSend;
attachment.second = Custom_Message_Sub_AllMicroLuckySend;
NSDictionary * obj = [luckyBagGifts objectAtIndex:i];
[data1 setObject:i == 0 ? @(YES):@(NO) forKey:@"isShowAnimation"];
[data1 setObject:obj forKey:@"luckyGiftList"];
[data1 setObject:receiveModel.gift.giftName forKey:@"giftName"];
[data1 setObject:[obj valueForKeyPath:@"user.uid"] forKey:@"targetUid"];
[data1 setObject:[dict valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"];
[data1 removeObjectForKey:@"luckyBagGifts"];
[data1 removeObjectForKey:@"targetUsers"];
attachment.data = data1;
[self sendCustomMessage:attachment];
}
}
}else { // 全麦赠送普通礼物 包含背包礼物
attachement.first = CustomMessageType_AllMicroSend;
attachement.second = Custom_Message_Sub_AllMicroSend;
AttachmentModel * attachment = [[AttachmentModel alloc] init];
attachment.first = CustomMessageType_AllMicroSend;
attachment.second = Custom_Message_Sub_AllMicroSend;
[data setObject:[dict valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"];
attachement.data = data;
[self sendCustomMessage:attachement];
attachment.data = data;
[self sendCustomMessage:attachment];
}
} else if (receiveModel.roomSendGiftType == RoomSendGiftType_MutableOnMic) { // 多人非全麦
NSMutableDictionary *data = [NSMutableDictionary dictionary];
[data addEntriesFromDictionary:dict];
if (receiveModel.gift.giftType == GiftType_Lucky) { // 多人非全麦 福袋礼物
attachement.first = CustomMessageType_AllMicroSend;
attachement.second = Custom_Message_Sub_AllBatchMicroLuckySend;
NSArray *luckyBagGifts = (NSArray *)[data objectForKey:@"luckyBagGifts"];
if (luckyBagGifts.count >0) {
// 产品想一个消息 多次发送 只能遍历插入消息体
[luckyBagGifts enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
[data setObject:idx == 0 ? @(YES):@(NO) forKey:@"isShowAnimation"];
[data setObject:obj forKey:@"luckyGiftList"];
[data setObject:receiveModel.gift.giftName forKey:@"giftName"];
[data setObject:[obj valueForKeyPath:@"user.uid"] forKey:@"targetUid"];
[data setObject:[dict valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"];
[data removeObjectForKey:@"luckyBagGifts"];
[data removeObjectForKey:@"targetUsers"];
attachement.data = data;
[self sendCustomMessage:attachement];
NSMutableDictionary * data1 = [NSMutableDictionary dictionary];
[data1 addEntriesFromDictionary:dict];
AttachmentModel * attachment = [[AttachmentModel alloc] init];
attachment.first = CustomMessageType_AllMicroSend;
attachment.second = Custom_Message_Sub_AllBatchMicroLuckySend;
[data1 setObject:idx == 0 ? @(YES):@(NO) forKey:@"isShowAnimation"];
[data1 setObject:obj forKey:@"luckyGiftList"];
[data1 setObject:receiveModel.gift.giftName forKey:@"giftName"];
[data1 setObject:[obj valueForKeyPath:@"user.uid"] forKey:@"targetUid"];
[data1 setObject:[dict valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"];
[data1 removeObjectForKey:@"luckyBagGifts"];
[data1 removeObjectForKey:@"targetUsers"];
attachment.data = data1;
[self sendCustomMessage:attachment];
}];
}
}else { // 多人非全麦 普通礼物
attachement.first = CustomMessageType_AllMicroSend;
attachement.second = Custom_Message_Sub_AllBatchSend;
attachement.data = data;
[self sendCustomMessage:attachement];
AttachmentModel *attachment = [[AttachmentModel alloc] init];
attachment.first = CustomMessageType_AllMicroSend;
attachment.second = Custom_Message_Sub_AllBatchSend;
attachment.data = data;
[self sendCustomMessage:attachment];
}
} else if (receiveModel.roomSendGiftType == RoomSendGiftType_ToOne) { // 单人
NSMutableDictionary *data = [NSMutableDictionary dictionary];
[data addEntriesFromDictionary:dict];
if (receiveModel.gift.giftType == GiftType_Lucky) { // 一对一 福袋礼物
attachement.first = CustomMessageType_Gift;
attachement.second = Custom_Message_Sub_Gift_LuckySend;
NSArray *luckyBagGifts = (NSArray *)[data objectForKey:@"luckyBagGifts"];
[luckyBagGifts enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
[data setObject:idx == 0 ? @(YES):@(NO) forKey:@"isShowAnimation"];
[data setObject:obj forKey:@"luckyGiftList"];
[data setObject:receiveModel.gift.giftName forKey:@"giftName"];
[data setObject:[obj valueForKeyPath:@"user.uid"] forKey:@"targetUid"];
[data setObject:[obj valueForKeyPath:@"user.nick"] forKey:@"targetNick"];
[data setObject:[dict valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"];
[data removeObjectForKey:@"luckyBagGifts"];
[data removeObjectForKey:@"targetUsers"];
attachement.data = data;
[self sendCustomMessage:attachement];
NSMutableDictionary * data1 = [NSMutableDictionary dictionary];
[data1 addEntriesFromDictionary:dict];
AttachmentModel * attachment = [[AttachmentModel alloc] init];
attachment.first = CustomMessageType_Gift;
attachment.second = Custom_Message_Sub_Gift_LuckySend;
[data1 setObject:idx == 0 ? @(YES):@(NO) forKey:@"isShowAnimation"];
[data1 setObject:obj forKey:@"luckyGiftList"];
[data1 setObject:receiveModel.gift.giftName forKey:@"giftName"];
[data1 setObject:[obj valueForKeyPath:@"user.uid"] forKey:@"targetUid"];
[data1 setObject:[obj valueForKeyPath:@"user.nick"] forKey:@"targetNick"];
[data1 setObject:[dict valueForKeyPath:@"targetUsers.uid"] forKey:@"targetUids"];
[data1 removeObjectForKey:@"luckyBagGifts"];
[data1 removeObjectForKey:@"targetUsers"];
attachment.data = data1;
[self sendCustomMessage:attachment];
}];
}else { // 一对一 普通礼物
attachement.first = CustomMessageType_Gift;
attachement.second = Custom_Message_Sub_Gift_Send;
AttachmentModel *attachment = [[AttachmentModel alloc] init];
attachment.first = CustomMessageType_Gift;
attachment.second = Custom_Message_Sub_Gift_Send;
NSDictionary *targetUsers = ((NSArray *)[data objectForKey:@"targetUsers"]).firstObject;
[data setObject:[targetUsers valueForKeyPath:@"uid"] forKey:@"targetUid"];
[data setObject:[targetUsers valueForKeyPath:@"nick"] forKey:@"targetNick"];
[data setObject:[targetUsers valueForKeyPath:@"avatar"] forKey:@"targetAvatar"];
attachement.data = data;
[self sendCustomMessage:attachement];
attachment.data = data;
[self sendCustomMessage:attachment];
}
}