提交0.0.19

梁星国
1 parent f8dbec92
Showing 5 changed files with 28 additions and 16 deletions
CNLiveServiceCenterModule.podspec
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceHelpLearnCell.m
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceWorkCell.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
     s.name             = 'CNLiveServiceCenterModule'
-    s.version          = '0.0.18'
+    s.version          = '0.0.19'
     s.summary          = '网家家企业端服务中心模块'
     # This description is used to generate tags and improve search results.
@@ -24,11 +24,13 @@
 #import <CNLiveBServices/CNLiveBPersonAuthentProtocol.h>
 #import <CNLiveBServices/CNLiveBMineServiceProtocol.h>
 #import <CNLiveBServices/CNLiveLiveSetHomeProtocol.h>
+#import <CNLiveBServices/CNLiveIDCardAuthenProtocol.h>
 #import "CNLiveBCreatorViewController.h"
 #import "CNLiveBServiceLiveSelectedView.h"
 #import "NSString+Random.h"
 #import <CNLiveBServices/CNLiveBStreamServiceProtocol.h>
+
 /// 认证状态
 #define CNLiveBGetServiceStatusUrl          cn_API_OpenApi2(@"/user/readWJJBStatusById")
 /// 机构认证
@@ -178,7 +180,7 @@
     self.headerView.clickEnterViewBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, CNLiveBCenterAuthEnterView * _Nonnull enterView) {
         NSLog(@"点击-用户认证进入");
-        [weakSelf  checkPersonCertification];
+        [weakSelf  checkPersonCertificationWithTypeCount:1];
     };
     ///天机获取参数
@@ -299,10 +301,10 @@
         {
             return 124;
         }else {
-            return 85;
+            return 95;
         }
     }else{
-        return 112;
+        return 122;
     }
@@ -326,7 +328,7 @@
     if (indexPath.section == 0) {
         if (indexPath.row == 0){
-            [self checkPersonCertification];
+            [self checkPersonCertificationWithTypeCount:2];
         }else if (indexPath.row == 1) {
@@ -583,7 +585,7 @@
 /// 检查个人认证状态
-- (void)checkPersonCertification {
+- (void)checkPersonCertificationWithTypeCount:(NSInteger)count {
     //URL: https://apiwjjtest.cnlive.com/Daren/buser/getBUserInfo.action?
     NSString *strUrl = CNLiveBOrganizationPersonStatusUrl;
@@ -619,11 +621,21 @@
                     NSString *ischeckStatusStr = [NSString stringWithFormat:@"%@",[dicContent objectForKey:@"checkStatus"]];
                     if ([ischeckStatusStr isEqualToString:@"0"]) {//无认证
-                        ///  填表页
-                        id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
-                        UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
-                        vc.hidesBottomBarWhenPushed = YES;
-                        [self.navigationController pushViewController:vc animated:YES];
+                        
+                        if (count == 1) {
+                            ///  填表页
+                            id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
+                            UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
+                            vc.hidesBottomBarWhenPushed = YES;
+                            [self.navigationController pushViewController:vc animated:YES];
+                            
+                        }else {
+                            id <CNLiveIDCardAuthenProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveIDCardAuthenProtocol)];
+                            UIViewController *vc = [service pushToCNLiveIDCardAuthController];
+                            [self.navigationController pushViewController:vc animated:YES];
+                            
+                        }
+
                         isEnter = YES;
                     }else if ([ischeckStatusStr isEqualToString:@"1"]) {//已认证
@@ -931,7 +943,7 @@
 - (UIView *)headerView {
     if (!_headerView) {
-        _headerView = [[CNLiveBServiceCenterHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 135 * (KScreenHeight/667)+kStatusHeight -20)];
+        _headerView = [[CNLiveBServiceCenterHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 135+kStatusHeight -20)];
     }
     return _headerView;;
@@ -106,7 +106,7 @@
     fieldLayer.path = fieldPath.CGPath;
     self.roundedView.layer.mask = fieldLayer;
-    self.enterView.frame = CGRectMake(self.frame.size.width - 101, 62.5, 101, 27);
+    self.enterView.frame = CGRectMake(self.frame.size.width - 101, 62.5 + kStatusHeight - 20, 101, 27);
     UIBezierPath *enterFieldPath = [UIBezierPath bezierPathWithRoundedRect:self.enterView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerBottomLeft cornerRadii:CGSizeMake(13.5 , 13.5)];
     CAShapeLayer *enterFieldLayer = [[CAShapeLayer alloc] init];
     enterFieldLayer.frame = self.enterView.bounds;
@@ -58,9 +58,9 @@
     [self.cellContentImageV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(weakSelf.mas_left).offset(12);
-        make.top.equalTo(weakSelf.mas_top).offset(5);
+        make.top.equalTo(weakSelf.mas_top).offset(10);
         make.right.equalTo(weakSelf.mas_right).offset(-12);
-        make.bottom.equalTo(weakSelf.mas_bottom).offset(-5);
+        make.bottom.equalTo(weakSelf.mas_bottom).offset(-10);
     }];
 }
@@ -50,7 +50,7 @@
     self.selectionStyle = UITableViewCellSelectionStyleNone;
     [self addSubview:self.workImageButton];
-    self.workImageButton.frame = CGRectMake(0, 0, 101.5, 116.5);
+    self.workImageButton.frame = CGRectMake(0, 5, 101.5, 116.5);
     //用户认证
     UITapGestureRecognizer *itemBtnTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(itemBtnTap:)];