iOS Team / CNLiveBMineModule · Commits

Commit c192646b840237bd29dd0704feadad7253b865e7

Authored by iOS-Xiaowen
1 parent 3b009739

no message

Inline Side-by-side
Showing 1 changed file with 9 additions and 13 deletions
CNLiveBMineModule/Classes/View/CNLiveMineHeaderView.m
  View file @c192646
@@ -105,31 +105,27 @@ static const NSInteger margin = 20; @@ -105,31 +105,27 @@ static const NSInteger margin = 20;
105 [_header mas_remakeConstraints:^(MASConstraintMaker *make) { 105 [_header mas_remakeConstraints:^(MASConstraintMaker *make) {
106 make.left.equalTo(self.mas_left).with.offset(1.6*margin); 106 make.left.equalTo(self.mas_left).with.offset(1.6*margin);
107 make.top.equalTo(self.mas_top).with.offset(75); 107 make.top.equalTo(self.mas_top).with.offset(75);
108 - make.width.height.offset(60);  
109 - 108 + make.width.height.offset(66);
110 }]; 109 }];
111 110
112 [_certification mas_remakeConstraints:^(MASConstraintMaker *make) { 111 [_certification mas_remakeConstraints:^(MASConstraintMaker *make) {
113 - make.centerY.equalTo(self.header.mas_centerY); 112 + make.centerY.equalTo(self.header.mas_centerY).with.offset(8);
114 make.left.equalTo(self.header.mas_right).with.offset(margin/2.0); 113 make.left.equalTo(self.header.mas_right).with.offset(margin/2.0);
115 - make.height.offset(28);  
116 - 114 + make.height.offset(24);
117 }]; 115 }];
118 116
119 [_name mas_remakeConstraints:^(MASConstraintMaker *make) { 117 [_name mas_remakeConstraints:^(MASConstraintMaker *make) {
120 - make.bottom.equalTo(self.certification.mas_top); 118 + make.top.equalTo(self.header.mas_top);
121 make.left.equalTo(self.certification.mas_left); 119 make.left.equalTo(self.certification.mas_left);
122 make.right.mas_lessThanOrEqualTo(self.bgView.mas_right).with.offset(-margin); 120 make.right.mas_lessThanOrEqualTo(self.bgView.mas_right).with.offset(-margin);
123 - make.height.equalTo(self.certification.mas_height);  
124 - 121 + make.height.offset(24);
125 }]; 122 }];
126 123
127 [_address mas_remakeConstraints:^(MASConstraintMaker *make) { 124 [_address mas_remakeConstraints:^(MASConstraintMaker *make) {
128 make.top.equalTo(self.certification.mas_bottom); 125 make.top.equalTo(self.certification.mas_bottom);
129 make.left.equalTo(self.name.mas_left); 126 make.left.equalTo(self.name.mas_left);
130 make.right.equalTo(self.name.mas_right); 127 make.right.equalTo(self.name.mas_right);
131 - make.height.equalTo(self.name.mas_height);  
132 - 128 + make.height.offset(16);
133 }]; 129 }];
134 130
135 } 131 }
@@ -279,7 +275,7 @@ static const NSInteger margin = 20; @@ -279,7 +275,7 @@ static const NSInteger margin = 20;
279 _header = [[UIImageView alloc] init]; 275 _header = [[UIImageView alloc] init];
280 _header.userInteractionEnabled = YES; 276 _header.userInteractionEnabled = YES;
281 _header.layer.masksToBounds = YES; 277 _header.layer.masksToBounds = YES;
282 - _header.layer.cornerRadius = 28; 278 + _header.layer.cornerRadius = 33;
283 UIImage *xw_image = [self getImageWithImageName:@"CNLiveBMineModule.bundle/default_avatar_y" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineHeaderView class]]; 279 UIImage *xw_image = [self getImageWithImageName:@"CNLiveBMineModule.bundle/default_avatar_y" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineHeaderView class]];
284 [_header sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image]; 280 [_header sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
285 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(headerTapDidClicked:)]; 281 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(headerTapDidClicked:)];
@@ -294,7 +290,7 @@ static const NSInteger margin = 20; @@ -294,7 +290,7 @@ static const NSInteger margin = 20;
294 _name.userInteractionEnabled = YES; 290 _name.userInteractionEnabled = YES;
295 _name.numberOfLines = 1; 291 _name.numberOfLines = 1;
296 _name.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0]; 292 _name.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
297 - _name.font = [UIFont systemFontOfSize:16]; 293 + _name.font = [UIFont systemFontOfSize:18];
298 _name.text = CNUserShareModel.nickname; 294 _name.text = CNUserShareModel.nickname;
299 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(nameTapDidClicked:)]; 295 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(nameTapDidClicked:)];
300 [_name addGestureRecognizer:tap]; 296 [_name addGestureRecognizer:tap];
@@ -323,7 +319,7 @@ static const NSInteger margin = 20; @@ -323,7 +319,7 @@ static const NSInteger margin = 20;
323 _address.userInteractionEnabled = YES; 319 _address.userInteractionEnabled = YES;
324 _address.numberOfLines = 1; 320 _address.numberOfLines = 1;
325 _address.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0]; 321 _address.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
326 - _address.font = [UIFont systemFontOfSize:13]; 322 + _address.font = [UIFont systemFontOfSize:12];
327 _address.attributedText = [self createAttributedImageName:@"CNLiveBMineModule.bundle/mine_location" string:CNUserShareModel.location?CNUserShareModel.location:@"未知" fontSize:13.0 isFront:YES]; 323 _address.attributedText = [self createAttributedImageName:@"CNLiveBMineModule.bundle/mine_location" string:CNUserShareModel.location?CNUserShareModel.location:@"未知" fontSize:13.0 isFront:YES];
328 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(addressTapDidClicked:)]; 324 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(addressTapDidClicked:)];
329 [_address addGestureRecognizer:tap]; 325 [_address addGestureRecognizer:tap];