iOS Team / CNLiveServiceCenterModule · Commits

Commit 7b914a82e1892ae8aa5987f3593d99f4f30b7e10

Authored by 梁星国
1 parent 657c67fc

提交0.0.28_更改定位显示

Inline Side-by-side
Showing 2 changed files with 79 additions and 73 deletions
CNLiveServiceCenterModule.podspec
  View file @7b914a8
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveServiceCenterModule'
11   - s.version = '0.0.27'
  11 + s.version = '0.0.28'
12 12 s.summary = '网家家企业端服务中心模块'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
  View file @7b914a8
... ... @@ -126,13 +126,16 @@
126 126 //用户认证
127 127 UITapGestureRecognizer *enterViewTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(enterViewTap:)];
128 128 [self.enterView addGestureRecognizer:enterViewTap];
129   -
  129 +
130 130 //用户信息
131 131 NSString *userImagUrl = [NSString stringWithFormat:@"%@",CNUserShareModel.faceUrl];
132 132 [self.userImageV sd_setImageWithURL:[NSURL URLWithString:userImagUrl] placeholderImage:[UIImage imageNamedFromService:@"service_person"]];
133 133 NSString *userName = [NSString stringWithFormat:@"%@",CNUserShareModel.nickname ? CNUserShareModel.nickname : @""];
134 134 self.userNameL.text = userName;
135 135 NSString *userLoc = [NSString stringWithFormat:@"%@",CNUserShareModel.location ? CNUserShareModel.location : @"中国"];
  136 + if (userLoc.length == 0) {
  137 + userLoc = @"中国";
  138 + }
136 139 self.locationL.text = userLoc;
137 140  
138 141 }
... ... @@ -148,21 +151,21 @@
148 151 make.width.mas_equalTo(60);
149 152 make.height.mas_equalTo(60);
150 153 }];
151   -
  154 +
152 155 [self.userNameL mas_makeConstraints:^(MASConstraintMaker *make) {
153 156 make.top.equalTo(weakSelf.mas_top).offset(45 + kStatusHeight - 20);
154 157 make.left.equalTo(weakSelf.userImageV.mas_right).offset(10);
155 158 make.right.equalTo(weakSelf.mas_right).offset(-100);
156 159 make.height.mas_equalTo(18);
157 160 }];
158   -
  161 +
159 162 [self.wjjCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
160 163 make.left.equalTo(weakSelf.userImageV.mas_right).offset(9.5);
161 164 make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(8);
162 165 make.width.mas_equalTo(53);
163 166 make.height.mas_equalTo(19);
164 167 }];
165   -
  168 +
166 169 [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
167 170 make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
168 171 make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
... ... @@ -190,7 +193,7 @@
190 193 make.right.equalTo(weakSelf.mas_right).offset(-20);
191 194 make.height.mas_equalTo(12.5);
192 195 }];
193   -
  196 +
194 197  
195 198  
196 199 }
... ... @@ -200,23 +203,26 @@
200 203 - (void)eidtHeaderView {
201 204  
202 205 //用户信息
203   - NSString *userImagUrl = [NSString stringWithFormat:@"%@",CNUserShareModel.faceUrl];
204   - [self.userImageV sd_setImageWithURL:[NSURL URLWithString:userImagUrl] placeholderImage:[UIImage imageNamedFromService:@"service_person"]];
205   - NSString *userName = [NSString stringWithFormat:@"%@",CNUserShareModel.nickname ? CNUserShareModel.nickname : @""];
206   - self.userNameL.text = userName;
207   - NSString *userLoc = [NSString stringWithFormat:@"%@",CNUserShareModel.location ? CNUserShareModel.location : @"中国"];
208   - self.locationL.text = userLoc;
  206 + NSString *userImagUrl = [NSString stringWithFormat:@"%@",CNUserShareModel.faceUrl];
  207 + [self.userImageV sd_setImageWithURL:[NSURL URLWithString:userImagUrl] placeholderImage:[UIImage imageNamedFromService:@"service_person"]];
  208 + NSString *userName = [NSString stringWithFormat:@"%@",CNUserShareModel.nickname ? CNUserShareModel.nickname : @""];
  209 + self.userNameL.text = userName;
  210 + NSString *userLoc = [NSString stringWithFormat:@"%@",CNUserShareModel.location ? CNUserShareModel.location : @"中国"];
  211 + if (userLoc.length == 0) {
  212 + userLoc = @"中国";
  213 + }
  214 + self.locationL.text = userLoc;
209 215  
210 216 }
211 217  
212 218 - (void)configUIWithIsPerson:(NSString *)isPerson isEnterprise:(NSString *)isEnterprise {
213 219  
214 220 if ([isPerson isEqualToString:@"1"]) {
215   -// self.personCertificationImageV.hidden = NO;
  221 + // self.personCertificationImageV.hidden = NO;
216 222 [self.enterView configUI:YES];
217 223 }else {
218 224 [self.enterView configUI:NO];
219   -// self.personCertificationImageV.hidden = YES;
  225 + // self.personCertificationImageV.hidden = YES;
220 226 }
221 227  
222 228 if ([isEnterprise isEqualToString:@"1"]) {
... ... @@ -225,45 +231,45 @@
225 231 self.enterpriseCertificationImageV.hidden = YES;
226 232 }
227 233  
228   -// __weak typeof(self) weakSelf = self;
229   -
230   -// if (self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden) {
231   -//
232   -// }else if (self.personCertificationImageV.hidden && !self.enterpriseCertificationImageV.hidden){
233   -// [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
234   -// make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
235   -// make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
236   -// make.width.mas_equalTo(14);
237   -// make.height.mas_equalTo(15);
238   -// }];
239   -//
240   -// }else if (!self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden){
241   -//
242   -// [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
243   -// make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
244   -// make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
245   -// make.width.mas_equalTo(14);
246   -// make.height.mas_equalTo(15);
247   -// }];
248   -//
249   -// }else {
250   -//
251   -// [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
252   -// make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
253   -// make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
254   -// make.width.mas_equalTo(14);
255   -// make.height.mas_equalTo(15);
256   -// }];
257   -//
258   -// [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
259   -// make.left.equalTo(weakSelf.userImageV.mas_right).offset(84);
260   -// make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
261   -// make.width.mas_equalTo(14);
262   -// make.height.mas_equalTo(15);
263   -// }];
264   -//
265   -//
266   -// }
  234 + // __weak typeof(self) weakSelf = self;
  235 +
  236 + // if (self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden) {
  237 + //
  238 + // }else if (self.personCertificationImageV.hidden && !self.enterpriseCertificationImageV.hidden){
  239 + // [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
  240 + // make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
  241 + // make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
  242 + // make.width.mas_equalTo(14);
  243 + // make.height.mas_equalTo(15);
  244 + // }];
  245 + //
  246 + // }else if (!self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden){
  247 + //
  248 + // [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
  249 + // make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
  250 + // make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
  251 + // make.width.mas_equalTo(14);
  252 + // make.height.mas_equalTo(15);
  253 + // }];
  254 + //
  255 + // }else {
  256 + //
  257 + // [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
  258 + // make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
  259 + // make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
  260 + // make.width.mas_equalTo(14);
  261 + // make.height.mas_equalTo(15);
  262 + // }];
  263 + //
  264 + // [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
  265 + // make.left.equalTo(weakSelf.userImageV.mas_right).offset(84);
  266 + // make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
  267 + // make.width.mas_equalTo(14);
  268 + // make.height.mas_equalTo(15);
  269 + // }];
  270 + //
  271 + //
  272 + // }
267 273  
268 274 }
269 275  
... ... @@ -299,10 +305,10 @@
299 305  
300 306 - (void)attentionBtnAction:(UIButton *)sender {
301 307  
302   -// if (self.clickAttentionBtnBlock) {
303   -// self.clickAttentionBtnBlock(self, sender);
304   -// }
305   -//
  308 + // if (self.clickAttentionBtnBlock) {
  309 + // self.clickAttentionBtnBlock(self, sender);
  310 + // }
  311 + //
306 312 }
307 313  
308 314  
... ... @@ -315,11 +321,11 @@
315 321 if (!_bgHeaderImageV) {
316 322 _bgHeaderImageV = [[UIImageView alloc]init];
317 323 _bgHeaderImageV.image = [UIImage imageNamedFromService:@"service_headerBg"];
318   -// UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(platformImageViewAction:)];
319   -// [_bgHeaderImageV addGestureRecognizer:tap];
  324 + // UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(platformImageViewAction:)];
  325 + // [_bgHeaderImageV addGestureRecognizer:tap];
320 326 _bgHeaderImageV.userInteractionEnabled = YES;
321   -
322   -
  327 +
  328 +
323 329 }
324 330 return _bgHeaderImageV;
325 331 }
... ... @@ -346,7 +352,7 @@
346 352 _userNameL.font = [UIFont systemFontOfSize:18];
347 353 _userNameL.numberOfLines = 1;
348 354 _userNameL.userInteractionEnabled = YES;
349   -
  355 +
350 356 }
351 357 return _userNameL;
352 358  
... ... @@ -500,21 +506,21 @@
500 506 make.width.mas_equalTo(12);
501 507 make.height.mas_equalTo(14);
502 508 }];
503   -
  509 +
504 510 [self.authTipImageV mas_makeConstraints:^(MASConstraintMaker *make) {
505 511 make.right.equalTo(weakSelf.mas_right).offset(-4.5);
506 512 make.centerY.equalTo(weakSelf.mas_centerY);
507 513 make.width.mas_equalTo(5);
508 514 make.height.mas_equalTo(10);
509 515 }];
510   -
  516 +
511 517 [self.authL mas_makeConstraints:^(MASConstraintMaker *make) {
512 518 make.centerY.equalTo(weakSelf.mas_centerY);
513 519 make.left.equalTo(weakSelf.authImageV.mas_right).offset(4);
514 520 make.right.equalTo(weakSelf.authTipImageV.mas_left).offset(-4);
515 521 make.height.mas_equalTo(12);
516 522 }];
517   -
  523 +
518 524  
519 525 }
520 526  
... ... @@ -522,9 +528,9 @@
522 528 - (void)configUI:(Boolean)isAuth {
523 529  
524 530 if (isAuth) {
525   - self.authL.text = @"用户已认证";
  531 + self.authL.text = @"用户已认证";
526 532 }else {
527   - self.authL.text = @"用户未认证";
  533 + self.authL.text = @"用户未认证";
528 534 }
529 535  
530 536 }
... ... @@ -532,10 +538,10 @@
532 538 #pragma mark - ***事件实现***
533 539 - (void)attentionBtnAction:(UIButton *)sender {
534 540  
535   -// if (self.clickAttentionBtnBlock) {
536   -// self.clickAttentionBtnBlock(self, sender);
537   -// }
538   -//
  541 + // if (self.clickAttentionBtnBlock) {
  542 + // self.clickAttentionBtnBlock(self, sender);
  543 + // }
  544 + //
539 545 }
540 546  
541 547  
... ... @@ -618,7 +624,7 @@
618 624 [self setBackgroundColor:[UIColor yellowColor]];
619 625 [self.contentView addSubview:self.titleL];
620 626 self.titleL.frame = CGRectMake(15, 4, KScreenWidth - 30, 15);
621   -
  627 +
622 628 #pragma mark - TODO:测试添加后期要删掉
623 629 ///测试添加
624 630 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapAction:)];
... ... @@ -628,7 +634,7 @@
628 634  
629 635 #pragma mark - ***layoutUI***
630 636 - (void)layoutUI {
631   -
  637 +
632 638 }
633 639  
634 640 #pragma mark - editUI
... ...