个人资料页UI修改

xplan-ios/Main/Home/View/XPPartyHeaderView.m

@@ -35,7 +35,7 @@
 
 + (CGFloat)getPartyHeaderViewHeight {
     CGFloat width = KScreenWidth-15*2;
-    CGFloat height = 74.0/345.0*width;
+    CGFloat height = 80.0/345.0*width;
     return height+20;
 }
 
@@ -59,7 +59,7 @@
 
 + (CGFloat)getTopicHeaderViewHeight {
     CGFloat width = KScreenWidth-15*2;
-    CGFloat height = 74.0/345.0*width;
+    CGFloat height = 80.0/345.0*width;
     return height+20;
 }
 

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

@@ -22,6 +22,7 @@
 #import "XPSkillCardPlayerManager.h"
 #import "UIImage+Utils.h"
 #import "XPConstant.h"
+#import "XPButton.h"
 ///Model
 #import "MineSkillCardListInfoModel.h"
 #import "UserInfoModel.h"
@@ -58,9 +59,9 @@
 ///底部的容器
 @property (nonatomic,strong) UIStackView *bottomStackView;
 ///私聊
-@property (nonatomic,strong) UIButton *chatButton;
+@property (nonatomic,strong) XPButton *chatButton;
 ///关注
-@property (nonatomic,strong) UIButton *attentionButton;
+@property (nonatomic,strong) XPButton *attentionButton;
 ///资料
 @property (nonatomic,strong) XPMineUserDataViewController *userDataVC;
 ///动态
@@ -115,9 +116,9 @@
 		[self.bottomStackView addArrangedSubview:self.attentionButton];
 		
 		[self.bottomStackView mas_makeConstraints:^(MASConstraintMaker *make) {
-			make.left.right.mas_equalTo(self.view).inset(25);
+			make.left.right.mas_equalTo(self.view).inset(15);
-			make.height.mas_equalTo(36);
+			make.height.mas_equalTo(45);
-			make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 15);
+			make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 8);
 		}];
 	}
 }
@@ -326,10 +327,24 @@
 
 - (void)getAttentionStateSuccess:(BOOL)status {
 	self.attentionButton.selected = status;
+    if (self.attentionButton.selected) {
+        self.attentionButton.backgroundColor = [ThemeColor colorWithHexString:@"#FFFACF"];
+        self.attentionButton.layer.borderColor = [ThemeColor appMainColor].CGColor;
+    }else{
+        self.attentionButton.backgroundColor = [ThemeColor appMainColor];
+        self.attentionButton.layer.borderColor = UIColor.clearColor.CGColor;
+    }
 }
 
 - (void)attentionUserSuccess:(BOOL)status {
 	self.attentionButton.selected = status;
+    if (self.attentionButton.selected) {
+        self.attentionButton.backgroundColor = [ThemeColor colorWithHexString:@"#FFFACF"];
+        self.attentionButton.layer.borderColor = [ThemeColor appMainColor].CGColor;
+    }else{
+        self.attentionButton.backgroundColor = [ThemeColor appMainColor];
+        self.attentionButton.layer.borderColor = UIColor.clearColor.CGColor;
+    }
 }
 
 - (void)getClanDetailInfoSuccess:(ClanDetailInfoModel *)clanDetailInfo {
@@ -388,41 +403,44 @@
 		_bottomStackView.axis = UILayoutConstraintAxisHorizontal;
 		_bottomStackView.distribution = UIStackViewDistributionFillEqually;
 		_bottomStackView.alignment = UIStackViewAlignmentFill;
-		_bottomStackView.spacing = 25;
+		_bottomStackView.spacing = 18;
 	}
 	return _bottomStackView;
 }
 
-- (UIButton *)chatButton {
+- (XPButton *)chatButton {
 	if (!_chatButton) {
-		_chatButton = [UIButton buttonWithType:UIButtonTypeCustom];
+		_chatButton = [XPButton buttonWithType:UIButtonTypeCustom];
 		[_chatButton setTitle:@"私信" forState:UIControlStateNormal];
 		[_chatButton setTitleColor:[ThemeColor confirmButtonTextColor] forState:UIControlStateNormal];
 		[_chatButton setImage:[UIImage imageNamed:@"mine_user_info_bottom_chat"] forState:UIControlStateNormal];
-		_chatButton.titleLabel.font = [UIFont systemFontOfSize:15];
+        _chatButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
-		[_chatButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[ThemeColor confirmButtonGradientStartColor], [ThemeColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal];
+        _chatButton.backgroundColor = [ThemeColor appMainColor];
 		_chatButton.layer.masksToBounds = YES;
-		_chatButton.layer.cornerRadius =  36/2;
+		_chatButton.layer.cornerRadius =  45.0/2;
 		[_chatButton addTarget:self action:@selector(chatButtonAction:) forControlEvents:UIControlEventTouchUpInside];
+        _chatButton.imageTitleSpace = 4;
 	}
 	return _chatButton;
 }
 
-- (UIButton *)attentionButton {
+- (XPButton *)attentionButton {
 	if (!_attentionButton) {
-		_attentionButton = [UIButton buttonWithType:UIButtonTypeCustom];
+		_attentionButton = [XPButton buttonWithType:UIButtonTypeCustom];
 		[_attentionButton setTitle:@"关注" forState:UIControlStateNormal];
 		[_attentionButton setTitle:@"已关注" forState:UIControlStateSelected];
 		[_attentionButton setTitleColor:[ThemeColor confirmButtonTextColor] forState:UIControlStateNormal];
 		[_attentionButton setTitleColor:[ThemeColor cancelButtonTextColor] forState:UIControlStateSelected];
 		[_attentionButton setImage:[UIImage imageNamed:@"mine_user_info_bottom_attention_normal"] forState:UIControlStateNormal];
 		[_attentionButton setImage:[UIImage imageNamed:@"mine_user_info_bottom_attention_select"] forState:UIControlStateSelected];
-		_attentionButton.titleLabel.font = [UIFont systemFontOfSize:15];
+		_attentionButton.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
-		[_attentionButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[ThemeColor confirmButtonGradientStartColor], [ThemeColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal];
+        _attentionButton.backgroundColor = [ThemeColor appMainColor];
-		[_attentionButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[ThemeColor cancelButtonGradientStartColor], [ThemeColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateSelected];
 		_attentionButton.layer.masksToBounds = YES;
-		_attentionButton.layer.cornerRadius =  36/2;
+		_attentionButton.layer.cornerRadius = 45.0/2;
 		[_attentionButton addTarget:self action:@selector(attentionButtonAction:) forControlEvents:UIControlEventTouchUpInside];
+        _attentionButton.imageTitleSpace = 4;
+        _attentionButton.layer.borderWidth = 1;
+        _attentionButton.layer.borderColor = UIColor.clearColor.CGColor;
 	}
 	return _attentionButton;
 }

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

@@ -334,7 +334,9 @@
     } else if (indexPath.section == 1) {
         return 48*self.moreItemArray.count+40;
     } else {
-        return 80;
+        CGFloat width = KScreenWidth-15*2;
+        CGFloat height = 80.0/345.0*width;
+        return height+10;
     }
 	return 53;
 }