diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/Model/GiftInfoModel.h b/xplan-ios/Main/ModuleKit/SendGiftView/Model/GiftInfoModel.h index fd445fbc..4f4a1aec 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/Model/GiftInfoModel.h +++ b/xplan-ios/Main/ModuleKit/SendGiftView/Model/GiftInfoModel.h @@ -20,6 +20,7 @@ typedef NS_ENUM(NSUInteger, GiftType) { GiftType_Graffiti = 10, //涂鸦礼物 GiftType_Anchor = 11, //个播礼物 GiftType_Punish = 12, //惩罚礼物 + GiftType_Twelve_Star = 13, //星座礼物 }; //礼物类型 diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/Presenter/XPGiftPresenter.m b/xplan-ios/Main/ModuleKit/SendGiftView/Presenter/XPGiftPresenter.m index 3fb37cdf..32b2f4cb 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/Presenter/XPGiftPresenter.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/Presenter/XPGiftPresenter.m @@ -67,6 +67,7 @@ NSArray *drawGift = [GiftInfoModel modelsWithArray:data.data[@"drawGift"]]; // 涂鸦礼物 NSArray *penaltyGift = [GiftInfoModel modelsWithArray:data.data[@"penaltyGift"]]; // 惩罚礼物 NSArray *anchorGift = [GiftInfoModel modelsWithArray:data.data[@"singlePopularGift"]]; // 个播礼物 + NSArray *twelveStarGiftList = [GiftInfoModel modelsWithArray:data.data[@"twelveStarGiftList"]]; // 星座礼物 NSMutableArray *info = [NSMutableArray array]; NSMutableArray *totalInfo = [NSMutableArray array]; [info addObjectsFromArray:luckyBagGift]; @@ -76,6 +77,7 @@ [info addObjectsFromArray:drawGift]; [info addObjectsFromArray:anchorGift]; [info addObjectsFromArray:penaltyGift]; + [info addObjectsFromArray:twelveStarGiftList]; [totalInfo addObjectsFromArray:info]; [totalInfo addObjectsFromArray:luckyPoolGift]; ///把礼物信息保存一下 diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m index fcf18ce1..74eab03b 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m @@ -480,7 +480,7 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc [normaleArray addObject:obj]; } else if (obj.giftType == GiftType_Noble) { [nobleArray addObject:obj]; - } else if (obj.giftType == GiftType_WeekStar) { + } else if (obj.giftType == GiftType_Twelve_Star) { [weekStarArray addObject:obj]; } else if (obj.giftType == GiftType_Graffiti) { [graffiti addObject:obj]; @@ -488,7 +488,7 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc [anchor addObject:obj]; } else if (obj.giftType == GiftType_Punish) { [punishArray addObject:obj]; - } + } }]; self.giftArray = normaleArray; self.giftLuckyArray = luckyArray;