iOS Team / CNLiveServiceCenterModule · Commits

Commit b9dc2083e0c8a137aeb13f777f712b337d2e1e34

Authored by 梁星国
1 parent f8dbec92

提交0.0.19

Inline Side-by-side
Showing 5 changed files with 28 additions and 16 deletions
CNLiveServiceCenterModule.podspec
  View file @b9dc208
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveServiceCenterModule'
11   - s.version = '0.0.18'
  11 + s.version = '0.0.19'
12 12 s.summary = '网家家企业端服务中心模块'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/Controller/CNLiveBServiceCenterController.m
  View file @b9dc208
... ... @@ -24,11 +24,13 @@
24 24 #import <CNLiveBServices/CNLiveBPersonAuthentProtocol.h>
25 25 #import <CNLiveBServices/CNLiveBMineServiceProtocol.h>
26 26 #import <CNLiveBServices/CNLiveLiveSetHomeProtocol.h>
  27 +#import <CNLiveBServices/CNLiveIDCardAuthenProtocol.h>
27 28 #import "CNLiveBCreatorViewController.h"
28 29 #import "CNLiveBServiceLiveSelectedView.h"
29 30 #import "NSString+Random.h"
30 31 #import <CNLiveBServices/CNLiveBStreamServiceProtocol.h>
31 32  
  33 +
32 34 /// 认证状态
33 35 #define CNLiveBGetServiceStatusUrl cn_API_OpenApi2(@"/user/readWJJBStatusById")
34 36 /// 机构认证
... ... @@ -178,7 +180,7 @@
178 180  
179 181 self.headerView.clickEnterViewBlock = ^(CNLiveBServiceCenterHeaderView * _Nonnull view, CNLiveBCenterAuthEnterView * _Nonnull enterView) {
180 182 NSLog(@"点击-用户认证进入");
181   - [weakSelf checkPersonCertification];
  183 + [weakSelf checkPersonCertificationWithTypeCount:1];
182 184 };
183 185  
184 186 ///天机获取参数
... ... @@ -299,10 +301,10 @@
299 301 {
300 302 return 124;
301 303 }else {
302   - return 85;
  304 + return 95;
303 305 }
304 306 }else{
305   - return 112;
  307 + return 122;
306 308 }
307 309  
308 310  
... ... @@ -326,7 +328,7 @@
326 328 if (indexPath.section == 0) {
327 329 if (indexPath.row == 0){
328 330  
329   - [self checkPersonCertification];
  331 + [self checkPersonCertificationWithTypeCount:2];
330 332  
331 333 }else if (indexPath.row == 1) {
332 334  
... ... @@ -583,7 +585,7 @@
583 585  
584 586  
585 587 /// 检查个人认证状态
586   -- (void)checkPersonCertification {
  588 +- (void)checkPersonCertificationWithTypeCount:(NSInteger)count {
587 589  
588 590 //URL: https://apiwjjtest.cnlive.com/Daren/buser/getBUserInfo.action?
589 591 NSString *strUrl = CNLiveBOrganizationPersonStatusUrl;
... ... @@ -619,11 +621,21 @@
619 621  
620 622 NSString *ischeckStatusStr = [NSString stringWithFormat:@"%@",[dicContent objectForKey:@"checkStatus"]];
621 623 if ([ischeckStatusStr isEqualToString:@"0"]) {//无认证
622   - /// 填表页
623   - id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
624   - UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
625   - vc.hidesBottomBarWhenPushed = YES;
626   - [self.navigationController pushViewController:vc animated:YES];
  624 +
  625 + if (count == 1) {
  626 + /// 填表页
  627 + id<CNLiveBPersonAuthentProtocol> personProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBPersonAuthentProtocol)];
  628 + UIViewController *vc = [personProtocol pushToPersonalCertificationStatusController:dicContent];
  629 + vc.hidesBottomBarWhenPushed = YES;
  630 + [self.navigationController pushViewController:vc animated:YES];
  631 +
  632 + }else {
  633 + id <CNLiveIDCardAuthenProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveIDCardAuthenProtocol)];
  634 + UIViewController *vc = [service pushToCNLiveIDCardAuthController];
  635 + [self.navigationController pushViewController:vc animated:YES];
  636 +
  637 + }
  638 +
627 639  
628 640 isEnter = YES;
629 641 }else if ([ischeckStatusStr isEqualToString:@"1"]) {//已认证
... ... @@ -931,7 +943,7 @@
931 943  
932 944 - (UIView *)headerView {
933 945 if (!_headerView) {
934   - _headerView = [[CNLiveBServiceCenterHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 135 * (KScreenHeight/667)+kStatusHeight -20)];
  946 + _headerView = [[CNLiveBServiceCenterHeaderView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 135+kStatusHeight -20)];
935 947  
936 948 }
937 949 return _headerView;;
... ...
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceCenterHeaderView.m
  View file @b9dc208
... ... @@ -106,7 +106,7 @@
106 106 fieldLayer.path = fieldPath.CGPath;
107 107 self.roundedView.layer.mask = fieldLayer;
108 108  
109   - self.enterView.frame = CGRectMake(self.frame.size.width - 101, 62.5, 101, 27);
  109 + self.enterView.frame = CGRectMake(self.frame.size.width - 101, 62.5 + kStatusHeight - 20, 101, 27);
110 110 UIBezierPath *enterFieldPath = [UIBezierPath bezierPathWithRoundedRect:self.enterView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerBottomLeft cornerRadii:CGSizeMake(13.5 , 13.5)];
111 111 CAShapeLayer *enterFieldLayer = [[CAShapeLayer alloc] init];
112 112 enterFieldLayer.frame = self.enterView.bounds;
... ...
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceHelpLearnCell.m
  View file @b9dc208
... ... @@ -58,9 +58,9 @@
58 58  
59 59 [self.cellContentImageV mas_makeConstraints:^(MASConstraintMaker *make) {
60 60 make.left.equalTo(weakSelf.mas_left).offset(12);
61   - make.top.equalTo(weakSelf.mas_top).offset(5);
  61 + make.top.equalTo(weakSelf.mas_top).offset(10);
62 62 make.right.equalTo(weakSelf.mas_right).offset(-12);
63   - make.bottom.equalTo(weakSelf.mas_bottom).offset(-5);
  63 + make.bottom.equalTo(weakSelf.mas_bottom).offset(-10);
64 64 }];
65 65  
66 66 }
... ...
CNLiveServiceCenterModule/Classes/CNLiveServiceCenterModule/View/CNLiveBServiceWorkCell.m
  View file @b9dc208
... ... @@ -50,7 +50,7 @@
50 50 self.selectionStyle = UITableViewCellSelectionStyleNone;
51 51 [self addSubview:self.workImageButton];
52 52  
53   - self.workImageButton.frame = CGRectMake(0, 0, 101.5, 116.5);
  53 + self.workImageButton.frame = CGRectMake(0, 5, 101.5, 116.5);
54 54  
55 55 //用户认证
56 56 UITapGestureRecognizer *itemBtnTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(itemBtnTap:)];
... ...