diff --git a/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.h b/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.h index e04c0775..6e3d06f9 100644 --- a/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.h +++ b/YuMi/Modules/YMNewHome/View/Search/Model/HomeSearchResultModel.h @@ -7,10 +7,12 @@ #import #import "YUMINNNN.h" +#import "UserLevelVo.h" NS_ASSUME_NONNULL_BEGIN -@interface HomeSearchResultModel : PIBaseModel +@interface HomeSearchResultModel : PIBaseModel +@property(nonatomic,strong) UserLevelVo *userLevelVo; ///头像 @property (nonatomic,copy) NSString *avatar; ///在线人数 diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m index fbb14a49..e0f2094a 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m @@ -24,8 +24,6 @@ @property (nonatomic,strong) UIStackView *nameStackView; ///昵称 @property (nonatomic,strong) UILabel *nickLabel; -///性别 -@property (nonatomic,strong) UIButton *sexImageView; ///显示id @property (nonatomic,strong) UILabel *idLabel; ///分割线 @@ -36,6 +34,10 @@ @property (nonatomic,strong) UIImageView *noteImageView; ///数量 @property (nonatomic,strong) UILabel *numberLabel; +///等级 +@property (nonatomic,strong) NetImageView *experImageView; +///魅力等级 +@property (nonatomic,strong) NetImageView *charmImageView; @end @implementation XPSearchListTableViewCell @@ -51,12 +53,11 @@ - (void)configData:(HomeSearchResultModel *)resultModel type:(SearchType)type { if (resultModel) { self.avatarImageView.imageUrl = resultModel.avatar; - self.nickLabel.text = type == SearchType_Room ? resultModel.title : resultModel.nick; + NSString *name = type == SearchType_Room ? resultModel.title : resultModel.nick; + self.nickLabel.text = name.length > 8 ? [NSString stringWithFormat:@"%@...",[name substringToIndex:8]]:name; self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineUserInfoTableViewCell3"),AppName, resultModel.erbanNo]; - [self.sexImageView setTitle:[NSString getAgeWithBirth:resultModel.birth] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = resultModel.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = resultModel.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = resultModel.gender != GenderType_Male; + self.charmImageView.imageUrl = resultModel.userLevelVo.charmUrl; + self.experImageView.imageUrl = resultModel.userLevelVo.experUrl; if (type == SearchType_Users) { self.numberLabel.text = YMLocalizedString(@"XPSearchListTableViewCell1"); self.numberView.hidden = resultModel.roomUid.length <= 0; @@ -76,11 +77,7 @@ self.avatarImageView.imageUrl = resultModel.avatar; self.nickLabel.text = resultModel.title ; self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineUserInfoTableViewCell3"),AppName, resultModel.erbanNo]; - - [self.sexImageView setTitle:[NSString getAgeWithBirth:resultModel.birth] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = resultModel.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = resultModel.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = resultModel.gender != GenderType_Male; + if (resultModel.onlineNum > 100) { self.numberLabel.text = [NSString stringWithFormat:@"%ld", resultModel.onlineNum]; } else { @@ -103,7 +100,8 @@ [self.numberView addSubview:self.noteImageView]; [self.nameStackView addArrangedSubview:self.nickLabel]; - [self.nameStackView addArrangedSubview:self.sexImageView]; + [self.nameStackView addArrangedSubview:self.experImageView]; + [self.nameStackView addArrangedSubview:self.charmImageView]; } - (void)initSubViewConstraints { @@ -119,10 +117,7 @@ make.bottom.mas_equalTo(self.avatarImageView.mas_centerY).offset(-1.5); }]; - [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(28); - make.height.mas_equalTo(14); - }]; + [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(self.nameStackView); @@ -153,6 +148,17 @@ make.size.mas_equalTo(CGSizeMake(10, 9)); make.right.mas_equalTo(self.numberLabel.mas_left).offset(-3); }]; + + [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(kGetScaleWidth(36)); + make.height.mas_equalTo(kGetScaleWidth(18)); + + }]; + [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(kGetScaleWidth(36)); + make.height.mas_equalTo(kGetScaleWidth(18)); + + }]; } #pragma mark - Getters And Setters @@ -190,19 +196,7 @@ return _nickLabel; } -- (UIButton *)sexImageView { - if (!_sexImageView) { - _sexImageView = [[UIButton alloc] init]; - [_sexImageView setImage:kImage(@"home_age_boy_icon") forState:UIControlStateNormal]; - [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; - _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); - _sexImageView.layer.cornerRadius = 14/2; - _sexImageView.layer.masksToBounds = YES; - } - return _sexImageView; -} + - (UILabel *)idLabel { if (!_idLabel) { @@ -251,5 +245,22 @@ } return _numberLabel; } +- (NetImageView *)experImageView { + if (!_experImageView) { + NetImageConfig * config = [[NetImageConfig alloc]init]; + config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; + _experImageView = [[NetImageView alloc] initWithConfig:config]; + } + return _experImageView; +} + +- (NetImageView *)charmImageView { + if (!_charmImageView) { + NetImageConfig * config = [[NetImageConfig alloc]init]; + config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; + _charmImageView = [[NetImageView alloc] initWithConfig:config]; + } + return _charmImageView; +} @end diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m index 300802d5..0cb70976 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m @@ -122,19 +122,19 @@ ///更新对方麦状态 - (void)updateOtherMicStatus:(AttachmentModel *)attachment { -// NSNumber *micStatus = attachment.data[@"aMicStatus"]; -// NSNumber *aUid = attachment.data[@"aUid"]; -// self.otherMicButton.selected = !micStatus.boolValue; -// [[RtcManager instance] muteOne:!micStatus.boolValue userId:[NSString stringWithFormat:@"%@", aUid]]; -// if (!micStatus.boolValue) { -// [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPkPanelView0")]; -// self.otherMicButton.hidden = NO; -// } else { -// self.otherMicButton.hidden = YES; -// } -// if ([self.pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]) { -// self.otherMicButton.hidden = NO; -// } + NSNumber *micStatus = attachment.data[@"aMicStatus"]; + NSNumber *aUid = attachment.data[@"aUid"]; + self.otherMicButton.selected = !micStatus.boolValue; + [[RtcManager instance] muteOne:!micStatus.boolValue userId:[NSString stringWithFormat:@"%@", aUid]]; + if (!micStatus.boolValue) { + [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPkPanelView0")]; + self.otherMicButton.hidden = NO; + } else { + self.otherMicButton.hidden = YES; + } + if ([self.pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]) { + self.otherMicButton.hidden = NO; + } } - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event { @@ -522,11 +522,11 @@ self.otherNickLabel.text = pkPanelInfo.aNick; self.redNickLabel.text = pkPanelInfo.cNick; self.followButton.hidden = [pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]; -// if (pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close) { -// self.otherMicButton.hidden = NO; -// } else { -// self.otherMicButton.hidden = ![pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]; -// } + if (pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close) { + self.otherMicButton.hidden = NO; + } else { + self.otherMicButton.hidden = ![pkPanelInfo.cUid isEqualToString:[AccountInfoStorage instance].getUid]; + } self.otherMicButton.selected = pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close; [[RtcManager instance] muteOne:pkPanelInfo.aMicStatus == AnchorPKOtherMicStatus_Close userId:pkPanelInfo.aUid]; } else { diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m index ef70fbe9..d602ff82 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m @@ -449,7 +449,12 @@ self.nickLabel.textColor = [DJDKMIMOMColor positionNickColor]; } if (self.microModel.microState.position == -1) { - self.sexImageView.hidden = NO; + [self.stackView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.centerX.mas_equalTo(self); + make.top.mas_equalTo(self.avatarImageView.mas_bottom).offset(10); + make.width.mas_lessThanOrEqualTo(kGetScaleWidth(150)); + }]; + self.sexImageView.hidden = YES; self.postionLabel.hidden = YES; [self.sexImageView setTitle:[NSString getAgeWithBirth:userInfo.birth] forState:UIControlStateNormal]; self.sexImageView.backgroundColor = userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC);