diff --git a/xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/Contents.json b/xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/Contents.json new file mode 100644 index 00000000..cf12d8af --- /dev/null +++ b/xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_gift_panel_arrow@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_gift_panel_arrow@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/room_gift_panel_arrow@2x.png b/xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/room_gift_panel_arrow@2x.png new file mode 100644 index 00000000..c621bdeb Binary files /dev/null and b/xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/room_gift_panel_arrow@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/room_gift_panel_arrow@3x.png b/xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/room_gift_panel_arrow@3x.png new file mode 100644 index 00000000..e4e3f81c Binary files /dev/null and b/xplan-ios/Assets.xcassets/Gift/room_gift_panel_arrow.imageset/room_gift_panel_arrow@3x.png differ diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m index 86f093fe..cead4cf6 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftHeadTypeView.m @@ -20,6 +20,8 @@ @property (nonatomic, strong) UIView *devideView; ///分割线 @property (nonatomic, strong) UIView *bottomDevideView; +///箭头 +@property (nonatomic, strong) UIImageView *arrowImageView; ///互动 @property (nonatomic, strong) UIButton *interactButton; ///轮播图 @@ -45,6 +47,7 @@ [self addSubview:self.giftButton]; [self addSubview:self.devideView]; [self addSubview:self.interactButton]; + [self addSubview:self.arrowImageView]; [self addSubview:self.cycleScrollView]; [self addSubview:self.bottomDevideView]; } @@ -59,7 +62,11 @@ make.centerY.mas_equalTo(self); make.width.mas_equalTo(40); }]; - + [self.arrowImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.mas_equalTo(self.bottomDevideView.mas_top); + make.centerX.mas_equalTo(self.giftButton); + make.size.mas_equalTo(CGSizeMake(9, 7)); + }]; [self.interactButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); make.left.mas_equalTo(self.devideView.mas_right).mas_offset(8); @@ -114,6 +121,11 @@ self.interactButton.selected = NO; sender.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; self.interactButton.titleLabel.font = [UIFont systemFontOfSize:14]; + [self.arrowImageView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.bottom.mas_equalTo(self.bottomDevideView.mas_top); + make.centerX.mas_equalTo(self.giftButton); + make.size.mas_equalTo(CGSizeMake(9, 7)); + }]; } - (void)interactButtonAction:(UIButton *)sender { @@ -126,6 +138,12 @@ self.giftButton.selected = NO; sender.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; self.giftButton.titleLabel.font = [UIFont systemFontOfSize:14]; + + [self.arrowImageView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.bottom.mas_equalTo(self.bottomDevideView.mas_top); + make.centerX.mas_equalTo(self.interactButton); + make.size.mas_equalTo(CGSizeMake(9, 7)); + }]; } #pragma mark - setter @@ -203,4 +221,14 @@ return _titleArray; } +- (UIImageView *)arrowImageView { + if (!_arrowImageView) { + UIImageView *imageView = [[UIImageView alloc] init]; + imageView.image = [UIImage imageNamed:@"room_gift_panel_arrow"]; + + _arrowImageView = imageView; + } + return _arrowImageView; +} + @end diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m index 1323e58f..14da9f7d 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m @@ -107,8 +107,8 @@ if (headType == 1) { [self.graffitiButton removeFromSuperview]; [self.segmentStackView addArrangedSubview:self.normalGiftButton]; - [self.segmentStackView addArrangedSubview:self.luckyGiftButton]; [self.segmentStackView addArrangedSubview:self.nobleGiftButton]; + [self.segmentStackView addArrangedSubview:self.luckyGiftButton]; [self.segmentStackView addArrangedSubview:self.weekStarButton]; if(self.segmentType != GiftSegmentType_Pack) { [self didClickGiftSegmentAction:self.normalGiftButton]; @@ -135,8 +135,8 @@ [self.scrollView addSubview:self.segmentStackView]; ///分段控制 [self.segmentStackView addArrangedSubview:self.normalGiftButton]; - [self.segmentStackView addArrangedSubview:self.luckyGiftButton]; [self.segmentStackView addArrangedSubview:self.nobleGiftButton]; + [self.segmentStackView addArrangedSubview:self.luckyGiftButton]; [self.segmentStackView addArrangedSubview:self.weekStarButton]; ///礼物 [self.giftStackView addArrangedSubview:self.giftcollectionView]; diff --git a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m index d7081e40..f350ebaa 100644 --- a/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m +++ b/xplan-ios/Main/ModuleKit/SendGiftView/View/XPSendGiftView.m @@ -753,9 +753,8 @@ - (UIVisualEffectView *)effectView { if (!_effectView) { - UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]; + UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; _effectView = [[UIVisualEffectView alloc] initWithEffect:beffect]; - _effectView.backgroundColor = UIColorRGBAlpha(0x000000, 0.1); } return _effectView; } diff --git a/xplan-ios/Main/Room/View/MoreView/View/XPRoomMoreMenuViewController.m b/xplan-ios/Main/Room/View/MoreView/View/XPRoomMoreMenuViewController.m index 30ba9862..a65f0941 100644 --- a/xplan-ios/Main/Room/View/MoreView/View/XPRoomMoreMenuViewController.m +++ b/xplan-ios/Main/Room/View/MoreView/View/XPRoomMoreMenuViewController.m @@ -508,9 +508,8 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; - (UIVisualEffectView *)effectView { if (!_effectView) { - UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]; + UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; _effectView = [[UIVisualEffectView alloc] initWithEffect:beffect]; - _effectView.backgroundColor = UIColorRGBAlpha(0x000000, 0.1); UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, KScreenHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8, 8)]; CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];