yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了一些UI踢出的问题

Browse Source
This commit is contained in:
fengshuo
2022-06-21 15:50:07 +08:00
parent 65588d0cc3
commit a8d6812cc1
16 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xplan-ios/Main/ModuleKit/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m
View File

@@ -261,6 +261,8 @@
if (!_giftImageView) {
_giftImageView = [[NetImageView alloc] init];
_giftImageView.backgroundColor = [UIColor clearColor];
_giftImageView.layer.masksToBounds = YES;
_giftImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _giftImageView;
}

38
xplan-ios/Main/ModuleKit/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m
View File

@@ -72,33 +72,40 @@
- (void)setFirstCharmRankUser:(XPWeekStarRankUserModel *)firstCharmRankUser {
_firstCharmRankUser = firstCharmRankUser;
if (_firstCharmRankUser) {
self.avatarImageView.layer.borderColor = UIColorFromRGB(0xA563EB).CGColor;
[self.contentButton setBackgroundImage:[UIImage imageNamed:@"gift_info_week_star_charm_bg"] forState:UIControlStateNormal];
self.avatarImageView.imageUrl = _firstCharmRankUser.avatar;
NSString * nick = _firstCharmRankUser.nick;
if (nick.length > 8) {
nick = [nick substringFromIndex:8];
}
self.nickLabel.text = nick;
[self.contentButton setTitle:@"本周该礼物冠名者" forState:UIControlStateNormal];
[self.contentButton setTitleColor:UIColorFromRGB(0x35105C) forState:UIControlStateNormal];
} else {
self.avatarImageView.image = [UIImageConstant defaultEmptyAvatarPlaceholder];
self.nickLabel.text = @"虚位以待";
}
self.avatarImageView.layer.borderColor = UIColorFromRGB(0xA563EB).CGColor;
[self.contentButton setBackgroundImage:[UIImage imageNamed:@"gift_info_week_star_charm_bg"] forState:UIControlStateNormal];
[self.contentButton setTitle:@"本周该礼物冠名者" forState:UIControlStateNormal];
[self.contentButton setTitleColor:UIColorFromRGB(0x35105C) forState:UIControlStateNormal];
}
- (void)setFirstLevelRankUser:(XPWeekStarRankUserModel *)firstLevelRankUser {
_firstLevelRankUser = firstLevelRankUser;
if (_firstLevelRankUser) {
self.avatarImageView.layer.borderColor = UIColorFromRGB(0xFFBC51).CGColor;
[self.contentButton setBackgroundImage:[UIImage imageNamed:@"gift_info_week_star_level_bg"] forState:UIControlStateNormal];
self.avatarImageView.imageUrl = _firstLevelRankUser.avatar;
NSString * nick = _firstLevelRankUser.nick;
if (nick.length > 8) {
nick = [nick substringFromIndex:8];
}
self.nickLabel.text = nick;
[self.contentButton setTitle:@"本周该礼物星神豪" forState:UIControlStateNormal];
[self.contentButton setTitleColor:UIColorFromRGB(0x754304) forState:UIControlStateNormal];
} else {
self.avatarImageView.image = [UIImageConstant defaultEmptyAvatarPlaceholder];
self.nickLabel.text = @"虚位以待";
}
self.avatarImageView.layer.borderColor = UIColorFromRGB(0xFFBC51).CGColor;
[self.contentButton setBackgroundImage:[UIImage imageNamed:@"gift_info_week_star_level_bg"] forState:UIControlStateNormal];
[self.contentButton setTitle:@"本周该礼物星神豪" forState:UIControlStateNormal];
[self.contentButton setTitleColor:UIColorFromRGB(0x754304) forState:UIControlStateNormal];
}
@@ -255,19 +262,8 @@
- (void)setSelectGiftInfo:(GiftInfoModel *)selectGiftInfo {
_selectGiftInfo = selectGiftInfo;
if (_selectGiftInfo) {
if (_selectGiftInfo.firstCharmRankUser) {
self.sendUserView.hidden = NO;
self.sendUserView.firstCharmRankUser = _selectGiftInfo.firstCharmRankUser;
} else {
self.sendUserView.hidden = YES;
}
if (_selectGiftInfo.firstLevelRankUser) {
self.receiveUserView.hidden = NO;
self.receiveUserView.firstLevelRankUser = _selectGiftInfo.firstLevelRankUser;
} else {
self.receiveUserView.hidden = YES;
}
self.sendUserView.firstCharmRankUser = _selectGiftInfo.firstCharmRankUser;
self.receiveUserView.firstLevelRankUser = _selectGiftInfo.firstLevelRankUser;
} else {
self.receiveUserView.hidden = YES;
self.sendUserView.hidden = YES;

9
xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m
View File

@@ -163,6 +163,7 @@
make.left.right.mas_equalTo(self);
make.height.mas_equalTo(108 * 2 + 20);
}];
[self.pageController mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(10);
@@ -361,7 +362,7 @@
} else {
page = self.datasource.count / 8 + 1;
}
self.pageController.hidden = page <= 1;
self.pageController.hidden = page <= 1 || _segmentType == GiftSegmentType_WeekStar;
[self.pageController setNumberOfPages:page];
self.pageController.currentPage = 0;
[self.giftcollectionView reloadData];
@@ -418,7 +419,7 @@
_segmentStackView.axis = UILayoutConstraintAxisHorizontal;
_segmentStackView.distribution = UIStackViewDistributionFill;
_segmentStackView.alignment = UIStackViewAlignmentCenter;
_segmentStackView.spacing = 14;
_segmentStackView.spacing = 10;
_segmentStackView.backgroundColor = [UIColor clearColor];
}
return _segmentStackView;
@@ -576,7 +577,9 @@
- (UIView *)segmentPlaceView {
if (!_segmentPlaceView) {
_segmentPlaceView = [[UIView alloc] init];
_segmentPlaceView.backgroundColor = [UIColor clearColor];
_segmentPlaceView.backgroundColor = [UIColor redColor];
[_segmentPlaceView setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
[_segmentPlaceView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
}
return _segmentPlaceView;
}