公屏消息、资料卡增加贵族icon

xplan-ios/Main/Mine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.m

@@ -95,7 +95,7 @@
     [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(180);
         make.width.mas_equalTo(330);
-        make.bottom.mas_equalTo(self.mainView);
+        make.bottom.mas_equalTo(self.userCardBackImageView);
         make.centerX.mas_equalTo(self.mainView);
     }];
 }

xplan-ios/Main/Room/View/MessageContainerView/Model/XPMessageRemoteExtModel.h

@@ -35,6 +35,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) NSString *inRoomNameplatePic;
 ///铭牌的字
 @property (nonatomic,copy) NSString *inRoomNameplateWord;
+///贵族icon
+@property (nonatomic, copy) NSString *vipIcon;
 
 @end
 

xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageParser.m

@@ -94,15 +94,22 @@
     NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
 	///官方新用户
 	[attribute appendAttributedString:[self createOfficalAndNewuserAttribute:model.defUser newUser:model.newUser]];
+    if (model.vipIcon) {//贵族icon
+        [attribute appendAttributedString:[self createUrlImageAttribute:model.vipIcon]];
+        [attribute appendAttributedString:[self createSapceAttribute:2]];
+    }
     if (model.experUrl) {
 		[attribute appendAttributedString:[self createUrlImageAttribute:model.experUrl]];
         [attribute appendAttributedString:[self createSapceAttribute:2]];
     }
 	
-	if (model.inRoomNameplatePic.length > 0 && model.inRoomNameplateWord.length > 0) {
+	if (model.inRoomNameplatePic.length > 0 && model.inRoomNameplateWord.length > 0) { //铭牌有图片加文字
 		[attribute appendAttributedString:[self createNameplateAttibute:model.inRoomNameplateWord image:model.inRoomNameplatePic textFont:[UIFont systemFontOfSize:9]]];
 		[attribute appendAttributedString:[self createSapceAttribute:2]];
-	}
+    } else if (model.inRoomNameplatePic.length > 0) {//铭牌只有图片
+        [attribute appendAttributedString:[self createUrlImageAttribute:model.inRoomNameplatePic]];
+        [attribute appendAttributedString:[self createSapceAttribute:2]];
+    }
 	[attribute appendAttributedString:[self createTextAttribute:nick color:[ThemeColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
     [attribute appendAttributedString:[self createSapceAttribute:2]];
 	[attribute appendAttributedString:[self createTextAttribute:message.text color:[ThemeColor messageTextColor] font:kRoomMessageDefalutFont]];
@@ -130,6 +137,14 @@
             NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
 			NSDictionary * dic = [(NSDictionary *)messageExt.roomExt.toJSONObject objectForKey:message.from];
 			XPMessageRemoteExtModel * extModel = [XPMessageRemoteExtModel modelWithDictionary:dic];
+            if (extModel.vipIcon.length > 0) {//贵族icon
+                [attribute appendAttributedString:[self createUrlImageAttribute:extModel.vipIcon]];
+                [attribute appendAttributedString:[self createSapceAttribute:2]];
+            }
+            if (extModel.experUrl.length > 0) {//等级
+                [attribute appendAttributedString:[self createUrlImageAttribute:extModel.experUrl]];
+                [attribute appendAttributedString:[self createSapceAttribute:2]];
+            }
 			if (extModel.inRoomNameplatePic.length > 0 && extModel.inRoomNameplateWord.length > 0) {
 				[attribute appendAttributedString:[self createNameplateAttibute:extModel.inRoomNameplateWord image:extModel.inRoomNameplatePic textFont:[UIFont systemFontOfSize:9]]];
 				[attribute appendAttributedString:[self createSapceAttribute:2]];

xplan-ios/Main/Room/View/UserCard/View/XPUserCardViewController.m

@@ -71,8 +71,10 @@
 @property (nonatomic,strong) UIImageView *officalImageView;
 ///魅力等级 等级 铭牌
 @property (nonatomic,strong) UIStackView *tagStackView;
-///美丽等级
+///魅力等级
 @property (nonatomic,strong) NetImageView *charmImageView;
+///贵族icon
+@property (nonatomic, strong) NetImageView *nobleIconImageView;
 ///等级
 @property (nonatomic,strong) NetImageView *experImageView;
 ///铭牌的容器
@@ -152,6 +154,7 @@
 	[self.userInfoView addSubview:self.effectView];
 	[self.userInfoView addSubview:self.avatarImageView];
 	[self.userInfoView addSubview:self.headWearImageView];
+    [self.userInfoView addSubview:self.nobleIconImageView];
 	[self.userInfoView addSubview:self.nickLabel];
 	[self.userInfoView addSubview:self.sexImageView];
 	[self.userInfoView addSubview:self.tagStackView];
@@ -198,13 +201,12 @@
 		make.width.mas_equalTo(self.stackView);
 		make.height.mas_equalTo(110);
 	}];
-//    width KScreenWidth - 90;
-	
+    CGFloat nobleMargin = (KScreenWidth - 45) * 45.0 / (KScreenWidth - 90);
     [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(180);
         make.top.mas_equalTo(self.backView).mas_offset(-70);
-        make.right.mas_equalTo(self.backView).offset(22.5);
-        make.left.mas_equalTo(self.backView).mas_offset(-22.5);
+        make.right.mas_equalTo(self.backView).offset(nobleMargin*0.5);
+        make.left.mas_equalTo(self.backView).mas_offset(-nobleMargin*0.5);
     }];
 	[self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.width.mas_equalTo(self.userInfoView);
@@ -240,8 +242,15 @@
 		make.height.mas_equalTo(self.headWearImageView.mas_width);
 	}];
     
+    [self.nobleIconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.avatarImageView.mas_right).offset(5);
+        make.top.mas_equalTo(self.avatarImageView);
+        make.height.mas_equalTo(20);
+        make.width.mas_equalTo(0);
+    }];
+	
 	[self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.mas_equalTo(self.avatarImageView.mas_right).offset(5);
+		make.left.mas_equalTo(self.nobleIconImageView.mas_right);
 		make.top.mas_equalTo(self.avatarImageView);
 	}];
 	
@@ -252,13 +261,13 @@
 	}];
 	
 	[self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.mas_equalTo(self.nickLabel);
-		make.top.mas_equalTo(self.nickLabel.mas_bottom).offset(3);
+		make.left.mas_equalTo(self.nobleIconImageView);
+		make.top.mas_equalTo(self.nobleIconImageView.mas_bottom).offset(3);
 		make.height.mas_equalTo(20);
 	}];
 	
 	[self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.mas_equalTo(self.nickLabel);
+		make.left.mas_equalTo(self.nobleIconImageView);
 		make.top.mas_equalTo(self.tagStackView.mas_bottom).offset(3);
 	}];
 	
@@ -455,6 +464,15 @@
 	self.avatarImageView.imageUrl = userInfo.avatar;
 	self.backImageView.imageUrl = userInfo.avatar;
     self.nobleImageView.imageUrl = userInfo.userInfoCardPic;
+    self.nobleIconImageView.imageUrl = userInfo.userVipInfoVO.vipIcon;
+    if (userInfo.userVipInfoVO && userInfo.userVipInfoVO.vipIcon) {//贵族icon
+        [self.nobleIconImageView mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.width.mas_equalTo(20);
+        }];
+        [self.nickLabel mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(self.nobleIconImageView.mas_right).mas_offset(2);
+        }];
+    }
 	NSString * nick = userInfo.nick;
 	if (nick.length > 10) {
 		nick = [NSString stringWithFormat:@"%@…", [nick substringToIndex:10]];
@@ -946,6 +964,17 @@
 	return _charmImageView;
 }
 
+- (NetImageView *)nobleIconImageView {
+    if (!_nobleIconImageView) {
+        NetImageConfig * config = [[NetImageConfig alloc] init];
+        config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
+        config.imageType = ImageTypeUserCardLevel;
+        _nobleIconImageView = [[NetImageView alloc] initWithConfig:config];
+        _nobleIconImageView.contentMode = UIViewContentModeScaleAspectFit;
+    }
+    return _nobleIconImageView;
+}
+
 - (UIView *)namePlateView {
 	if (!_namePlateView) {
 		_namePlateView = [[UIView alloc] init];