diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/Presenter/XPGiftPresenter.m b/xplan-ios/Main/ModuleKit/SendGiftView/Presenter/XPGiftPresenter.m index ed79edc0..eb51c6f8 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/Presenter/XPGiftPresenter.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/Presenter/XPGiftPresenter.m @@ -64,6 +64,7 @@ NSArray *normalGift = [GiftInfoModel modelsWithArray:data.data[@"normalGift"]]; // 普通面板礼物 NSArray *weekStarGift = [GiftInfoModel modelsWithArray:data.data[@"weekStarGift"]]; // 周星礼物 NSArray *drawGift = [GiftInfoModel modelsWithArray:data.data[@"drawGift"]]; // 涂鸦礼物 + NSArray *penaltyGift = [GiftInfoModel modelsWithArray:data.data[@"penaltyGift"]]; // 惩罚礼物 NSArray *anchorGift = [GiftInfoModel modelsWithArray:data.data[@"singlePopularGift"]]; // 个播礼物 NSMutableArray *info = [NSMutableArray array]; NSMutableArray *totalInfo = [NSMutableArray array]; @@ -73,6 +74,7 @@ [info addObjectsFromArray:weekStarGift]; [info addObjectsFromArray:drawGift]; [info addObjectsFromArray:anchorGift]; + [info addObjectsFromArray:penaltyGift]; [totalInfo addObjectsFromArray:info]; [totalInfo addObjectsFromArray:luckyPoolGift]; ///把礼物信息保存一下 diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m index 2e0a3e7c..88225438 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m @@ -12,6 +12,8 @@ /// #import "ThemeColor.h" +static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否隐藏互动红点 + @interface XPGiftHeadTypeView() ///礼物 @@ -53,6 +55,7 @@ [self addSubview:self.arrowImageView]; [self addSubview:self.cycleScrollView]; [self addSubview:self.bottomDevideView]; + self.redDotView.hidden = [[NSUserDefaults standardUserDefaults] boolForKey:kHideGiftViewInteractDot]; } - (void)initSubViewConstraints { @@ -144,7 +147,11 @@ } sender.selected = YES; self.giftButton.selected = NO; - self.redDotView.hidden = YES; + if(![[NSUserDefaults standardUserDefaults] boolForKey:kHideGiftViewInteractDot]) { + self.redDotView.hidden = YES; + [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kHideGiftViewInteractDot]; + [[NSUserDefaults standardUserDefaults] synchronize]; + } sender.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; self.giftButton.titleLabel.font = [UIFont systemFontOfSize:14]; diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m index ab954c77..5989199b 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m @@ -23,6 +23,8 @@ #import "XPGiftWeekStarCollectionViewCell.h" #import "XPGiftCollectionViewFlowLayout.h" +static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIcon";///是否隐藏惩罚礼物“新”标识 + @interface XPGiftInfoView () ///滚动的容器 @property (nonatomic,strong) UIScrollView *scrollView; @@ -124,6 +126,7 @@ [self.graffitiButton removeFromSuperview]; [self.punishButton removeFromSuperview]; [self.freshIconImage removeFromSuperview]; + self.freshIconImage = nil; [self.segmentStackView addArrangedSubview:self.normalGiftButton]; [self.segmentStackView addArrangedSubview:self.nobleGiftButton]; [self.segmentStackView addArrangedSubview:self.luckyGiftButton]; @@ -143,12 +146,15 @@ [self.anchorButton removeFromSuperview]; [self.segmentStackView addArrangedSubview:self.graffitiButton]; [self.segmentStackView addArrangedSubview:self.punishButton]; - [self addSubview:self.freshIconImage]; - [self.freshIconImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.punishButton.mas_right).mas_offset(-5); - make.bottom.mas_equalTo(self.punishButton.mas_top).mas_offset(5); - make.size.mas_equalTo(CGSizeMake(24, 10)); - }]; + BOOL hiden = [[NSUserDefaults standardUserDefaults] boolForKey:kSendGiftViewHidePunishNewIcon]; + if(!hiden) { + [self addSubview:self.freshIconImage]; + [self.freshIconImage mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(self.punishButton.mas_right).mas_offset(-5); + make.bottom.mas_equalTo(self.punishButton.mas_top).mas_offset(5); + make.size.mas_equalTo(CGSizeMake(24, 10)); + }]; + } if(self.segmentType != GiftSegmentType_Pack) { [self didClickGiftSegmentAction:self.graffitiButton]; } @@ -411,6 +417,9 @@ { [self.datasource addObjectsFromArray:self.punishArray]; [self.freshIconImage removeFromSuperview]; + self.freshIconImage = nil; + [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kSendGiftViewHidePunishNewIcon]; + [[NSUserDefaults standardUserDefaults] synchronize]; } break; default: diff --git a/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m b/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m index 363236cc..c4c664a1 100644 --- a/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m +++ b/xplan-ios/Main/Room/Presenter/XPRoomPresenter.m @@ -160,6 +160,7 @@ NSArray *normalGift = [GiftInfoModel modelsWithArray:data.data[@"normalGift"]]; // 普通面板礼物 NSArray *weekStarGift = [GiftInfoModel modelsWithArray:data.data[@"weekStarGift"]]; // 周星礼物 NSArray *drawGift = [GiftInfoModel modelsWithArray:data.data[@"drawGift"]]; // 涂鸦礼物 + NSArray *penaltyGift = [GiftInfoModel modelsWithArray:data.data[@"penaltyGift"]]; // 惩罚礼物 NSArray *anchorGift = [GiftInfoModel modelsWithArray:data.data[@"singlePopularGift"]]; // 个播礼物 //TODO: luckyPoolGift 这个就是福袋礼物的所有的数据 只要保存这个就行了吧 以后需要改 NSMutableArray *info = [NSMutableArray array]; @@ -169,6 +170,8 @@ [info addObjectsFromArray:normalGift]; [info addObjectsFromArray:weekStarGift]; [info addObjectsFromArray:drawGift]; + [info addObjectsFromArray:anchorGift]; + [info addObjectsFromArray:penaltyGift]; [totalInfo addObjectsFromArray:info]; [totalInfo addObjectsFromArray:luckyPoolGift]; ///把礼物信息保存一下