iOS Team / CNLiveBMineModule · Commits

Commit 012e72cf8371a204b949113e44e12b352b90dd4d

Authored by iOS-Xiaowen
1 parent 97ca22df

no message

Inline Side-by-side
Showing 2 changed files with 13 additions and 13 deletions
CNLiveBMineModule/Classes/Controller/CNLiveMineController.m
  View file @012e72c
... ... @@ -34,7 +34,7 @@
34 34 @end
35 35  
36 36 @implementation CNLiveMineController
37   -static const NSInteger kHEIGHT = 260;
  37 +static const NSInteger kHEIGHT = 253;
38 38 static const CGFloat timeValue = 1.5;
39 39  
40 40 #pragma mark - 加载数据
... ...
CNLiveBMineModule/Classes/View/CNLiveMineHeaderView.m
  View file @012e72c
... ... @@ -104,27 +104,27 @@ static const NSInteger margin = 20;
104 104 [_header mas_remakeConstraints:^(MASConstraintMaker *make) {
105 105 make.left.equalTo(self.mas_left).with.offset(1.6*margin);
106 106 make.top.equalTo(self.mas_top).with.offset(75);
107   - make.width.height.offset(66);
  107 + make.width.height.offset(60);
108 108 }];
109 109  
110 110 [_certification mas_remakeConstraints:^(MASConstraintMaker *make) {
111   - make.centerY.equalTo(self.header.mas_centerY).with.offset(8);
  111 + make.centerY.equalTo(self.header.mas_centerY).with.offset(5);
112 112 make.left.equalTo(self.header.mas_right).with.offset(margin/2.0);
113   - make.height.offset(24);
  113 + make.height.offset(20);
114 114 }];
115 115  
116 116 [_name mas_remakeConstraints:^(MASConstraintMaker *make) {
117 117 make.top.equalTo(self.header.mas_top);
118 118 make.left.equalTo(self.certification.mas_left);
119 119 make.right.mas_lessThanOrEqualTo(self.bgView.mas_right).with.offset(-margin);
120   - make.height.offset(24);
  120 +// make.height.offset(24);
121 121 }];
122 122  
123 123 [_address mas_remakeConstraints:^(MASConstraintMaker *make) {
124 124 make.top.equalTo(self.certification.mas_bottom);
125 125 make.left.equalTo(self.name.mas_left);
126 126 make.right.equalTo(self.name.mas_right);
127   - make.height.offset(16);
  127 + make.height.offset(15);
128 128 }];
129 129  
130 130 }
... ... @@ -173,7 +173,7 @@ static const NSInteger margin = 20;
173 173 CGFloat paddingTop = font.lineHeight - font.pointSize;
174 174 if(isFront){
175 175 // 设置图片大小
176   - attch.bounds = CGRectMake(0, -paddingTop, font.pointSize*5/6.0, font.pointSize);
  176 + attch.bounds = CGRectMake(0, -paddingTop+0.5, font.pointSize*5/6.0, font.pointSize);
177 177 // 创建带有图片的富文本
178 178 NSAttributedString *str = [NSAttributedString attributedStringWithAttachment:attch];
179 179 [attri insertAttributedString:str atIndex:0];// 插入某个位置
... ... @@ -199,11 +199,11 @@ static const NSInteger margin = 20;
199 199 UIImage *xw_image = [self getImageWithImageName:image bundleName:@"CNLiveBMineModule" targetClass:[self class]];
200 200 attch.image = xw_image;
201 201 // 创建带有图片的富文本
202   - CGFloat top = 4;
  202 + CGFloat top = 2;
203 203 if ([image isEqualToString:@"CNLiveBMineModule.bundle/mine_wjj_certification"]) {
204   - top = 2;
  204 + top = 4;
205 205 }
206   - attch.bounds = CGRectMake(0, top, xw_image.size.width, xw_image.size.height);
  206 + attch.bounds = CGRectMake(0, -top, xw_image.size.width, xw_image.size.height);
207 207 NSAttributedString *str = [NSAttributedString attributedStringWithAttachment:attch];
208 208 NSAttributedString *space = [[NSAttributedString alloc]initWithString:@" "];
209 209  
... ... @@ -274,7 +274,7 @@ static const NSInteger margin = 20;
274 274 _header = [[UIImageView alloc] init];
275 275 _header.userInteractionEnabled = YES;
276 276 _header.layer.masksToBounds = YES;
277   - _header.layer.cornerRadius = 33;
  277 + _header.layer.cornerRadius = 30;
278 278 UIImage *xw_image = [self getImageWithImageName:@"CNLiveBMineModule.bundle/default_avatar_y" bundleName:@"CNLiveBMineModule" targetClass:[CNLiveMineHeaderView class]];
279 279 [_header sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
280 280 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(headerTapDidClicked:)];
... ... @@ -318,8 +318,8 @@ static const NSInteger margin = 20;
318 318 _address.userInteractionEnabled = YES;
319 319 _address.numberOfLines = 1;
320 320 _address.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
321   - _address.font = [UIFont systemFontOfSize:12];
322   - _address.attributedText = [self createAttributedImageName:@"CNLiveBMineModule.bundle/mine_location" string:CNUserShareModel.location?CNUserShareModel.location:@"未知" fontSize:13.0 isFront:YES];
  321 + _address.font = [UIFont systemFontOfSize:11];
  322 + _address.attributedText = [self createAttributedImageName:@"CNLiveBMineModule.bundle/mine_location" string:CNUserShareModel.location?CNUserShareModel.location:@"未知" fontSize:11.0 isFront:YES];
323 323 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(addressTapDidClicked:)];
324 324 [_address addGestureRecognizer:tap];
325 325 }
... ...