From dcd841a9120ce5f27c9a90384a9046339325427f Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Fri, 21 Jun 2024 19:14:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20UI=20=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/Cell/XPNewHomePartyCollectionViewCell.m | 5 ++--- .../View/CustomView/XPNewHomeItemCell.m | 2 +- .../YMNewHome/View/XPHomeMineViewController.m | 16 ---------------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m index 184aac88..f1f93b9e 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m @@ -146,9 +146,8 @@ make.width.mas_equalTo(width); }]; }]; - - _subView.text = _roomInfo.introduction; - _subView.text = _roomInfo.roomDesc; + + _subView.text = _roomInfo.roomDesc.length > 0 ? _roomInfo.roomDesc : YMLocalizedString(@"XPHomeMineViewController3"); _heatView.text = @(_roomInfo.onlineNum).stringValue; _rankImageView.image = nil; _pkImageView.hidden = !_roomInfo.crossPking; diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m index 1d812b45..d5d618b5 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeItemCell.m @@ -248,7 +248,7 @@ _pi_BannerView.layer.masksToBounds = YES; _pi_BannerView.delegate = self; _pi_BannerView.showPageControl = NO; - _pi_BannerView.autoScrollTimeInterval = 10.0; + _pi_BannerView.autoScrollTimeInterval = 5.0; [_pi_BannerView disableScrollGesture]; _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; _pi_BannerView.scrollDirection = UICollectionViewScrollDirectionVertical; diff --git a/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m b/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m index 77de81b4..8dac134f 100644 --- a/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPHomeMineViewController.m @@ -87,22 +87,6 @@ [subView removeFromSuperview]; } } - - if (self.miniAvatarsContainer.subviews.count == 0) { - NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; - NetImageView *iconView = [[NetImageView alloc]initWithConfig:config]; - iconView.layer.cornerRadius = kGetScaleWidth(20)/2; - iconView.layer.masksToBounds = YES; - iconView.layer.borderWidth = 1; - iconView.layer.borderColor = [UIColor whiteColor].CGColor; - [self.miniAvatarsContainer addSubview:iconView]; - [iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.miniAvatarsContainer); - make.leading.mas_equalTo(self.miniAvatarsContainer); - make.width.height.mas_equalTo(20); - }]; - } } - (void)setupUI { From 5593656092c98dbf38cad958dcfbcf897806692d Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Sun, 23 Jun 2024 11:02:34 +0800 Subject: [PATCH 2/2] fix some PK ui bugs (cherry picked from commit 8314ba5c5f39f8fb12b4b13382baa7b01d62c323) --- .../View/RoomPK/View/XPRoomPKResultView.m | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m index 1ed452dc..e7acae3b 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m @@ -170,48 +170,28 @@ case 0: self.firstUserView.imageUrl = userInfo.avatar; [self.avatarStackView addArrangedSubview:self.firstUserView]; - [self.firstUserView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(65, 65)); - }]; // self.firstUserView.backgroundLightType = type; [self insertLightForAvatar:self.firstUserView light:light type:type]; break; case 1: self.secondUserView.imageUrl = userInfo.avatar; [self.avatarStackView addArrangedSubview:self.secondUserView]; - [self.secondUserView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(65, 65)); - }]; [self insertLightForAvatar:self.secondUserView light:light type:type]; break; case 2: self.thirdUserView.imageUrl = userInfo.avatar; [self.avatarStackView addArrangedSubview:self.thirdUserView]; - [self.thirdUserView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(65, 65)); - }]; [self insertLightForAvatar:self.thirdUserView light:light type:type]; break; case 3: self.fourthUserView.imageUrl = userInfo.avatar; [self.avatarStackView addArrangedSubview:self.fourthUserView]; - [self.fourthUserView mas_remakeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(65, 65)); - }]; [self insertLightForAvatar:self.fourthUserView light:light type:type]; break; default: break; } [self.avatarStackView addArrangedSubview:[UIView new]]; -// NetImageView * imageView = [self.userViewArray xpSafeObjectAtIndex:i]; -// if (i < members.count) { -// RoomPKTeamUserModel * userInfo = [members xpSafeObjectAtIndex:i]; -// imageView.imageUrl = userInfo.avatar; -// imageView.hidden = NO; -// } else { -// imageView.hidden = YES; -// } } } @@ -406,6 +386,7 @@ default: break; } + [self setNeedsLayout]; } - (void)updateScoreLabel:(RoomPKTeamModel *)model @@ -484,7 +465,7 @@ [self descAreaGroupType:GroupType_Red]; - [self updateBottomTwoButtonsContent:2]; + [self updateBottomTwoButtonsContent:1]; [self updateScoreLabel:redPKTeam GroupType:GroupType_Red]; @@ -590,8 +571,8 @@ _avatarStackView = [[UIStackView alloc] init]; // _avatarStackView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4]; _avatarStackView.axis = UILayoutConstraintAxisHorizontal; - _avatarStackView.distribution = UIStackViewDistributionEqualSpacing; - _avatarStackView.alignment = UIStackViewAlignmentFill; + _avatarStackView.distribution = UIStackViewDistributionEqualCentering; + _avatarStackView.alignment = UIStackViewAlignmentCenter; // _avatarStackView.translatesAutoresizingMaskIntoConstraints = NO; _avatarStackView.spacing = 10; _avatarStackView.clipsToBounds = NO; @@ -657,6 +638,9 @@ _firstUserView.layer.borderWidth = 1; _firstUserView.layer.borderColor = [UIColor whiteColor].CGColor; _firstUserView.userInteractionEnabled = YES; + [_firstUserView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.size.mas_equalTo(CGSizeMake(65, 65)); + }]; } return _firstUserView; } @@ -673,6 +657,9 @@ _secondUserView.layer.borderWidth = 1; _secondUserView.layer.borderColor = [UIColor whiteColor].CGColor; _secondUserView.userInteractionEnabled = YES; + [_secondUserView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.size.mas_equalTo(CGSizeMake(65, 65)); + }]; } return _secondUserView; } @@ -690,6 +677,9 @@ _thirdUserView.layer.borderWidth = 1; _thirdUserView.layer.borderColor = [UIColor whiteColor].CGColor; _thirdUserView.userInteractionEnabled = YES; + [_thirdUserView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.size.mas_equalTo(CGSizeMake(65, 65)); + }]; } return _thirdUserView; } @@ -706,6 +696,9 @@ _fourthUserView.layer.borderWidth = 1; _fourthUserView.layer.borderColor = [UIColor whiteColor].CGColor; _fourthUserView.userInteractionEnabled = YES; + [_fourthUserView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.size.mas_equalTo(CGSizeMake(65, 65)); + }]; } return _fourthUserView; }