diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift.imageset/room_menu_gift@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift.imageset/room_menu_gift@2x.png index 1c79f278..34a8b4c9 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift.imageset/room_menu_gift@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift.imageset/room_menu_gift@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift.imageset/room_menu_gift@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift.imageset/room_menu_gift@3x.png index 46bfc83e..148127bb 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift.imageset/room_menu_gift@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift.imageset/room_menu_gift@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift_first_recharge.imageset/room_menu_gift_first_recharge@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift_first_recharge.imageset/room_menu_gift_first_recharge@2x.png index 80ce113d..894166c2 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift_first_recharge.imageset/room_menu_gift_first_recharge@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift_first_recharge.imageset/room_menu_gift_first_recharge@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift_first_recharge.imageset/room_menu_gift_first_recharge@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift_first_recharge.imageset/room_menu_gift_first_recharge@3x.png index 1bce2c47..8a4e5e1a 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift_first_recharge.imageset/room_menu_gift_first_recharge@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_gift_first_recharge.imageset/room_menu_gift_first_recharge@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@2x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@2x.png index f047729d..f35d09e6 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@2x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@3x.png b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@3x.png index 4ad6b8e2..f1138f5e 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@3x.png and b/xplan-ios/Assets.xcassets/Room/Menu/room_menu_noble.imageset/room_menu_noble@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Position/room_position_boss.imageset/room_position_boss@2x.png b/xplan-ios/Assets.xcassets/Room/Position/room_position_boss.imageset/room_position_boss@2x.png index a424997a..e0972cae 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Position/room_position_boss.imageset/room_position_boss@2x.png and b/xplan-ios/Assets.xcassets/Room/Position/room_position_boss.imageset/room_position_boss@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Position/room_position_boss.imageset/room_position_boss@3x.png b/xplan-ios/Assets.xcassets/Room/Position/room_position_boss.imageset/room_position_boss@3x.png index f07c87f2..5eab5bf4 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Position/room_position_boss.imageset/room_position_boss@3x.png and b/xplan-ios/Assets.xcassets/Room/Position/room_position_boss.imageset/room_position_boss@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Position/room_position_lock.imageset/room_position_lock@2x.png b/xplan-ios/Assets.xcassets/Room/Position/room_position_lock.imageset/room_position_lock@2x.png index b80f8304..320b5d69 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Position/room_position_lock.imageset/room_position_lock@2x.png and b/xplan-ios/Assets.xcassets/Room/Position/room_position_lock.imageset/room_position_lock@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Position/room_position_lock.imageset/room_position_lock@3x.png b/xplan-ios/Assets.xcassets/Room/Position/room_position_lock.imageset/room_position_lock@3x.png index ac8d8d25..f44cd404 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Position/room_position_lock.imageset/room_position_lock@3x.png and b/xplan-ios/Assets.xcassets/Room/Position/room_position_lock.imageset/room_position_lock@3x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Position/room_position_normal.imageset/room_position_normal@2x.png b/xplan-ios/Assets.xcassets/Room/Position/room_position_normal.imageset/room_position_normal@2x.png index bb4ed399..42f18d28 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Position/room_position_normal.imageset/room_position_normal@2x.png and b/xplan-ios/Assets.xcassets/Room/Position/room_position_normal.imageset/room_position_normal@2x.png differ diff --git a/xplan-ios/Assets.xcassets/Room/Position/room_position_normal.imageset/room_position_normal@3x.png b/xplan-ios/Assets.xcassets/Room/Position/room_position_normal.imageset/room_position_normal@3x.png index ad333a48..9a29053b 100644 Binary files a/xplan-ios/Assets.xcassets/Room/Position/room_position_normal.imageset/room_position_normal@3x.png and b/xplan-ios/Assets.xcassets/Room/Position/room_position_normal.imageset/room_position_normal@3x.png differ diff --git a/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityPlayView.m b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityPlayView.m index 7c9b87db..ad1d41a9 100644 --- a/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityPlayView.m +++ b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityPlayView.m @@ -10,6 +10,7 @@ #import #import "XPMacro.h" #import "ThemeColor.h" +#import "UIImage+Utils.h" ///Model #import "XPRoomActivityPlayModel.h" #import "NetImageView.h" @@ -115,8 +116,8 @@ [button setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; button.titleLabel.lineBreakMode = NSLineBreakByWordWrapping;//换行模式自动换行 button.titleLabel.numberOfLines = 0; - button.backgroundColor = UIColorFromRGB(0x7B2FE0); button.titleLabel.textAlignment = NSTextAlignmentCenter; + [button setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x6E36FF), UIColorFromRGB(0x31EBF7)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(18, 53)] forState:UIControlStateNormal]; _moreButton = button; } return _moreButton; diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m index 56ca91db..1d660b8d 100644 --- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -246,7 +246,7 @@ [self.topicStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self); make.height.mas_equalTo(15); - make.top.mas_equalTo(58 + 5 + 6 + 12 + 3 + kNavigationHeight); + make.top.mas_equalTo(50 + 5 + 6 + 12 + 3 + kNavigationHeight); }]; } @@ -1195,11 +1195,11 @@ RoomInfoModel * roomInfo = self.delegate.getRoomInfo; CGFloat offsetY = kNavigationHeight; if (roomInfo.roomModeType == RoomModeType_Open_Blind) { - offsetY += ((58 + 5) * kScreenScale + 10 + 12 + 3 + 40); + offsetY += ((50 + 5) * kScreenScale + 10 + 12 + 3 + 40); } else if (roomInfo.type == RoomType_Anchor) { offsetY += (120 + 5 + 6 + 20 +60 + 3); } else { - offsetY += (58 + 5 + 10 + 12 + 3 + 40); + offsetY += (50 + 5 + 10 + 12 + 3 + 40); } [self.topicStackView mas_updateConstraints:^(MASConstraintMaker *make) { @@ -1487,7 +1487,7 @@ [self.hourRankEntranceView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(15); make.centerY.mas_equalTo(self.contributeEnterView); - make.width.mas_equalTo(69); + make.width.mas_equalTo(61); make.height.mas_equalTo(22); }]; } diff --git a/xplan-ios/Main/Room/View/MoreView/View/XPRoomMoreMenuViewController.m b/xplan-ios/Main/Room/View/MoreView/View/XPRoomMoreMenuViewController.m index b761f893..faeda545 100644 --- a/xplan-ios/Main/Room/View/MoreView/View/XPRoomMoreMenuViewController.m +++ b/xplan-ios/Main/Room/View/MoreView/View/XPRoomMoreMenuViewController.m @@ -41,6 +41,8 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; @interface XPRoomMoreMenuViewController () ///顶部的View @property (nonatomic,strong) UIView * topView; +///模糊背景 +@property (nonatomic, strong) UIVisualEffectView *effectView; ///列表 @property (nonatomic,strong) UICollectionView *collectionView; ///底部的View @@ -88,6 +90,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; self.modalPresentationStyle = UIModalPresentationOverFullScreen; self.view.backgroundColor = [UIColor clearColor]; [self.view addSubview:self.topView]; + [self.view addSubview:self.effectView]; [self.view addSubview:self.collectionView]; [self.view addSubview:self.bottomView]; } @@ -97,7 +100,12 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; make.left.right.top.mas_equalTo(self.view); make.bottom.mas_equalTo(self.collectionView.mas_top); }]; - + + [self.effectView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.mas_equalTo(0); + make.top.mas_equalTo(self.collectionView); + make.bottom.mas_equalTo(self.bottomView); + }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.mas_equalTo(self.view); make.height.mas_equalTo(0); @@ -451,7 +459,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; _collectionView.dataSource = self; _collectionView.delegate = self; - _collectionView.backgroundColor = UIColorRGBAlpha(0x0D0C11, 0.95); + _collectionView.backgroundColor = [UIColor clearColor]; _collectionView.alpha = 0.9; _collectionView.scrollEnabled = NO; [_collectionView registerClass:[XPRoomMoreMenuCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass([XPRoomMoreMenuCollectionViewCell class])]; @@ -472,10 +480,23 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey; - (UIView *)bottomView { if (!_bottomView) { _bottomView = [[UIView alloc] init]; - _bottomView.backgroundColor = [UIColor blackColor]; - _bottomView.alpha = 0.9; } return _bottomView; } +- (UIVisualEffectView *)effectView { + if (!_effectView) { + UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]; + _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]; + maskLayer.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); + maskLayer.path = maskPath.CGPath; + _effectView.layer.mask = maskLayer; + } + return _effectView; +} + @end diff --git a/xplan-ios/Main/Room/View/QuickMessageView/XPRoomQuidkMessageCell.m b/xplan-ios/Main/Room/View/QuickMessageView/XPRoomQuidkMessageCell.m index aee87668..86bd9db1 100644 --- a/xplan-ios/Main/Room/View/QuickMessageView/XPRoomQuidkMessageCell.m +++ b/xplan-ios/Main/Room/View/QuickMessageView/XPRoomQuidkMessageCell.m @@ -58,7 +58,7 @@ - (UIView *)bgView { if (!_bgView) { _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = UIColorRGBAlpha(0xffffff, 0.4); + _bgView.backgroundColor = UIColorRGBAlpha(0xffffff, 0.3); _bgView.layer.cornerRadius = 11; _bgView.layer.masksToBounds = YES; } diff --git a/xplan-ios/Main/Room/View/StageView/DatingStageView.m b/xplan-ios/Main/Room/View/StageView/DatingStageView.m index fef3fe99..923ebee5 100644 --- a/xplan-ios/Main/Room/View/StageView/DatingStageView.m +++ b/xplan-ios/Main/Room/View/StageView/DatingStageView.m @@ -26,11 +26,11 @@ //房主距离顶部间距 #define ownerTopMargin 35 // 房主头像宽 58 + 光圈 5 -#define ownerWidth (58 + 5) * kScreenScale +#define ownerWidth (45 + 5) * kScreenScale // 昵称高 12，距离头像间距 10 #define ownerHeight (ownerWidth + 10 + 12) // 下面 8 个坑位宽50 + 光圈 5 -#define mcWidth (50 + 5) * kScreenScale +#define mcWidth (45 + 5) * kScreenScale #define mcHeight (mcWidth + 10 + 12 + 5+16) // 左右 padding 12 #define paddingH 12 * kScreenScale diff --git a/xplan-ios/Main/Room/View/StageView/MicroView/MicroView.m b/xplan-ios/Main/Room/View/StageView/MicroView/MicroView.m index 40e7c48f..d1632565 100644 --- a/xplan-ios/Main/Room/View/StageView/MicroView/MicroView.m +++ b/xplan-ios/Main/Room/View/StageView/MicroView/MicroView.m @@ -570,7 +570,7 @@ _postionLabel = [[UILabel alloc] init]; _postionLabel.font = [UIFont systemFontOfSize:10]; _postionLabel.textAlignment = NSTextAlignmentCenter; - _postionLabel.textColor = [UIColor colorWithWhite:1 alpha:0.6]; + _postionLabel.textColor = [UIColor colorWithWhite:1 alpha:1]; _postionLabel.layer.masksToBounds = YES; _postionLabel.layer.cornerRadius = 7; [_postionLabel setBackgroundColor:[ThemeColor positionNormalNickBackColor]]; @@ -595,7 +595,7 @@ _leaveLabel .textColor = UIColor.whiteColor; _leaveLabel.textAlignment = NSTextAlignmentCenter; _leaveLabel.backgroundColor = [UIColor colorWithWhite:0 alpha:0.45]; - _leaveLabel.layer.cornerRadius = 65 / 2; + _leaveLabel.layer.cornerRadius = 50 * kScreenScale / 2; _leaveLabel.layer.masksToBounds = YES; _leaveLabel.userInteractionEnabled = YES; } diff --git a/xplan-ios/Main/Room/View/StageView/SocialStageView.m b/xplan-ios/Main/Room/View/StageView/SocialStageView.m index 2a9d6aa6..b35b791b 100644 --- a/xplan-ios/Main/Room/View/StageView/SocialStageView.m +++ b/xplan-ios/Main/Room/View/StageView/SocialStageView.m @@ -14,14 +14,14 @@ //房主距离顶部间距 #define ownerTopMargin 35 // 房主头像宽 58 + 光圈 5 -#define ownerWidth (58 + 5) +#define ownerWidth (45 + 5) * kScreenScale // 昵称高12，距离头像间距 10 #define ownerHeight (ownerWidth + 10 + 12) // 下面 8 个坑位宽55 + 光圈 5 -#define mcWidth (55 + 5) +#define mcWidth (45 + 5) * kScreenScale #define mcHeight (mcWidth + 10 + 12 + 5+16) // 左右 padding 20 -#define paddingH 20 +#define paddingH 22 * kScreenScale // 房主与下面的坑位间隔 33 #define marginV1 38 // 下面 8 个坑位两两之间的间距 diff --git a/xplan-ios/Main/Room/View/TaskTip/XPTaskCompleteTipView.m b/xplan-ios/Main/Room/View/TaskTip/XPTaskCompleteTipView.m index 9b058458..2bca8542 100644 --- a/xplan-ios/Main/Room/View/TaskTip/XPTaskCompleteTipView.m +++ b/xplan-ios/Main/Room/View/TaskTip/XPTaskCompleteTipView.m @@ -9,13 +9,14 @@ ///tool #import "ThemeColor.h" #import "XPMacro.h" +#import "UIImage+Utils.h" ///Third #import @interface XPTaskCompleteTipView() ///背景 -@property (nonatomic, strong) UIView *mainView; +@property (nonatomic, strong) UIImageView *mainView; ///昵称 @property (nonatomic, strong) UILabel *nickLabel; ///昵称 @@ -68,14 +69,12 @@ } #pragma mark - getter -- (UIView *)mainView { +- (UIImageView *)mainView { if (!_mainView) { - _mainView = [[UIView alloc] init]; + _mainView = [[UIImageView alloc] init]; _mainView.layer.cornerRadius = 10; _mainView.layer.masksToBounds = YES; - _mainView.layer.borderWidth = 0.5; - _mainView.layer.borderColor = UIColorFromRGB(0xFFBC51).CGColor; - _mainView.backgroundColor = UIColorFromRGB(0x7A4B00); + _mainView.image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x5FCCE4), UIColorFromRGB(0xE15AFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(150, 20)]; } return _mainView; } @@ -84,7 +83,7 @@ if (!_nickLabel) { UILabel *label = [[UILabel alloc] init]; label.font = [UIFont systemFontOfSize:12]; - label.textColor = [UIColor whiteColor]; + label.textColor = UIColorRGBAlpha(0x000000, 0.5); [label sizeToFit]; label.text = @"任务已完成"; _nickLabel = label; @@ -96,7 +95,7 @@ if (!_gotoLabel) { UILabel *label = [[UILabel alloc] init]; label.font = [UIFont systemFontOfSize:12]; - label.textColor = UIColorFromRGB(0xFFBC51); + label.textColor = [UIColor whiteColor]; [label sizeToFit]; label.text = @"查看奖励"; _gotoLabel = label; diff --git a/xplan-ios/Main/Room/View/ThemeColor+Room.m b/xplan-ios/Main/Room/View/ThemeColor+Room.m index 006ea823..6b58cf99 100644 --- a/xplan-ios/Main/Room/View/ThemeColor+Room.m +++ b/xplan-ios/Main/Room/View/ThemeColor+Room.m @@ -37,7 +37,7 @@ /// 没有用户的 坑位的背景色 + (UIColor *)positionNormalNickBackColor { - return [UIColor colorWithWhite:1 alpha:0.4]; + return [UIColor colorWithWhite:1 alpha:0.2]; } ///老板位 坑位开始背景色 @@ -53,7 +53,7 @@ ///公屏默认背景的颜色 + (UIColor *)messageBubbleColor { - return UIColorRGBAlpha(0xD8D8D8, 0.2); + return UIColorRGBAlpha(0xFFFFFF, 0.15); } ///公屏文字的颜色 + (UIColor *)messageTextColor {