身份证

王军波
1 parent 7249b72d
Showing 15 changed files with 331 additions and 177 deletions
CNLiveBPersonalVerificationModule.podspec
CNLiveBPersonalVerificationModule/Assets/CNBPersonCardInfo/CNBPersonCardInfo.bundle/observer_idcard_own@2x.png
CNLiveBPersonalVerificationModule/Assets/CNBPersonCardInfo/CNBPersonCardInfo.bundle/observer_idcard_own@3x.png
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/ApplyForShootController.h
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/ApplyForShootController.m
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Model/AgreementModel.h
CNLiveIDCardAuthGetImage.h → CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Model/CNLiveIDCardAuthGetImage.h
CNLiveIDCardAuthGetImage.m → CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Model/CNLiveIDCardAuthGetImage.m
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/View/ApplyForConfirmCell.m
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/View/ApplyForShootCell.m
Example/CNLiveBPersonalVerificationModule.xcodeproj/project.pbxproj
Example/CNLiveBPersonalVerificationModule/CNLIVEViewController.m
Example/CNLiveBPersonalVerificationModule/CNLiveBPersonalVerificationModule-Info.plist
@@ -113,6 +113,8 @@ s.subspec &#39;CNBPersonCardInfo&#39; do |card|
     card.dependency 'CNLiveCustomUI'
     ##用户库
     card.dependency 'CNLiveUserManagement'
+    ##相册
+    card.dependency 'CNLiveImagePickerController'
     # #网络请求
      card.dependency 'CNLiveRequestBastKit'
      card.dependency 'CNLiveEnvironment'
@@ -8,16 +8,6 @@
 #import <UIKit/UIKit.h>
-@protocol ApplyForShootControllerDelegate <NSObject>
-
-- (void)completeRefresh;
-
-@end
-
 @interface ApplyForShootController : UIViewController
-@property (nonatomic, weak) id <ApplyForShootControllerDelegate>delegate;
-
-- (instancetype)initWithIsMineVC:(BOOL)isMineVC;
-
 @end
@@ -25,27 +25,32 @@
 #import "CNLiveBusinessTools.h"
 #import "CNLiveEnvironment.h"
 #import "CNLiveIDCardAuthGetImage.h"
-static NSString *shootCellId = @"shootCellId";
-static NSString *confirmCellId = @"confirmCellId";
+#import "CNBPersonalVerificationController.h"
+#import <CNLiveImagePickerController/TZImagePickerController.h>
+#import <CNLiveImagePickerController/TZImageManager.h>
+#import <CNLiveCommonCategory/CNLiveCommonCategory.h>
-@interface ApplyForShootController ()<UIAlertViewDelegate,UITableViewDelegate,UITableViewDataSource>
+@interface ApplyForShootController ()<UIAlertViewDelegate,UITableViewDelegate,UITableViewDataSource,UINavigationControllerDelegate, UIImagePickerControllerDelegate>
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSArray <AgreementModel*>*dataArray;
 @property (nonatomic, strong) UIImage *fontImage;
 @property (nonatomic, strong) UIImage *backImage;
+@property (nonatomic, strong) UIImage *iconImage;
 @property (nonatomic, strong) NSMutableArray *imageDatas;
 @property (nonatomic, copy)  NSString *realName;
 @property (nonatomic, copy)  NSString *idCardNo;
+@property (nonatomic, copy)  NSString *address;
 @property (nonatomic, assign) BOOL isFont;
 @property (nonatomic, assign) BOOL isDataSucc;
 @property (nonatomic, assign) BOOL isFontSucc;
 @property (nonatomic, assign) BOOL isBackSucc;
-@property (nonatomic, assign) BOOL isMineVC; //是否是"我的"页面
+@property (nonatomic, assign) BOOL isOwnSucc;
 @property (nonatomic, assign) BOOL isHandler;//是否监听识别结果
+@property (nonatomic, strong) UIImagePickerController *pickerVC;
 @property (nonatomic, strong) ApplyForConfirmCell *confirmCell;
@@ -58,35 +63,21 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
     void (^_failHandler)(NSError *);
 }
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-}
-
-- (instancetype)initWithIsMineVC:(BOOL)isMineVC
-{
-    self = [super init];
-    if (self) {
-        self.isMineVC = isMineVC;
-    }
-    return self;
-}
-
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.title = @"资质上传";
+    self.title = @"拍摄照片";
     self.view.backgroundColor = [UIColor whiteColor];
     self.imageDatas = [NSMutableArray array];
-#pragma mark -warning 这里注释掉了
+    self.pickerVC = [[UIImagePickerController alloc] init];
+    self.pickerVC.delegate = self;
     [[AipOcrService shardService] authWithAK:BDAppKey andSK:BDSecret];
     [self loadData];
     [self.view addSubview:self.tableView];
-//    if (@available(iOS 11, *)) {
-//        if (self.isViewLoaded) {
-//            self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-//        }
-//    } else {
-//        self.automaticallyAdjustsScrollViewInsets = NO;
-//    }
+    if (@available(iOS 11.0, *)) {
+        self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    }else{
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
     [self configCallback];
 }
@@ -97,13 +88,21 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                        @{
                            @"shootTitle":@"第一步",
                            @"shootImage":@"observer_idcard_front",
-                           @"isFront":@"1"
+                           @"isFront":@"1",
+                           @"isOwn":@"0"
                            },
                        @{
                            @"shootTitle":@"第二步",
                            @"shootImage":@"observer_idcard_back",
-                           @"isFront":@"0"
-                           }
+                           @"isFront":@"0",
+                           @"isOwn":@"0"
+                           },
+                       @{
+                           @"shootTitle":@"第三步",
+                           @"shootImage":@"observer_idcard_own",
+                           @"isFront":@"0",
+                           @"isOwn":@"1"
+                       },
                        ];
     NSMutableArray *arrayM = [NSMutableArray array];
     for (NSDictionary *dic in array) {
@@ -125,7 +124,6 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
             return ;
         }
         weakSelf.isHandler = NO;
-        NSLog(@">>>>>>>>>>>>>>>>>>>>>>result: %@", result);
         NSString *title = @"识别结果";
         NSMutableString *message = [NSMutableString string];
@@ -227,8 +225,8 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                             NSIndexPath *index = [NSIndexPath indexPathForRow:0 inSection:0];
                             ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
                             cell.imgV.image = weakSelf.fontImage;
-                            if (weakSelf.isBackSucc) {
-                                weakSelf.confirmCell.confirmButton.backgroundColor = CNLiveColorWithHexString(@"#23D41E");
+                            if (weakSelf.isBackSucc && weakSelf.isOwnSucc) {
+                                weakSelf.confirmCell.confirmButton.backgroundColor = RGBA(76, 170, 252, 1);
                                 [weakSelf.confirmCell.confirmButton setTitleColor:kWhiteColor forState:UIControlStateNormal];
                             }
                         } else {
@@ -237,8 +235,8 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                             NSIndexPath *index = [NSIndexPath indexPathForRow:1 inSection:0];
                             ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
                             cell.imgV.image = weakSelf.backImage;
-                            if (weakSelf.isFontSucc) {
-                                weakSelf.confirmCell.confirmButton.backgroundColor = CNLiveColorWithHexString(@"#23D41E");
+                            if (weakSelf.isFontSucc && weakSelf.isOwnSucc) {
+                                weakSelf.confirmCell.confirmButton.backgroundColor = RGBA(76, 170, 252, 1);
                                 [weakSelf.confirmCell.confirmButton setTitleColor:kWhiteColor forState:UIControlStateNormal];
                             }
                         }
@@ -332,8 +330,8 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                         NSIndexPath *index = [NSIndexPath indexPathForRow:0 inSection:0];
                         ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
                         cell.imgV.image = weakSelf.fontImage;
-                        if (weakSelf.isBackSucc) {
-                            weakSelf.confirmCell.confirmButton.backgroundColor = CNLiveColorWithHexString(@"#23D41E");
+                        if (weakSelf.isBackSucc && weakSelf.isOwnSucc) {
+                            weakSelf.confirmCell.confirmButton.backgroundColor = RGBA(76, 170, 252, 1);
                             [weakSelf.confirmCell.confirmButton setTitleColor:kWhiteColor forState:UIControlStateNormal];
                         }
                     } else {
@@ -342,8 +340,8 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
                         NSIndexPath *index = [NSIndexPath indexPathForRow:1 inSection:0];
                         ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
                         cell.imgV.image = weakSelf.backImage;
-                        if (weakSelf.isFontSucc) {
-                            weakSelf.confirmCell.confirmButton.backgroundColor = CNLiveColorWithHexString(@"#23D41E");
+                        if (weakSelf.isFontSucc && weakSelf.isOwnSucc) {
+                            weakSelf.confirmCell.confirmButton.backgroundColor = RGBA(76, 170, 252, 1);
                             [weakSelf.confirmCell.confirmButton setTitleColor:kWhiteColor forState:UIControlStateNormal];
                         }
                     }
@@ -478,11 +476,6 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
     }
 }
-#pragma mark - 测试版点击图片传假图片
-- (void)takeTestPhoto:(BOOL)isFront {
-    NSLog(@"测试版点击图片传假图片");
-}
-
 #pragma mark -
 #pragma mark - 提交 Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)submit:(UIButton *)sender {
@@ -490,16 +483,6 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
     sender.selected = !sender.selected;
     sender.userInteractionEnabled = NO;
-    ///////////////////////////////////////////////测试
-//    self.realName = @"李五";
-//    self.idCardNo = @"370404199205160035";
-//    self.isFontSucc = YES;
-//    self.isBackSucc = YES;
-//    self.fontImage = [UIImage imageNamed:@"dl_shibai"];
-//    self.backImage = [UIImage imageNamed:@"dl_shibai"];
-    ///////////////////////////////////////////////测试
-    
-    
     if (!self.isFontSucc) {
         sender.selected = !sender.selected;
         sender.userInteractionEnabled = YES;
@@ -510,34 +493,25 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
         sender.userInteractionEnabled = YES;
        [QMUITips showWithText:@"请上传证件照片(后)" inView:self.view hideAfterDelay:1.5];
         return;
+    } else if (!self.isOwnSucc) {
+        sender.selected = !sender.selected;
+        sender.userInteractionEnabled = YES;
+       [QMUITips showWithText:@"请上传本人照片" inView:self.view hideAfterDelay:1.5];
+        return;
     }
-    NSMutableDictionary *idCardObvDic = [NSMutableDictionary dictionaryWithCapacity:2];
-    [idCardObvDic setObject:[NSString stringWithFormat:@"%.0f",self.fontImage.size.width] forKey:@"imageWidth"];
-    [idCardObvDic setObject:[NSString stringWithFormat:@"%.0f",self.fontImage.size.height] forKey:@"imageHeight"];
-    NSString *idCardObvInfo = [self convertToJsonData:idCardObvDic];
-    
-    NSMutableDictionary *idCardRevDic = [NSMutableDictionary dictionaryWithCapacity:2];
-    [idCardRevDic setObject:[NSString stringWithFormat:@"%.0f",self.backImage.size.width] forKey:@"imageWidth"];
-    [idCardRevDic setObject:[NSString stringWithFormat:@"%.0f",self.backImage.size.height] forKey:@"imageHeight"];
-    NSString *idCardRevInfo = [self convertToJsonData:idCardRevDic];
-    
-//    NSLog(@"%@---%@",idCardObvInfo,idCardRevInfo);
-    
     NSMutableDictionary *params = [@{
-                                     @"witSid" : CNUserShareModel.uid,
-                                     @"realName" : self.realName,
-                                     @"idCardNo" : self.idCardNo,
-                                     @"mobile" : CNUserShareModel.mobile,
-                                     @"idCardObvInfo" : idCardObvInfo ? idCardObvInfo : @"",
-                                     @"idCardRevInfo" : idCardRevInfo ? idCardRevInfo : @""
+                                     @"sid" : CNUserShareModel.uid?CNUserShareModel.uid:@"",
+                                     @"realName" : self.realName?self.realName:@"",
+                                     @"idCardNo" : self.idCardNo?self.idCardNo:@"",
+                                     @"address" : self.address?self.address:@"",
                                      } mutableCopy];
     NSMutableDictionary *para = [CNLiveBusinessTools encryptionSignWithParameter:[NSMutableDictionary dictionaryWithDictionary:params] encryptionKey:APPKey];
     __weak typeof(self) weakSelf = self;
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
-    [manager POST:CNApplyWitnessUrl parameters:para headers:nil constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
+    [manager POST:@"https://apiwjjtest.cnlive.com/Daren/buser/saveIdentity.action" parameters:para headers:nil constructingBodyWithBlock:^(id<AFMultipartFormData>  _Nonnull formData) {
         NSData *fontData = [weakSelf imageDatasWithImage:self.fontImage];
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
@@ -553,6 +527,12 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
             [formData appendPartWithFileData:backData name:[NSString stringWithFormat:@"idCardRev"] fileName:fileName2 mimeType:@"image/png"];  // mimeType: image/jpg,image/png
         }
+        NSData *iconData = [weakSelf imageDatasWithImage:self.iconImage];
+        NSString *fileName3 = [NSString stringWithFormat:@"%@%@.png",[formatter stringFromDate:[NSDate date]],@(3)];
+        if (iconData) {
+            [formData appendPartWithFileData:iconData name:[NSString stringWithFormat:@"icon"] fileName:fileName3 mimeType:@"image/png"];
+        }
+        
     } progress:^(NSProgress * _Nonnull uploadProgress) {
     } success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
@@ -561,44 +541,9 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
         if ([[NSString stringWithFormat:@"%@",responseObject[@"errorCode"]] isEqualToString:@"0"]) {
-            NSDictionary *data = [NSDictionary dictionaryWithDictionary:responseObject[@"data"]];
-            NSString *reviewStatus = [NSString stringWithFormat:@"%@",data[@"reviewStatus"]];//0-申请成功审核中，1-审核失败(可再次申请)，2审核成功(已成为目击者)
-            if ([reviewStatus isEqualToString:@"0"]) {
-                dispatch_async(dispatch_get_main_queue(), ^{
-//                    CNApplyStatusController *statusVC = [[CNApplyStatusController alloc] initWithType:AuditStatusTypeAppling];
-//                    statusVC.applyStatusVCDelegate = weakSelf;
-//                    [[AppDelegate sharedAppDelegate] pushViewController:statusVC withBackTitle:@" "];
-                    if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(completeRefresh)]) {
-                        [weakSelf.delegate completeRefresh];
-                    }
-                    [weakSelf backAction];
-                });
-            } else if ([reviewStatus isEqualToString:@"1"]) {
-                dispatch_async(dispatch_get_main_queue(), ^{
-//                    CNApplyStatusController *statusVC = [[CNApplyStatusController alloc] initWithType:AuditStatusTypeApplyFailed];
-//                    statusVC.applyStatusVCDelegate = weakSelf;
-//                    [[AppDelegate sharedAppDelegate] pushViewController:statusVC withBackTitle:@" "];
-                    if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(completeRefresh)]) {
-                        [weakSelf.delegate completeRefresh];
-                    }
-                    [weakSelf backAction];
-                });
-            } else if ([reviewStatus isEqualToString:@"2"]) {
-                dispatch_async(dispatch_get_main_queue(), ^{
-//                    CNApplyStatusController *statusVC = [[CNApplyStatusController alloc] initWithType:AuditStatusTypeAppling];
-//                    statusVC.applyStatusVCDelegate = weakSelf;
-//                    [[AppDelegate sharedAppDelegate] pushViewController:statusVC withBackTitle:@" "];
-                    if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(completeRefresh)]) {
-                        [weakSelf.delegate completeRefresh];
-                    }
-                    [weakSelf backAction];
-                });
-            } else {
-
-                sender.selected = !sender.selected;
-                sender.userInteractionEnabled = YES;
-                [QMUITips showError:responseObject[@"errorMessage"] inView:self.view hideAfterDelay:1.5];
-            }
+            //成功
+            CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
+            [self.navigationController pushViewController:vc animated:NO];
         } else {//接口失败
@@ -616,13 +561,6 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
     }];
 }
-#pragma mark - CNApplyStatusVCDelegate !!!!!!!!!!!!
-- (void)statusVCBackRefreshH5WitnessStatus {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(completeRefresh)]) {
-        [self.delegate completeRefresh];
-    }
-}
-
 #pragma mark - Action !!!!!!!!!!!!!!!!!!!
 - (void)backAction
 {
@@ -657,27 +595,41 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
 }
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 3;
+    return self.dataArray.count+1;
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (indexPath.row == 0 || indexPath.row == 1) {
+    if (indexPath.row < self.dataArray.count) {
         AgreementModel *model = self.dataArray[indexPath.row];
-        ApplyForShootCell *cell = [tableView dequeueReusableCellWithIdentifier:shootCellId forIndexPath:indexPath];
-        cell.selectionStyle = UITableViewCellSelectionStyleNone;
-        cell.model = model;
+        NSString *shootCellId = [NSString stringWithFormat:@"%zd",indexPath.row];
+        ApplyForShootCell *cell = [tableView dequeueReusableCellWithIdentifier:shootCellId];
+        if (!cell) {
+            cell = [[ApplyForShootCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:shootCellId];
+            cell.model = model;
+            cell.selectionStyle = UITableViewCellSelectionStyleNone;
+        }
         __weak __typeof(self)weakSelf = self;
         cell.clickShootBtnBlock = ^() {
-            [weakSelf takePhoto:model.isFront];
+            if (model.isOwn) {
+                //拍照||相册
+                [weakSelf iconAction];
+            } else {
+                //身份证
+                [weakSelf takePhoto:model.isFront];
+            }
         };
         return cell;
     } else {
-        ApplyForConfirmCell *cell = [tableView dequeueReusableCellWithIdentifier:confirmCellId forIndexPath:indexPath];
+        NSString *confirmCellId = [NSString stringWithFormat:@"%zd",indexPath.row];
+        ApplyForConfirmCell *cell = [tableView dequeueReusableCellWithIdentifier:confirmCellId];
+        if (!cell) {
+            cell = [[ApplyForConfirmCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:confirmCellId];
+        }
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
         AgreementModel *model = [[AgreementModel alloc] init];
-        model.confirmTitle = @"提交";
+        model.confirmTitle = @"下一步";
         cell.model = model;
         __weak __typeof(self)weakSelf = self;
         cell.clickBtnBlock = ^(UIButton *btn){
@@ -690,8 +642,12 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (indexPath.row==0 || indexPath.row==1) {
-        return 256;
+    if (indexPath.row < self.dataArray.count) {
+        if (indexPath.row == 2) {
+            return 299;
+        } else {
+            return 256;
+        }
     } else {
         if (kNavigationBarHeight+256*2+145<KScreenHeight) {
             return KScreenHeight-kNavigationBarHeight-256*2;
@@ -701,6 +657,172 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
     }
 }
+#pragma mark - 自拍
+-(void)photoBtnClick {
+
+    __weak __typeof(self)weakSelf = self;
+    [self.view createAlertViewTitleArray:@[@"拍照",@"从手机相册选择"] subTitleArr:@[@"",@""] textColor:RGBA(76, 170, 252, 1) subTitleColor:[UIColor whiteColor] firstFont:UIFontMake(18.0f) font:UIFontMake(18.0f) subFont:UIFontMake(18.0f) cancelTitle:@"取消" cancelFont:UIFontMake(18.0f) cancelTitleColor:UIColorMake(102, 102, 102) actionBlock:^(UIButton *button, NSInteger didRow) {
+        switch (didRow) {
+            case 0:{
+                [weakSelf takeToXFPhoto];
+            }
+                break;
+            case 1:{
+                [weakSelf pushTZImagePickerController];
+            }
+                break;
+            default:
+                break;
+        }
+    }];
+}
+
+#pragma mark - 跳转到相机
+-(void)takeToXFPhoto {
+    if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
+        self.pickerVC.sourceType = UIImagePickerControllerSourceTypeCamera;
+        //设置拍照后的图片可被编辑
+        self.pickerVC.modalPresentationStyle = UIModalPresentationFullScreen;
+        self.pickerVC.cameraDevice = UIImagePickerControllerCameraDeviceFront;
+        self.pickerVC.allowsEditing = YES;
+        [self presentViewController:self.pickerVC animated:YES completion:nil];
+    }
+}
+
+#pragma mark -  UIImagePickerControllerDelegate
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
+
+    NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
+    //当选择的类型是图片
+    if ([type isEqualToString:@"public.image"])
+    {
+        NSString *key = nil;
+        if (picker.allowsEditing) {
+            key = UIImagePickerControllerEditedImage;
+        }
+        else {
+            key = UIImagePickerControllerOriginalImage;
+        }
+        //获取图片
+        UIImage *image = [info objectForKey:key];
+        //设置头像
+        [self handleIconWithImage:image];
+        //关闭相册界面
+        [picker dismissViewControllerAnimated:YES completion:^{
+            
+        }];
+    }
+}
+
+- (void)handleIconWithImage:(UIImage *)image {
+    // 固定方向
+    image = [image fixOrientation];//这个方法是UIImage+Extras.h中方法
+    //压缩图片质量
+    image = [self reduceImage:image percent:0.5];
+    
+//    CGSize imageSize = image.size;
+//    imageSize.height = 320;
+//    imageSize.width = 320;
+//    image = [self imageWithImageSimple:image scaledToSize:imageSize];
+    __weak typeof(self)weakSelf = self;
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSIndexPath *index = [NSIndexPath indexPathForRow:2 inSection:0];
+        ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
+        cell.imgV.image = image;
+        weakSelf.isOwnSucc = YES;
+        weakSelf.iconImage = image;
+        if (weakSelf.isFont && weakSelf.isBackSucc) {
+            weakSelf.confirmCell.confirmButton.backgroundColor = RGBA(76, 170, 252, 1);
+            [weakSelf.confirmCell.confirmButton setTitleColor:kWhiteColor forState:UIControlStateNormal];
+        }
+    });
+    
+}
+
+//压缩图片质量
+-(UIImage *)reduceImage:(UIImage *)image percent:(float)percent {
+    NSData *imageData = UIImageJPEGRepresentation(image, percent);
+    UIImage *newImage = [UIImage imageWithData:imageData];
+    return newImage;
+}
+//压缩图片尺寸
+- (UIImage*)imageWithImageSimple:(UIImage*)image scaledToSize:(CGSize)newSize {
+    UIGraphicsBeginImageContext(newSize);
+    [image drawInRect:CGRectMake(0,0,newSize.width,newSize.height)];
+    UIImage* newImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    return newImage;
+}
+
+//当用户取消选择的时候，调用该方法
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
+    [picker dismissViewControllerAnimated:YES completion:^{}];
+}
+
+// 自拍cell点击事件
+- (void)iconAction {
+    AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+    if ((authStatus == AVAuthorizationStatusRestricted || authStatus ==AVAuthorizationStatusDenied) && iOS7Later) {
+        // 无权限 做一个友好的提示
+        [self goPrivacySetting];
+    } else if (authStatus == AVAuthorizationStatusNotDetermined) {
+        // fix issue 466, 防止用户首次拍照拒绝授权时相机页黑屏
+        if (iOS7Later) {
+            [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
+                if (granted) {
+                    dispatch_sync(dispatch_get_main_queue(), ^{
+                        [self photoBtnClick];
+                    });
+                }
+            }];
+        } else {
+            [self photoBtnClick];
+        }
+    } else {
+        [self photoBtnClick];
+    }
+}
+// 隐私设置提醒
+- (void)goPrivacySetting {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSString *appName = [[NSBundle mainBundle].infoDictionary valueForKey:@"CFBundleDisplayName"];
+        if (!appName) appName = [[NSBundle mainBundle].infoDictionary valueForKey:@"CFBundleName"];
+        NSString *message = [NSString stringWithFormat:@"请去-> [设置 - 隐私 - 相机 - %@] 打开访问开关",appName];
+        QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"确定" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+            
+        }];
+        QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"警告" message:message preferredStyle:QMUIAlertControllerStyleAlert];
+        [alertController addAction:action1];
+        [alertController showWithAnimated:YES];
+        
+    });
+}
+
+#pragma maek -从相册选择
+- (void)pushTZImagePickerController {
+    __weak typeof(self)weakSelf = self;
+    TZImagePickerController *picker = [[TZImagePickerController alloc]initWithMaxImagesCount:1 delegate:self];
+    picker.modalPresentationStyle = UIModalPresentationFullScreen;
+    picker.allowPickingVideo = NO;
+    picker.allowPreview = NO;
+    picker.allowPickingGif = NO;
+    picker.allowTakePicture = NO;
+    [picker setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            NSIndexPath *index = [NSIndexPath indexPathForRow:2 inSection:0];
+            ApplyForShootCell *cell = [weakSelf.tableView cellForRowAtIndexPath:index];
+            cell.imgV.image = [photos firstObject];
+            weakSelf.isOwnSucc = YES;
+            weakSelf.iconImage = [photos firstObject];
+            if (weakSelf.isFont && weakSelf.isBackSucc) {
+                weakSelf.confirmCell.confirmButton.backgroundColor = RGBA(76, 170, 252, 1);
+                [weakSelf.confirmCell.confirmButton setTitleColor:kWhiteColor forState:UIControlStateNormal];
+            }
+        });
+    }];
+    [self presentViewController:picker animated:YES completion:nil];
+}
+
 #pragma mark UIAlertViewDelegate
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
     [self dismissViewControllerAnimated:YES completion:nil];
@@ -732,10 +854,8 @@ static NSString *confirmCellId = @&quot;confirmCellId&quot;;
 #pragma mark - SubViews
 -(UITableView *)tableView {
     if (!_tableView) {
-        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight-(self.isMineVC?kNavigationBarHeight:0)) style:UITableViewStylePlain];
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, kNavigationBarHeight, KScreenWidth, KScreenHeight-kNavigationBarHeight) style:UITableViewStylePlain];
         _tableView.backgroundColor = RGB(242, 242, 242);
-        [_tableView registerClass:[ApplyForShootCell class] forCellReuseIdentifier:shootCellId];
-        [_tableView registerClass:[ApplyForConfirmCell class] forCellReuseIdentifier:confirmCellId];
         _tableView.delegate = self;
         _tableView.dataSource = self;
         _tableView.separatorStyle = NO;
@@ -15,5 +15,6 @@
 @property (nonatomic, copy) NSString *shootTitle;
 @property (nonatomic, copy) NSString *shootImage;
 @property (nonatomic, assign) BOOL isFront;
+@property (nonatomic, assign) BOOL isOwn;
 @end
 //
-//  CNBPersonalAuthenticationService.h
+//  CNIDCardAuthenticationServices.h
 //  CNLiveBPersonalVerificationModule
 //
-//  Created by 殷巧娟 on 2020/4/17.
+//  Created by cnliveJunBo on 2020/4/22.
 //
 #import <Foundation/Foundation.h>
 NS_ASSUME_NONNULL_BEGIN
-@interface CNBPersonalAuthenticationService : NSObject
+@interface CNIDCardAuthenticationServices : NSObject
 @end
 //
-//  CNBPersonalAuthenticationService.m
+//  CNIDCardAuthenticationServices.m
 //  CNLiveBPersonalVerificationModule
 //
-//  Created by 殷巧娟 on 2020/4/17.
+//  Created by cnliveJunBo on 2020/4/22.
 //
-#import "CNBPersonalAuthenticationService.h"
+#import "CNIDCardAuthenticationServices.h"
-@implementation CNBPersonalAuthenticationService
+@implementation CNIDCardAuthenticationServices
 @end
@@ -42,7 +42,7 @@
 - (UIButton *)confirmButton {
     if (!_confirmButton) {
-        _confirmButton = [UIButton create_textButton:CGRectMake(30, 40, KScreenWidth-60, 45)  backgroundColor:RGB(216, 216, 216) title:@"下一步" selectedTitle:@"提交中..." fontSize:18 normalColor:RGB(180, 180, 180) selectedColor:kWhiteColor cornerRadius:4.0 borderWidth:0 borderColor:nil];
+        _confirmButton = [UIButton create_textButton:CGRectMake(30, 40, KScreenWidth-60, 45)  backgroundColor:RGB(216, 216, 216) title:@"下一步" selectedTitle:@"提交中..." fontSize:18 normalColor:RGB(180, 180, 180) selectedColor:kWhiteColor cornerRadius:22.5 borderWidth:0 borderColor:nil];
         [_confirmButton addTarget:self action:@selector(agree:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _confirmButton;
@@ -36,6 +36,8 @@
     _titleLab.text = model.shootTitle;
     _imgV.image = [CNLiveIDCardAuthGetImage cnLiveIDCardAuth_getImageName:model.shootImage bundle:@"CNBPersonCardInfo.bundle/CNBPersonCardInfo" targetClass:[self class]];
+    CGFloat width = KScreenWidth - 88;
+    CGFloat height = width*157.0/287.0;
     if (model.isFront) {
         self.lineV.hidden = NO;
         NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:@"请拍摄本人身份证正面 注意避免证件反光"];
@@ -46,6 +48,23 @@
         NSRange range3 = [[str string] rangeOfString:@" 注意避免证件反光"];
         [str addAttribute:NSForegroundColorAttributeName value:RGBA(156, 156, 156, 1) range:range3];
         _subTitleLab.attributedText = str;
+        [self.imgV mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.subTitleLab.mas_bottom).offset(10);
+            make.left.equalTo(self).offset(44);
+            make.right.equalTo(self).offset(-44);
+            make.height.mas_equalTo(height);
+        }];
+    } else if (model.isOwn) {
+        self.lineV.hidden = YES;
+        NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:@"请上传您本人照片，确保肩部至头部清晰可见"];
+        [str addAttribute:NSForegroundColorAttributeName value:RGBA(156, 156, 156, 1) range:NSMakeRange(0, str.length)];
+        _subTitleLab.attributedText = str;
+        [self.imgV mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.subTitleLab.mas_bottom).offset(10);
+            make.left.equalTo(self).offset(44);
+            make.width.mas_equalTo(133);
+            make.height.mas_equalTo(199);
+        }];
     } else {
         self.lineV.hidden = YES;
         NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:@"请拍摄本人身份证反面 注意避免证件反光"];
@@ -56,6 +75,12 @@
         NSRange range3 = [[str string] rangeOfString:@" 注意避免证件反光"];
         [str addAttribute:NSForegroundColorAttributeName value:RGBA(156, 156, 156, 1) range:range3];
         _subTitleLab.attributedText = str;
+        [self.imgV mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.subTitleLab.mas_bottom).offset(10);
+            make.left.equalTo(self).offset(44);
+            make.right.equalTo(self).offset(-44);
+            make.height.mas_equalTo(height);
+        }];
     }
 }
@@ -68,39 +93,38 @@
     [self.contentView addSubview:self.imgV];
 //    [self.imgV addSubview:self.shootBtn];
+    [self.lineV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.top.right.equalTo(self.contentView);
+            make.height.mas_equalTo(1);
+        }];
+        [self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(self.contentView).offset(69);
+            make.top.equalTo(_lineV.mas_bottom).offset(22);
+            make.width.mas_equalTo(64);
+            make.height.mas_equalTo(16);
+        }];
+        [self.subTitleLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.equalTo(self.contentView).offset(69);
+            make.top.equalTo(self.titleLab.mas_bottom).offset(15);
+            make.height.mas_equalTo(15);
+        }];
+        CGFloat width = KScreenWidth - 88;
+        CGFloat height = width*157.0/287.0;
+        [self.imgV mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.subTitleLab.mas_bottom).offset(10);
+            make.left.equalTo(self).offset(44);
+            make.right.equalTo(self).offset(-44);
+            make.height.mas_equalTo(height);
+        }];
+    //    [self.shootBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+    //        make.center.equalTo(self.imgV);
+    //        make.width.height.mas_equalTo(60);
+    //    }];
 }
 - (void)layoutSubviews {
     [super layoutSubviews];
-    [self.lineV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.top.right.equalTo(self.contentView);
-        make.height.mas_equalTo(1);
-    }];
-    [self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.contentView).offset(69);
-        make.top.equalTo(_lineV.mas_bottom).offset(22);
-        make.width.mas_equalTo(64);
-        make.height.mas_equalTo(16);
-    }];
-    [self.subTitleLab mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerX.equalTo(self.contentView);
-        make.top.equalTo(self.titleLab.mas_bottom).offset(15);
-        make.width.mas_equalTo(245);
-        make.height.mas_equalTo(15);
-    }];
-    CGFloat width = KScreenWidth - 88;
-    CGFloat height = width*157.0/287.0;
-    [self.imgV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.subTitleLab.mas_bottom).offset(10);
-        make.left.equalTo(self).offset(44);
-        make.right.equalTo(self).offset(-44);
-        make.height.mas_equalTo(height);
-    }];
-//    [self.shootBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-//        make.center.equalTo(self.imgV);
-//        make.width.height.mas_equalTo(60);
-//    }];
 }
 - (void)shootPhotoAction:(UIButton *)sender{
@@ -371,13 +371,18 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+				"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
+				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
 				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
@@ -399,13 +404,18 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
@@ -11,6 +11,7 @@
 #import "CNBPerAuthSuccessController.h"
 #import "CNBPerCertificationController.h"
 #import "CNLiveBPersonAuthentProtocol.h"
+#import "ApplyForShootController.h"
 @interface CNLIVEViewController ()
 @end
@@ -41,7 +42,9 @@
 }
 - (void)buttonAction {
-    CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
+    ApplyForShootController *vc = [[ApplyForShootController alloc] init];
+    
+//    CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
     [self.navigationController pushViewController:vc animated:NO];
 //    id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];
 //    CNBPersonalVerificationController *vc = (CNBPersonalVerificationController *)[service pushToAddPerAuthInstitutionsController:@{}];
@@ -31,6 +31,10 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>需要允许开启相机才能使用拍照功能</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>需要允许打开相册才能访问相册照片和保存照片</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>