提交0.0.28_更改定位显示

梁星国
1 parent 657c67fc
Showing 2 changed files with 79 additions and 73 deletions
CNLiveServiceCenterModule.podspec
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
     s.name             = 'CNLiveServiceCenterModule'
-    s.version          = '0.0.27'
+    s.version          = '0.0.28'
     s.summary          = '网家家企业端服务中心模块'
     # This description is used to generate tags and improve search results.
@@ -126,13 +126,16 @@
     //用户认证
     UITapGestureRecognizer *enterViewTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(enterViewTap:)];
     [self.enterView addGestureRecognizer:enterViewTap];
-      
+    
     //用户信息
     NSString *userImagUrl = [NSString stringWithFormat:@"%@",CNUserShareModel.faceUrl];
     [self.userImageV sd_setImageWithURL:[NSURL URLWithString:userImagUrl] placeholderImage:[UIImage imageNamedFromService:@"service_person"]];
     NSString *userName = [NSString stringWithFormat:@"%@",CNUserShareModel.nickname ? CNUserShareModel.nickname : @""];
     self.userNameL.text = userName;
     NSString *userLoc = [NSString stringWithFormat:@"%@",CNUserShareModel.location ? CNUserShareModel.location : @"中国"];
+    if (userLoc.length == 0) {
+        userLoc = @"中国";
+    }
     self.locationL.text = userLoc;
 }
@@ -148,21 +151,21 @@
         make.width.mas_equalTo(60);
         make.height.mas_equalTo(60);
     }];
-
+    
     [self.userNameL mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(weakSelf.mas_top).offset(45 + kStatusHeight - 20);
         make.left.equalTo(weakSelf.userImageV.mas_right).offset(10);
         make.right.equalTo(weakSelf.mas_right).offset(-100);
         make.height.mas_equalTo(18);
     }];
-
+    
     [self.wjjCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(weakSelf.userImageV.mas_right).offset(9.5);
         make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(8);
         make.width.mas_equalTo(53);
         make.height.mas_equalTo(19);
     }];
-
+    
     [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
         make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
@@ -190,7 +193,7 @@
         make.right.equalTo(weakSelf.mas_right).offset(-20);
         make.height.mas_equalTo(12.5);
     }];
-       
+    
 }
@@ -200,23 +203,26 @@
 - (void)eidtHeaderView {
     //用户信息
-     NSString *userImagUrl = [NSString stringWithFormat:@"%@",CNUserShareModel.faceUrl];
-     [self.userImageV sd_setImageWithURL:[NSURL URLWithString:userImagUrl] placeholderImage:[UIImage imageNamedFromService:@"service_person"]];
-     NSString *userName = [NSString stringWithFormat:@"%@",CNUserShareModel.nickname ? CNUserShareModel.nickname : @""];
-     self.userNameL.text = userName;
-     NSString *userLoc = [NSString stringWithFormat:@"%@",CNUserShareModel.location ? CNUserShareModel.location : @"中国"];
-     self.locationL.text = userLoc;
+    NSString *userImagUrl = [NSString stringWithFormat:@"%@",CNUserShareModel.faceUrl];
+    [self.userImageV sd_setImageWithURL:[NSURL URLWithString:userImagUrl] placeholderImage:[UIImage imageNamedFromService:@"service_person"]];
+    NSString *userName = [NSString stringWithFormat:@"%@",CNUserShareModel.nickname ? CNUserShareModel.nickname : @""];
+    self.userNameL.text = userName;
+    NSString *userLoc = [NSString stringWithFormat:@"%@",CNUserShareModel.location ? CNUserShareModel.location : @"中国"];
+    if (userLoc.length == 0) {
+        userLoc = @"中国";
+    }
+    self.locationL.text = userLoc;
 }
 - (void)configUIWithIsPerson:(NSString *)isPerson isEnterprise:(NSString *)isEnterprise {
     if ([isPerson isEqualToString:@"1"]) {
-//        self.personCertificationImageV.hidden = NO;
+        //        self.personCertificationImageV.hidden = NO;
         [self.enterView configUI:YES];
     }else {
         [self.enterView configUI:NO];
-//        self.personCertificationImageV.hidden = YES;
+        //        self.personCertificationImageV.hidden = YES;
     }
     if ([isEnterprise isEqualToString:@"1"]) {
@@ -225,45 +231,45 @@
         self.enterpriseCertificationImageV.hidden = YES;
     }
-//    __weak typeof(self) weakSelf = self;
-    
-//    if (self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden) {
-//
-//    }else if (self.personCertificationImageV.hidden && !self.enterpriseCertificationImageV.hidden){
-//        [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
-//            make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
-//            make.width.mas_equalTo(14);
-//            make.height.mas_equalTo(15);
-//        }];
-//
-//    }else if (!self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden){
-//
-//        [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
-//            make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
-//            make.width.mas_equalTo(14);
-//            make.height.mas_equalTo(15);
-//        }];
-//
-//    }else {
-//
-//        [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
-//            make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
-//            make.width.mas_equalTo(14);
-//            make.height.mas_equalTo(15);
-//        }];
-//
-//        [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.left.equalTo(weakSelf.userImageV.mas_right).offset(84);
-//            make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
-//            make.width.mas_equalTo(14);
-//            make.height.mas_equalTo(15);
-//        }];
-//
-//
-//    }
+    //    __weak typeof(self) weakSelf = self;
+    
+    //    if (self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden) {
+    //
+    //    }else if (self.personCertificationImageV.hidden && !self.enterpriseCertificationImageV.hidden){
+    //        [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+    //            make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
+    //            make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
+    //            make.width.mas_equalTo(14);
+    //            make.height.mas_equalTo(15);
+    //        }];
+    //
+    //    }else if (!self.personCertificationImageV.hidden && self.enterpriseCertificationImageV.hidden){
+    //
+    //        [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+    //            make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
+    //            make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
+    //            make.width.mas_equalTo(14);
+    //            make.height.mas_equalTo(15);
+    //        }];
+    //
+    //    }else {
+    //
+    //        [self.personCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+    //            make.left.equalTo(weakSelf.userImageV.mas_right).offset(66);
+    //            make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
+    //            make.width.mas_equalTo(14);
+    //            make.height.mas_equalTo(15);
+    //        }];
+    //
+    //        [self.enterpriseCertificationImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+    //            make.left.equalTo(weakSelf.userImageV.mas_right).offset(84);
+    //            make.top.equalTo(weakSelf.userNameL.mas_bottom).offset(10);
+    //            make.width.mas_equalTo(14);
+    //            make.height.mas_equalTo(15);
+    //        }];
+    //
+    //
+    //    }
 }
@@ -299,10 +305,10 @@
 - (void)attentionBtnAction:(UIButton *)sender {
-//    if (self.clickAttentionBtnBlock) {
-//        self.clickAttentionBtnBlock(self, sender);
-//    }
-//
+    //    if (self.clickAttentionBtnBlock) {
+    //        self.clickAttentionBtnBlock(self, sender);
+    //    }
+    //
 }
@@ -315,11 +321,11 @@
     if (!_bgHeaderImageV) {
         _bgHeaderImageV = [[UIImageView alloc]init];
         _bgHeaderImageV.image = [UIImage imageNamedFromService:@"service_headerBg"];
-//        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(platformImageViewAction:)];
-//        [_bgHeaderImageV addGestureRecognizer:tap];
+        //        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(platformImageViewAction:)];
+        //        [_bgHeaderImageV addGestureRecognizer:tap];
         _bgHeaderImageV.userInteractionEnabled = YES;
-
-       
+        
+        
     }
     return _bgHeaderImageV;
 }
@@ -346,7 +352,7 @@
         _userNameL.font = [UIFont systemFontOfSize:18];
         _userNameL.numberOfLines = 1;
         _userNameL.userInteractionEnabled = YES;
-
+        
     }
     return _userNameL;
@@ -500,21 +506,21 @@
         make.width.mas_equalTo(12);
         make.height.mas_equalTo(14);
     }];
-
+    
     [self.authTipImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(weakSelf.mas_right).offset(-4.5);
         make.centerY.equalTo(weakSelf.mas_centerY);
         make.width.mas_equalTo(5);
         make.height.mas_equalTo(10);
     }];
-
+    
     [self.authL mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(weakSelf.mas_centerY);
         make.left.equalTo(weakSelf.authImageV.mas_right).offset(4);
         make.right.equalTo(weakSelf.authTipImageV.mas_left).offset(-4);
         make.height.mas_equalTo(12);
     }];
-
+    
 }
@@ -522,9 +528,9 @@
 - (void)configUI:(Boolean)isAuth {
     if (isAuth) {
-         self.authL.text = @"用户已认证";
+        self.authL.text = @"用户已认证";
     }else {
-         self.authL.text = @"用户未认证";
+        self.authL.text = @"用户未认证";
     }
 }
@@ -532,10 +538,10 @@
 #pragma mark - ***事件实现***
 - (void)attentionBtnAction:(UIButton *)sender {
-//    if (self.clickAttentionBtnBlock) {
-//        self.clickAttentionBtnBlock(self, sender);
-//    }
-//
+    //    if (self.clickAttentionBtnBlock) {
+    //        self.clickAttentionBtnBlock(self, sender);
+    //    }
+    //
 }
@@ -618,7 +624,7 @@
     [self setBackgroundColor:[UIColor yellowColor]];
     [self.contentView addSubview:self.titleL];
     self.titleL.frame = CGRectMake(15, 4, KScreenWidth - 30, 15);
-
+    
 #pragma mark - TODO:测试添加后期要删掉
     ///测试添加
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapAction:)];
@@ -628,7 +634,7 @@
 #pragma mark - ***layoutUI***
 - (void)layoutUI {
-   
+    
 }
 #pragma mark - editUI