diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m index 8719f916..96518c81 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m @@ -85,7 +85,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - [self setConfigPrivacyAlertView]; + } - (void)createUI { diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m index 25a8d59a..9192688b 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m @@ -25,8 +25,7 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 ///箭头 @property (nonatomic, strong) UIImageView *arrowImageView; -///红点 -@property (nonatomic, strong) UIView *redDotView; + ///轮播图 @property (nonatomic,strong) SDCycleScrollView *pi_BannerView; @@ -52,11 +51,11 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 [self addSubview:self.giftButton]; // [self addSubview:self.devideView]; // [self addSubview:self.interactButton]; - [self addSubview:self.redDotView]; + [self addSubview:self.arrowImageView]; [self addSubview:self.pi_BannerView]; [self addSubview:self.bottomDevideView]; - self.redDotView.hidden = [[NSUserDefaults standardUserDefaults] boolForKey:kHideGiftViewInteractDot]; + } - (void)initSubViewConstraints { @@ -79,11 +78,8 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 // make.left.mas_equalTo(self.devideView.mas_right).mas_offset(8); // make.width.mas_equalTo(40); // }]; - [self.redDotView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.giftButton.mas_right).mas_offset(-7); - make.bottom.mas_equalTo(self.giftButton.mas_top).mas_offset(9); - make.width.height.mas_equalTo(8); - }]; + + // [self.devideView mas_makeConstraints:^(MASConstraintMaker *make) { // make.centerY.mas_equalTo(self); @@ -147,11 +143,8 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 } sender.selected = YES; self.giftButton.selected = NO; - 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]; @@ -189,17 +182,7 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 -- (UIView *)redDotView { - if (!_redDotView) { - _redDotView = [[UIView alloc] init]; - _redDotView.backgroundColor = UIColorFromRGB(0xFB486A); - _redDotView.layer.cornerRadius = 4; - _redDotView.layer.masksToBounds = YES; - _redDotView.layer.borderWidth = 1; - _redDotView.layer.borderColor = [UIColor whiteColor].CGColor; - } - return _redDotView; -} +