diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m index 7fd96efa..90dfc199 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineDressBubbleCollectionViewCell.m @@ -71,19 +71,31 @@ make.height.mas_equalTo(14); }]; +// [self.userCardBackView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.height.mas_equalTo(44); +// make.width.mas_equalTo(84); +// make.centerX.mas_equalTo(self.mainView); +// make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(16); +// }]; +// +// [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.height.mas_equalTo(30); +// make.width.mas_equalTo(60); +// make.bottom.mas_equalTo(self.userCardBackView).mas_offset(-5); +// make.centerX.mas_equalTo(self.userCardBackView); +// }]; + [self.userCardBackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(44); - make.width.mas_equalTo(84); - make.centerX.mas_equalTo(self.mainView); - make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(16); - }]; - - [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(30); - make.width.mas_equalTo(60); - make.bottom.mas_equalTo(self.userCardBackView).mas_offset(-5); - make.centerX.mas_equalTo(self.userCardBackView); - }]; + make.height.mas_equalTo(92); + make.top.mas_equalTo(self.titleLabel.mas_bottom).mas_offset(0); + make.left.right.mas_equalTo(0); + }]; + CGFloat dressImageW = (KScreenWidth - 42) *0.5; + [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.mas_equalTo(CGSizeMake(dressImageW * 0.7, 70)); + make.top.mas_equalTo(11); + make.centerX.mas_equalTo(self.userCardBackView); + }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.mainView); @@ -95,7 +107,7 @@ make.centerX.mas_equalTo(self.mainView); make.height.mas_equalTo(24); make.width.mas_equalTo(89); - make.top.mas_equalTo(self.userCardBackView.mas_bottom).mas_offset(17); + make.top.mas_equalTo(self.userCardBackView.mas_bottom).mas_offset(10); }]; } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m index 679acba5..67d7eb37 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m @@ -573,12 +573,26 @@ self.beautifulImageViw.hidden = !userInfo.hasPrettyErbanNo; self.newUserImageView.hidden = !userInfo.newUser; if (userInfo.userLevelVo.experUrl) { - self.experImageView.imageUrl = userInfo.userLevelVo.experUrl; + [self.experImageView loadImageWithUrl:userInfo.userLevelVo.experUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { + self.experImageView.image = image; + CGFloat width = image.size.width*20/ (image.size.height > 0 ? image.size.height : 1); + [self.experImageView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.height.mas_equalTo(20); + make.width.mas_equalTo(width); + }]; + }]; } self.experImageView.hidden = userInfo.userLevelVo.experUrl.length <= 0; if (userInfo.userLevelVo.charmUrl) { - self.charmImageView.imageUrl = userInfo.userLevelVo.charmUrl; + [self.charmImageView loadImageWithUrl:userInfo.userLevelVo.charmUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { + self.charmImageView.image = image; + CGFloat width = image.size.width*20/ (image.size.height > 0 ? image.size.height : 1); + [self.charmImageView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.height.mas_equalTo(20); + make.width.mas_equalTo(width); + }]; + }] ; } self.charmImageView.hidden = userInfo.userLevelVo.charmUrl.length <= 0; @@ -849,12 +863,11 @@ - (NetImageView *)experImageView { if (!_experImageView) { NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; config.imageType = ImageTypeUserCardLevel; _experImageView = [[NetImageView alloc] initWithConfig:config]; _experImageView.userInteractionEnabled = YES; _experImageView.hidden = YES; - _experImageView.contentMode = UIViewContentModeScaleAspectFit; + _experImageView.contentMode = UIViewContentModeScaleToFill; } return _experImageView; } @@ -862,12 +875,11 @@ - (NetImageView *)charmImageView { if (!_charmImageView) { NetImageConfig * config = [[NetImageConfig alloc] init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; config.imageType = ImageTypeUserCardLevel; _charmImageView = [[NetImageView alloc] initWithConfig:config]; _charmImageView.userInteractionEnabled = YES; _charmImageView.hidden = YES; - _charmImageView.contentMode = UIViewContentModeScaleAspectFit; + _charmImageView.contentMode = UIViewContentModeScaleToFill; } return _charmImageView; }