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

王军波
2 parents 9b0a214d c7aa883e
Showing 5 changed files with 31 additions and 13 deletions
CNLiveBPersonalVerificationModule.podspec
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPerCertificationController.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Services/CNBPersonAuthenticationServices.m
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/ApplyForShootController.m
Example/CNLiveBPersonalVerificationModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveBPersonalVerificationModule'
-  s.version          = '0.0.5'
+  s.version          = '0.0.6'
   s.summary          = 'B端个人资料认证开发'
@@ -64,7 +64,7 @@ s.subspec &#39;CNBInstitutionInfo&#39; do |institution|
      institution.dependency 'CNLiveRequestBastKit'
 #     #环境库
      institution.dependency 'CNLiveEnvironment'
-       institution.dependency 'CNLiveBusinessBaseModule'
+    institution.dependency 'CNLiveBusinessBaseModule'
 #     #协议库
      institution.dependency 'CNLiveBeeHive'
      institution.dependency 'CNLiveBServices'
@@ -75,7 +75,6 @@ s.subspec &#39;CNBInstitutionInfo&#39; do |institution|
     end
 s.subspec 'CNBPersonCardInfo' do |card|
-#    card.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/**'
       card.subspec 'Model' do |model|
        model.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Model/*.{h,m}'
        end
@@ -93,7 +92,7 @@ s.subspec &#39;CNBPersonCardInfo&#39; do |card|
     card.subspec 'Services' do |service|
         service.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Services/*.{h,m}'
         service.dependency 'CNLiveBPersonalVerificationModule/CNBPersonCardInfo/Controller'
-        
+
     end
 #    card.ios.vendored_frameworks = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework'
     card.resource_bundles = {
@@ -115,9 +114,9 @@ s.subspec &#39;CNBPersonCardInfo&#39; do |card|
     ##相册
     card.dependency 'CNLiveImagePickerController'
     # #网络请求
-     card.dependency 'CNLiveRequestBastKit'
-     card.dependency 'CNLiveEnvironment'
-     card.dependency 'CNLiveBusinessTools'
+    card.dependency 'CNLiveRequestBastKit'
+    card.dependency 'CNLiveEnvironment'
+    card.dependency 'CNLiveBusinessTools'
     card.dependency 'CNLiveBeeHive'
     card.dependency 'CNLiveBServices'
     end
@@ -10,6 +10,8 @@
 #import <Masonry/Masonry.h>
 #import "CNLiveBaseKit.h"
 #import "UIColor+CNLiveExtension.h"
+#import "CNLiveIDCardAuthenProtocol.h"
+#import <CNLiveBeeHive/CNLiveBeeHive.h>
 @interface CNBPerCertificationController ()
 @property (nonatomic, copy)   NSString      *type;
 @property (nonatomic, strong) UIImageView   *showImageV;
@@ -76,7 +78,16 @@
 }
 #pragma mark - Action
 - (void)sureBtnAction {
-    [self.navigationController popToRootViewControllerAnimated:YES];
+    if ([self.type isEqualToString:@"2"] ) { //未通过
+          [self.navigationController popToRootViewControllerAnimated:YES];
+    }else {
+//        ApplyForShootController *vc = [[ApplyForShootController alloc]init];
+//        [self.navigationController pushViewController:vc animated:YES];
+        id <CNLiveIDCardAuthenProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveIDCardAuthenProtocol)];
+        UIViewController *vc = [service pushToCNLiveIDCardAuthController];
+        [self.navigationController pushViewController:vc animated:YES];
+    }
+   
 }
 #pragma mark - lazy
 - (UIImageView *)showImageV {
@@ -10,6 +10,7 @@
 #import "CNLiveBPersonAuthentProtocol.h"
 #import "CNBPerAuthSuccessController.h"
 #import "CNBPerCertificationController.h"
+#import "CNBPersonalVerificationController.h"
 @interface CNBPersonAuthenticationServices ()<CNLiveBPersonAuthentProtocol>
 @end
@@ -26,4 +27,9 @@
     CNBPerCertificationController *vc = [[CNBPerCertificationController alloc]initControllerWithCertificatType:dic];
     return vc;
 }
+#pragma mark -跳到资料认证页面
+- (UIViewController *)pushToAddPerAuthInstitutionsController:(NSDictionary *)dic {
+    CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
+    return vc;
+}
 @end
@@ -29,7 +29,6 @@
 #import <CNLiveImagePickerController/TZImagePickerController.h>
 #import <CNLiveImagePickerController/TZImageManager.h>
 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
-
 @interface ApplyForShootController ()<UIAlertViewDelegate,UITableViewDelegate,UITableViewDataSource,UINavigationControllerDelegate, UIImagePickerControllerDelegate>
 @property (nonatomic, strong) UITableView *tableView;
@@ -547,6 +546,9 @@
             //成功
             CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
             [self.navigationController pushViewController:vc animated:NO];
+//             id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];
+//          CNBPersonalVerificationController *vc =  (CNBPersonalVerificationController *)[service pushToAddPerAuthInstitutionsController:@{}];
+//            [self.navigationController pushViewController:vc animated:YES];
         } else {//接口失败
@@ -12,6 +12,7 @@
 #import "CNBPerCertificationController.h"
 #import "CNLiveBPersonAuthentProtocol.h"
 #import "ApplyForShootController.h"
+#import "CNLiveIDCardAuthenProtocol.h"
 @interface CNLIVEViewController ()
 @end
@@ -44,11 +45,10 @@
 - (void)buttonAction {
 //    ApplyForShootController *vc = [[ApplyForShootController alloc] init];
-    CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
+    id <CNLiveIDCardAuthenProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveIDCardAuthenProtocol)];
+            ApplyForShootController *vc = (ApplyForShootController *)[service pushToCNLiveIDCardAuthController];
+//    CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
     [self.navigationController pushViewController:vc animated:NO];
-//    id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];
-//    CNBPersonalVerificationController *vc = (CNBPersonalVerificationController *)[service pushToAddPerAuthInstitutionsController:@{}];
-//    [self.navigationController pushViewController:vc animated:NO];
 }
 - (void)successBtnAction {
      id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];