个人资料UI修改

xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m

@@ -222,7 +222,7 @@
 
 #pragma mark - JXCategoryViewDelegate
 - (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView {
-	return 398;
+	return [self.headView getHeaderHeight:self.userInfo];
 }
 
 - (UIView *)tableHeaderViewInPagerView:(JXPagerView *)pagerView {
@@ -230,7 +230,7 @@
 }
 
 - (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView {
-	return 50;
+	return 40;
 }
 
 - (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView {
@@ -311,6 +311,7 @@
 	if (userInfo.uid == self.uid) {
 		self.userInfo = userInfo;
 		self.headView.userInfo = userInfo;
+        [self.pagingView resizeTableHeaderViewHeightWithAnimatable:NO duration:0 curve:0];
 	} else {
 		if (!userInfo.userVipInfoVO.lookHomepageHide) {
 			NSString * uid = [NSString stringWithFormat:@"%ld", self.uid];
@@ -466,7 +467,7 @@
 		
         JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init];
         lineView.indicatorImageViewSize = CGSizeMake(13, 4);
-        lineView.verticalMargin = 5;
+        lineView.verticalMargin = 0;
         lineView.indicatorImageView.image = [UIImage imageNamed:@"home_segment_indicator"];
         _titleView.indicators = @[lineView];
 	}

xplan-ios/Main/Mine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.h

@@ -28,6 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
 ///家族信息
 @property (nonatomic,strong) ClanDetailInfoModel *clanDetailInfo;
 
+/// 获取头部高度
+- (CGFloat)getHeaderHeight:(UserInfoModel *)userInfo;
+
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Mine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m

@@ -168,7 +168,7 @@
 	[self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.left.right.mas_equalTo(self);
 		make.bottom.mas_equalTo(self);
-		make.height.mas_equalTo(185);
+		make.height.mas_equalTo(170);
 	}];
 
 	
@@ -180,7 +180,7 @@
 	}];
 	
 	[self.signBackView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.height.mas_equalTo(54);
+		make.height.mas_equalTo(self.signLabel.mas_height).offset(22);
 		make.left.mas_equalTo(15);
         make.right.mas_equalTo(-15);
 		make.top.mas_equalTo(self.tagStackView.mas_bottom).offset(10);
@@ -395,6 +395,12 @@
 }
 
 #pragma mark - Getters And Setters
+
+- (CGFloat)getHeaderHeight:(UserInfoModel *)userInfo {
+    CGSize size = [self.signLabel.text boundingRectWithSize:CGSizeMake(self.signLabel.bounds.size.width, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:self.signLabel.font} context:nil].size;
+    return 366+size.height;
+}
+
 - (void)setUserInfo:(UserInfoModel *)userInfo {
 	_userInfo = userInfo;
 	if (_userInfo) {
@@ -407,6 +413,11 @@
 		self.idLabel.text = [NSString stringWithFormat:@"ID：%ld", (long)_userInfo.erbanNo];
         self.copysIdImageView.hidden = NO;
 		self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : @"我是个默认签名";
+        CGSize size = [self.signLabel.text boundingRectWithSize:CGSizeMake(self.signLabel.bounds.size.width, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName:self.signLabel.font} context:nil].size;
+        [self.userInfoView mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_equalTo(153+size.height);
+        }];
+        
         NSString *fansNum = [NSString stringWithFormat:@"%ld",_userInfo.fansNum];
         NSString *fansStr = [NSString stringWithFormat:@"粉丝 %@", fansNum];
         NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:fansStr];
@@ -766,7 +777,7 @@
 		_signLabel = [[UILabel alloc] init];
 		_signLabel.font =  [UIFont systemFontOfSize:12];;
 		_signLabel.textColor = [ThemeColor secondTextColor];
-		_signLabel.numberOfLines = 2;
+		_signLabel.numberOfLines = 0;
 	}
 	return _signLabel;
 }

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

@@ -414,7 +414,7 @@
 	UIImage* image = imageView.image;
 	if (image) {
 		CGFloat scale = image.size.width / image.size.height;
-		imageView.bounds = CGRectMake(0, 0, 20 * scale, 20);
+		imageView.bounds = CGRectMake(0, 0, 17 * scale, 17);
 	} else {
 		dispatch_async(dispatch_get_global_queue(0, 0), ^{
 			NSURL *imgUrl = [NSURL URLWithString:imageUrl];
@@ -422,9 +422,9 @@
 			dispatch_async(dispatch_get_main_queue(), ^{
 				if (myImage) {
 					CGFloat scale = myImage.size.width / myImage.size.height;
-					imageView.bounds = CGRectMake(0, 0, 20 * scale, 20);
+					imageView.bounds = CGRectMake(0, 0, 17 * scale, 17);
 				} else {
-					imageView.bounds = CGRectMake(0, 0, 20, 20);
+					imageView.bounds = CGRectMake(0, 0, 17, 17);
 				}
 			});
 		});
@@ -469,15 +469,15 @@
 	UIImage* image = imageView.image;
 	if (image) {
 		CGFloat scale = image.size.width / image.size.height;
-		imageView.bounds = CGRectMake(0, 0, 20 * scale, 20);
+		imageView.bounds = CGRectMake(0, 0, 17 * scale, 17);
 	} else {
 		NSURL *imgUrl = [NSURL URLWithString:imageName];
 		UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
 		CGFloat scale = myImage.size.width / myImage.size.height;
 		if (scale == 0) {
-			imageView.bounds = CGRectMake(0, 0, 60, 20);
+			imageView.bounds = CGRectMake(0, 0, 51, 17);
 		}else {
-			imageView.bounds = CGRectMake(0, 0, 20* scale, 20);
+			imageView.bounds = CGRectMake(0, 0, 17* scale, 17);
 		}
 	}
 	imageView.contentMode = UIViewContentModeScaleAspectFit;

xplan-ios/Main/Mine/View/XPMineViewController.m

@@ -326,7 +326,7 @@
 		}
 		CGFloat itemHeight = 60;
 		CGFloat mineLineSpace = 10;
-		CGFloat cellTop = 50;
+		CGFloat cellTop = 60;
 		if (page == 2) {
 			cellTop = 60;
 		}