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; }