修复了周星礼物无法显示的问题
This commit is contained in:
@@ -20,6 +20,7 @@ typedef NS_ENUM(NSUInteger, GiftType) {
|
|||||||
GiftType_Graffiti = 10, //涂鸦礼物
|
GiftType_Graffiti = 10, //涂鸦礼物
|
||||||
GiftType_Anchor = 11, //个播礼物
|
GiftType_Anchor = 11, //个播礼物
|
||||||
GiftType_Punish = 12, //惩罚礼物
|
GiftType_Punish = 12, //惩罚礼物
|
||||||
|
GiftType_Twelve_Star = 13, //星座礼物
|
||||||
};
|
};
|
||||||
|
|
||||||
//礼物类型
|
//礼物类型
|
||||||
|
@@ -67,6 +67,7 @@
|
|||||||
NSArray *drawGift = [GiftInfoModel modelsWithArray:data.data[@"drawGift"]]; // 涂鸦礼物
|
NSArray *drawGift = [GiftInfoModel modelsWithArray:data.data[@"drawGift"]]; // 涂鸦礼物
|
||||||
NSArray *penaltyGift = [GiftInfoModel modelsWithArray:data.data[@"penaltyGift"]]; // 惩罚礼物
|
NSArray *penaltyGift = [GiftInfoModel modelsWithArray:data.data[@"penaltyGift"]]; // 惩罚礼物
|
||||||
NSArray *anchorGift = [GiftInfoModel modelsWithArray:data.data[@"singlePopularGift"]]; // 个播礼物
|
NSArray *anchorGift = [GiftInfoModel modelsWithArray:data.data[@"singlePopularGift"]]; // 个播礼物
|
||||||
|
NSArray *twelveStarGiftList = [GiftInfoModel modelsWithArray:data.data[@"twelveStarGiftList"]]; // 星座礼物
|
||||||
NSMutableArray *info = [NSMutableArray array];
|
NSMutableArray *info = [NSMutableArray array];
|
||||||
NSMutableArray *totalInfo = [NSMutableArray array];
|
NSMutableArray *totalInfo = [NSMutableArray array];
|
||||||
[info addObjectsFromArray:luckyBagGift];
|
[info addObjectsFromArray:luckyBagGift];
|
||||||
@@ -76,6 +77,7 @@
|
|||||||
[info addObjectsFromArray:drawGift];
|
[info addObjectsFromArray:drawGift];
|
||||||
[info addObjectsFromArray:anchorGift];
|
[info addObjectsFromArray:anchorGift];
|
||||||
[info addObjectsFromArray:penaltyGift];
|
[info addObjectsFromArray:penaltyGift];
|
||||||
|
[info addObjectsFromArray:twelveStarGiftList];
|
||||||
[totalInfo addObjectsFromArray:info];
|
[totalInfo addObjectsFromArray:info];
|
||||||
[totalInfo addObjectsFromArray:luckyPoolGift];
|
[totalInfo addObjectsFromArray:luckyPoolGift];
|
||||||
///把礼物信息保存一下
|
///把礼物信息保存一下
|
||||||
|
@@ -480,7 +480,7 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
|
|||||||
[normaleArray addObject:obj];
|
[normaleArray addObject:obj];
|
||||||
} else if (obj.giftType == GiftType_Noble) {
|
} else if (obj.giftType == GiftType_Noble) {
|
||||||
[nobleArray addObject:obj];
|
[nobleArray addObject:obj];
|
||||||
} else if (obj.giftType == GiftType_WeekStar) {
|
} else if (obj.giftType == GiftType_Twelve_Star) {
|
||||||
[weekStarArray addObject:obj];
|
[weekStarArray addObject:obj];
|
||||||
} else if (obj.giftType == GiftType_Graffiti) {
|
} else if (obj.giftType == GiftType_Graffiti) {
|
||||||
[graffiti addObject:obj];
|
[graffiti addObject:obj];
|
||||||
@@ -488,7 +488,7 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
|
|||||||
[anchor addObject:obj];
|
[anchor addObject:obj];
|
||||||
} else if (obj.giftType == GiftType_Punish) {
|
} else if (obj.giftType == GiftType_Punish) {
|
||||||
[punishArray addObject:obj];
|
[punishArray addObject:obj];
|
||||||
}
|
}
|
||||||
}];
|
}];
|
||||||
self.giftArray = normaleArray;
|
self.giftArray = normaleArray;
|
||||||
self.giftLuckyArray = luckyArray;
|
self.giftLuckyArray = luckyArray;
|
||||||
|
Reference in New Issue
Block a user