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

我的关注、粉丝列表展示贵族特权

Browse Source
This commit is contained in:
chenguilong
2022-01-13 12:00:54 +08:00
committed by fengshuo
parent 5b5533b8fd
commit 4f71a4f70c
5 changed files with 73 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xplan-ios.xcodeproj/project.pbxproj
View File

@@ -129,7 +129,6 @@
9B208A482779C30100F9E54A /* XCGameRoomFaceContainerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B208A442779C30100F9E54A /* XCGameRoomFaceContainerCell.m */; };
9B208A4E2779C30600F9E54A /* XCGameRoomFaceTitleDisplayModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B208A4B2779C30600F9E54A /* XCGameRoomFaceTitleDisplayModel.m */; };
9B208A4F2779C30600F9E54A /* XCGameRoomFaceViewDisplayModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B208A4D2779C30600F9E54A /* XCGameRoomFaceViewDisplayModel.m */; };
9B2489B927C4B475006CFB85 /* UIColor+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2489B827C4B475006CFB85 /* UIColor+Extension.m */; };
9B2A12D52783EEC700CED41B /* XPNobleCenterTableHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2A12D42783EEC700CED41B /* XPNobleCenterTableHeadView.m */; };
9B2A12D82783F42300CED41B /* XPNoblePrivilegeContentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2A12D72783F42300CED41B /* XPNoblePrivilegeContentCell.m */; };
9B2A12DB2783F88800CED41B /* XPNoblePrivilegeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B2A12DA2783F88800CED41B /* XPNoblePrivilegeCell.m */; };
@@ -767,8 +766,6 @@
9B208A4B2779C30600F9E54A /* XCGameRoomFaceTitleDisplayModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XCGameRoomFaceTitleDisplayModel.m; sourceTree = "<group>"; };
9B208A4C2779C30600F9E54A /* XCGameRoomFaceTitleDisplayModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XCGameRoomFaceTitleDisplayModel.h; sourceTree = "<group>"; };
9B208A4D2779C30600F9E54A /* XCGameRoomFaceViewDisplayModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XCGameRoomFaceViewDisplayModel.m; sourceTree = "<group>"; };
9B2489B727C4B475006CFB85 /* UIColor+Extension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+Extension.h"; sourceTree = "<group>"; };
9B2489B827C4B475006CFB85 /* UIColor+Extension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+Extension.m"; sourceTree = "<group>"; };
9B2A12D32783EEC700CED41B /* XPNobleCenterTableHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterTableHeadView.h; sourceTree = "<group>"; };
9B2A12D42783EEC700CED41B /* XPNobleCenterTableHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNobleCenterTableHeadView.m; sourceTree = "<group>"; };
9B2A12D62783F42300CED41B /* XPNoblePrivilegeContentCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNoblePrivilegeContentCell.h; sourceTree = "<group>"; };
@@ -4780,7 +4777,6 @@
1808072D2731598F001FD836 /* XPNetImageYYLabel.m in Sources */,
E896EFAF2771AF0F00AD2CC1 /* XPMineFriendEmptyTableViewCell.m in Sources */,
18486213271EA9DA005FC5DC /* RtcManager.m in Sources */,
9B2489B927C4B475006CFB85 /* UIColor+Extension.m in Sources */,
186A536926FC6F2E00D67B2C /* XPShareView.m in Sources */,
9BC5C91C277C8A7B007C8719 /* XPReleaseRadioViewController.m in Sources */,
186A534C26FC6ED900D67B2C /* TTAlertView.m in Sources */,

5
xplan-ios/Main/Mine/Model/Friend/FansInfoModel.h
View File

@@ -7,6 +7,8 @@
#import <Foundation/Foundation.h>
#import "XPEnum.h"
#import "UserVipInfoVo.h"
NS_ASSUME_NONNULL_BEGIN
@interface FansInfoModel : NSObject
@@ -30,6 +32,9 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic,assign) BOOL valid;
///当前用户所在的房间 映射的字段
@property (nonatomic,copy) NSString *userInRoomUid;
///贵族信息
@property (nonatomic, strong) UserVipInfoVo *userVipInfoVO;
@end
NS_ASSUME_NONNULL_END

39
xplan-ios/Main/Mine/View/Cell/Friend/XPMineAttentionTableViewCell.m
View File

@@ -12,6 +12,7 @@
#import "NetImageView.h"
#import "ThemeColor.h"
#import "UIImage+Utils.h"
#import "UIColor+Extension.h"
///Model
#import "FansInfoModel.h"
@@ -28,6 +29,8 @@
@property (nonatomic,strong) NetImageView *experImageView;
///魅力等级
@property (nonatomic,strong) NetImageView *charmImageView;
///贵族
@property (nonatomic,strong) NetImageView *nobleImageView;
///签名
@property (nonatomic,strong) UILabel *signLabel;
///找到他
@@ -56,10 +59,11 @@
[self.contentView addSubview:self.findButton];
[self.contentView addSubview:self.lineView];
[self.stackView addArrangedSubview:self.nickLabel];
[self.stackView addArrangedSubview:self.sexImageView];
[self.stackView addArrangedSubview:self.experImageView];
[self.stackView addArrangedSubview:self.charmImageView];
[self.stackView addArrangedSubview:self.nobleImageView];
[self.stackView addArrangedSubview:self.nickLabel];
[self.stackView addArrangedSubview:self.sexImageView];
[self.stackView addArrangedSubview:self.experImageView];
[self.stackView addArrangedSubview:self.charmImageView];
}
- (void)initSubViewConstraints {
@@ -108,6 +112,7 @@
self.avatarImageView.imageUrl = _fansInfo.avatar;
self.experImageView.imageUrl = _fansInfo.experUrl;
self.charmImageView.imageUrl = _fansInfo.charmUrl;
self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.vipIcon;
self.nickLabel.text = _fansInfo.nick;
NSString *sexStr;
if (_fansInfo.gender == GenderType_Male) {
@@ -134,7 +139,7 @@
}
UIImage* charmImage = self.charmImageView.image;
if (image) {
if (charmImage) {
CGFloat scale = charmImage.size.width / charmImage.size.height;
[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
@@ -147,6 +152,23 @@
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
}];
}
UIImage *nobleImage = self.nobleImageView.image;
if (nobleImage) {
CGFloat scale = nobleImage.size.width / nobleImage.size.height;
[self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
}];
} else {
[self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(0, 20));
}];
}
if (fansInfo.userVipInfoVO && fansInfo.userVipInfoVO.friendNickColour) {
self.nickLabel.textColor = [UIColor colorWithHexString:fansInfo.userVipInfoVO.friendNickColour];
} else {
self.nickLabel.textColor = [ThemeColor mainTextColor];
}
}
}
@@ -212,6 +234,13 @@
return _charmImageView;
}
- (NetImageView *)nobleImageView {
if (!_nobleImageView) {
_nobleImageView = [[NetImageView alloc] init];
}
return _nobleImageView;
}
- (UILabel *)signLabel{
if (!_signLabel) {
_signLabel = [[UILabel alloc] init];

36
xplan-ios/Main/Mine/View/Cell/Friend/XPMineFansTableViewCell.m
View File

@@ -13,6 +13,7 @@
#import "NetImageView.h"
#import "ThemeColor.h"
#import "UIImage+Utils.h"
#import "UIColor+Extension.h"
///Model
#import "FansInfoModel.h"
@@ -29,6 +30,8 @@
@property (nonatomic,strong) NetImageView *experImageView;
///魅力等级
@property (nonatomic,strong) NetImageView *charmImageView;
///贵族
@property (nonatomic,strong) NetImageView *nobleImageView;
///签名
@property (nonatomic,strong) UILabel *signLabel;
///关注
@@ -56,12 +59,13 @@
[self.contentView addSubview:self.signLabel];
[self.contentView addSubview:self.attentionButton];
[self.contentView addSubview:self.lineView];
[self.stackView addArrangedSubview:self.nobleImageView];
[self.stackView addArrangedSubview:self.nickLabel];
[self.stackView addArrangedSubview:self.sexImageView];
[self.stackView addArrangedSubview:self.experImageView];
[self.stackView addArrangedSubview:self.charmImageView];
}
}
- (void)initSubViewConstraints {
[self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -109,6 +113,7 @@
self.avatarImageView.imageUrl = _fansInfo.avatar;
self.experImageView.imageUrl = _fansInfo.experUrl;
self.charmImageView.imageUrl = _fansInfo.charmUrl;
self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.vipIcon;
self.nickLabel.text = _fansInfo.nick;
NSString *sexStr;
if (_fansInfo.gender == GenderType_Male) {
@@ -138,7 +143,7 @@
}
UIImage* charmImage = self.charmImageView.image;
if (image) {
if (charmImage) {
CGFloat scale = charmImage.size.width / charmImage.size.height;
[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
@@ -151,6 +156,24 @@
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
}];
}
UIImage *nobleImage = self.nobleImageView.image;
if (nobleImage) {
CGFloat scale = nobleImage.size.width / nobleImage.size.height;
[self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(20* scale, 20));
}];
} else {
[self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.size.mas_equalTo(CGSizeMake(0, 20));
}];
}
if (fansInfo.userVipInfoVO && fansInfo.userVipInfoVO.friendNickColour) {
self.nickLabel.textColor = [UIColor colorWithHexString:fansInfo.userVipInfoVO.friendNickColour];
} else {
self.nickLabel.textColor = [ThemeColor mainTextColor];
}
}
}
@@ -212,6 +235,13 @@
return _charmImageView;
}
- (NetImageView *)nobleImageView {
if (!_nobleImageView) {
_nobleImageView = [[NetImageView alloc] init];
}
return _nobleImageView;
}
- (UILabel *)signLabel{
if (!_signLabel) {
_signLabel = [[UILabel alloc] init];

1
xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m
View File

@@ -117,6 +117,7 @@
[self addSubview:self.nobleEntranceView];
[self addSubview:self.nobleImageView];
[self.nameStackView addArrangedSubview:self.nobleImageView];
[self.nameStackView addArrangedSubview:self.nameLabel];
[self.nameStackView addArrangedSubview:self.editButton];
[self.idStackView addArrangedSubview:self.idLabel];