iOS Team / CNLiveBPersonalVerificationModule · Commits

Commit 79f2ee21e997f8737f952aff290583c8fa00475f

Authored by 王军波
2 parents 9b0a214d c7aa883e

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveBPersonalVerificationModule

Inline Side-by-side
Showing 5 changed files with 31 additions and 13 deletions
CNLiveBPersonalVerificationModule.podspec
  View file @79f2ee2
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveBPersonalVerificationModule'
11   - s.version = '0.0.5'
  11 + s.version = '0.0.6'
12 12 s.summary = 'B端个人资料认证开发'
13 13  
14 14  
... ... @@ -64,7 +64,7 @@ s.subspec 'CNBInstitutionInfo' do |institution|
64 64 institution.dependency 'CNLiveRequestBastKit'
65 65 # #环境库
66 66 institution.dependency 'CNLiveEnvironment'
67   - institution.dependency 'CNLiveBusinessBaseModule'
  67 + institution.dependency 'CNLiveBusinessBaseModule'
68 68 # #协议库
69 69 institution.dependency 'CNLiveBeeHive'
70 70 institution.dependency 'CNLiveBServices'
... ... @@ -75,7 +75,6 @@ s.subspec 'CNBInstitutionInfo' do |institution|
75 75 end
76 76  
77 77 s.subspec 'CNBPersonCardInfo' do |card|
78   -# card.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/**'
79 78 card.subspec 'Model' do |model|
80 79 model.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Model/*.{h,m}'
81 80 end
... ... @@ -93,7 +92,7 @@ s.subspec 'CNBPersonCardInfo' do |card|
93 92 card.subspec 'Services' do |service|
94 93 service.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Services/*.{h,m}'
95 94 service.dependency 'CNLiveBPersonalVerificationModule/CNBPersonCardInfo/Controller'
96   -
  95 +
97 96 end
98 97 # card.ios.vendored_frameworks = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework'
99 98 card.resource_bundles = {
... ... @@ -115,9 +114,9 @@ s.subspec 'CNBPersonCardInfo' do |card|
115 114 ##相册
116 115 card.dependency 'CNLiveImagePickerController'
117 116 # #网络请求
118   - card.dependency 'CNLiveRequestBastKit'
119   - card.dependency 'CNLiveEnvironment'
120   - card.dependency 'CNLiveBusinessTools'
  117 + card.dependency 'CNLiveRequestBastKit'
  118 + card.dependency 'CNLiveEnvironment'
  119 + card.dependency 'CNLiveBusinessTools'
121 120 card.dependency 'CNLiveBeeHive'
122 121 card.dependency 'CNLiveBServices'
123 122 end
... ...
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPerCertificationController.m
  View file @79f2ee2
... ... @@ -10,6 +10,8 @@
10 10 #import <Masonry/Masonry.h>
11 11 #import "CNLiveBaseKit.h"
12 12 #import "UIColor+CNLiveExtension.h"
  13 +#import "CNLiveIDCardAuthenProtocol.h"
  14 +#import <CNLiveBeeHive/CNLiveBeeHive.h>
13 15 @interface CNBPerCertificationController ()
14 16 @property (nonatomic, copy) NSString *type;
15 17 @property (nonatomic, strong) UIImageView *showImageV;
... ... @@ -76,7 +78,16 @@
76 78 }
77 79 #pragma mark - Action
78 80 - (void)sureBtnAction {
79   - [self.navigationController popToRootViewControllerAnimated:YES];
  81 + if ([self.type isEqualToString:@"2"] ) { //未通过
  82 + [self.navigationController popToRootViewControllerAnimated:YES];
  83 + }else {
  84 +// ApplyForShootController *vc = [[ApplyForShootController alloc]init];
  85 +// [self.navigationController pushViewController:vc animated:YES];
  86 + id <CNLiveIDCardAuthenProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveIDCardAuthenProtocol)];
  87 + UIViewController *vc = [service pushToCNLiveIDCardAuthController];
  88 + [self.navigationController pushViewController:vc animated:YES];
  89 + }
  90 +
80 91 }
81 92 #pragma mark - lazy
82 93 - (UIImageView *)showImageV {
... ...
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Services/CNBPersonAuthenticationServices.m
  View file @79f2ee2
... ... @@ -10,6 +10,7 @@
10 10 #import "CNLiveBPersonAuthentProtocol.h"
11 11 #import "CNBPerAuthSuccessController.h"
12 12 #import "CNBPerCertificationController.h"
  13 +#import "CNBPersonalVerificationController.h"
13 14 @interface CNBPersonAuthenticationServices ()<CNLiveBPersonAuthentProtocol>
14 15  
15 16 @end
... ... @@ -26,4 +27,9 @@
26 27 CNBPerCertificationController *vc = [[CNBPerCertificationController alloc]initControllerWithCertificatType:dic];
27 28 return vc;
28 29 }
  30 +#pragma mark -跳到资料认证页面
  31 +- (UIViewController *)pushToAddPerAuthInstitutionsController:(NSDictionary *)dic {
  32 + CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
  33 + return vc;
  34 +}
29 35 @end
... ...
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/ApplyForShootController.m
  View file @79f2ee2
... ... @@ -29,7 +29,6 @@
29 29 #import <CNLiveImagePickerController/TZImagePickerController.h>
30 30 #import <CNLiveImagePickerController/TZImageManager.h>
31 31 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
32   -
33 32 @interface ApplyForShootController ()<UIAlertViewDelegate,UITableViewDelegate,UITableViewDataSource,UINavigationControllerDelegate, UIImagePickerControllerDelegate>
34 33  
35 34 @property (nonatomic, strong) UITableView *tableView;
... ... @@ -547,6 +546,9 @@
547 546 //成功
548 547 CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
549 548 [self.navigationController pushViewController:vc animated:NO];
  549 +// id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];
  550 +// CNBPersonalVerificationController *vc = (CNBPersonalVerificationController *)[service pushToAddPerAuthInstitutionsController:@{}];
  551 +// [self.navigationController pushViewController:vc animated:YES];
550 552  
551 553 } else {//接口失败
552 554  
... ...
Example/CNLiveBPersonalVerificationModule/CNLIVEViewController.m
  View file @79f2ee2
... ... @@ -12,6 +12,7 @@
12 12 #import "CNBPerCertificationController.h"
13 13 #import "CNLiveBPersonAuthentProtocol.h"
14 14 #import "ApplyForShootController.h"
  15 +#import "CNLiveIDCardAuthenProtocol.h"
15 16 @interface CNLIVEViewController ()
16 17  
17 18 @end
... ... @@ -44,11 +45,10 @@
44 45 - (void)buttonAction {
45 46 // ApplyForShootController *vc = [[ApplyForShootController alloc] init];
46 47  
47   - CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
  48 + id <CNLiveIDCardAuthenProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveIDCardAuthenProtocol)];
  49 + ApplyForShootController *vc = (ApplyForShootController *)[service pushToCNLiveIDCardAuthController];
  50 +// CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
48 51 [self.navigationController pushViewController:vc animated:NO];
49   -// id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];
50   -// CNBPersonalVerificationController *vc = (CNBPersonalVerificationController *)[service pushToAddPerAuthInstitutionsController:@{}];
51   -// [self.navigationController pushViewController:vc animated:NO];
52 52 }
53 53 - (void)successBtnAction {
54 54 id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];
... ...