合并

王军波
2 parents cadaf541 b0aa25fe
Showing 11 changed files with 78 additions and 71 deletions
CNLiveBPersonalVerificationModule.podspec
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPerAuthSuccessController.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPersonalVerificationController.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPerAuthTypeRadioView.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPersonalInfoCell.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPersonalVerificationCell.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/CNBPerAuthManager.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/ViewModel/CNBPerAuthViewModel.m
CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/ApplyForShootController.m
Example/CNLiveBPersonalVerificationModule/CNLIVEViewController.m
Example/CNLiveBPersonalVerificationModule/main.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveBPersonalVerificationModule'
-  s.version          = '0.1.0'
+  s.version          = '0.1.1'
   s.summary          = 'B端个人资料认证开发'
  
  
@@ -85,7 +85,7 @@ s.subspec &#39;CNBPersonCardInfo&#39; do |card|
     card.subspec 'Controller' do |controller|
         controller.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/*.{h,m}'
                controller.dependency 'CNLiveBPersonalVerificationModule/CNBPersonCardInfo/View'
-               controller.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/Controller'
+#               controller.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/Controller'
                controller.ios.vendored_frameworks = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework'
  
     end
@@ -48,7 +48,7 @@ static NSString *groupIdentifier = @&quot;CNBGroupInfoCell&quot;;
     if (self.data && [self.data isKindOfClass:[NSDictionary class]] && self.data.count > 0) {
         if ([[self.data allKeys] containsObject:@"institution"]) {
             NSArray *array = self.data[@"institution"];
-            if (array.count > 0) {
+            if (array.count > 0 ) {
                 CNBPerCertificationSuccessModel *successModel = [CNBPerCertificationSuccessModel mj_objectWithKeyValues:self.data];
                 self.infoModel = successModel.bUserIdentity;
                 for (CNBInstitutionModel *model in successModel.institution) {
@@ -57,10 +57,10 @@ static NSString *groupIdentifier = @&quot;CNBGroupInfoCell&quot;;
                 [self.institutionArray insertObject:successModel.bUserIdentity atIndex:0];
                 [self.tableView reloadData];
             }else {
-                [self showEmptyView:CNBPerAuthErrorTypeNoData];
+                [self requestPerAuthSuccessData];
             }
         }else {
-             [self showEmptyView:CNBPerAuthErrorTypeNoData];
+              [self requestPerAuthSuccessData];
         }
     }else {
         [self requestPerAuthSuccessData];
@@ -175,7 +175,21 @@ static NSString *groupIdentifier = @&quot;CNBGroupInfoCell&quot;;
             }
             CNBInstitutionModel *model = self.institutionArray[indexPath.section];
             NSArray *circleArray = model.quanziItem;
-            groupCell.circleModel = circleArray[indexPath.row -1];
+           if (circleArray.count > 0) {
+               groupCell.circleModel = circleArray[indexPath.row -1];
+           }else {
+               CNBCirccleModel *circleModel = [[CNBCirccleModel alloc]init];
+               circleModel.quanziName = @"无";
+               NSMutableArray *groupArray = [NSMutableArray array];
+               NSArray *noneArray = @[@{@"groupId":@"",@"groupName":@"无"},
+               ];
+               for (NSDictionary *dic in noneArray) {
+                   CNBGroupModel *model = [CNBGroupModel mj_objectWithKeyValues:dic];
+                   [groupArray addObject:model];
+               }
+               circleModel.groupItem = groupArray;
+               groupCell.circleModel = circleModel;
+           }
             return groupCell;
         }
     }
@@ -305,27 +305,33 @@
                         [circleDic setObject:typeModel.type forKey:@"type"];
                         [circleDic setObject:typeModel.homePageId forKey:@"quanziId"];
                         [circleDic setObject:typeModel.circleName forKey:@"quanziName"];
+                        NSMutableArray *groupArray  = [NSMutableArray array];
+                        if (typeModel.groupArray.count > 0 && typeModel.groupArray) {
+                            for (CNBPerAuthSelectTypeModel *groupModel in typeModel.groupArray) {
+                                NSMutableDictionary *groupDic = [NSMutableDictionary dictionary];
+                                [groupDic setObject:groupModel.groupId forKey:@"groupId"];
+                                [groupDic setObject:groupModel.name forKey:@"groupName"];
+                                [groupArray addObject:groupDic];
+                            }
+                             [circleDic setObject:groupArray forKey:@"groupItem"];
+                        }
+
+                        [circleArray addObject:circleDic];
+                        [instritutionDic addArray:circleArray.copy forKey:@"quanziItem"];
                     }
-                    NSMutableArray *groupArray  = [NSMutableArray array];
-                    for (CNBPerAuthSelectTypeModel *groupModel in typeModel.groupArray) {
-                        NSMutableDictionary *groupDic = [NSMutableDictionary dictionary];
-                        [groupDic setObject:groupModel.groupId forKey:@"groupId"];
-                        [groupDic setObject:groupModel.name forKey:@"groupName"];
-                        [groupArray addObject:groupDic];
-                    }
-                    [circleDic setObject:groupArray forKey:@"groupItem"];
-                    [circleArray addObject:circleDic];
  
                 }
  
-                [instritutionDic addArray:circleArray.copy forKey:@"quanziItem"];
             }
         }
         [instritutionArray addObject:instritutionDic];
     }
     [submitDic setObject:instritutionArray forKey:@"Institution"];
     [submitDic setObject:CNUserShareModelUid forKey:@"sid"];
+//    [submitDic setObject:@" 10511059" forKey:@"sid"];
+    
     NSString *submitStr = [self objectToJson:submitDic];
+    
     submitStr = [submitStr stringByReplacingOccurrencesOfString:@"\\/" withString:@"/"];
     __weak typeof(self) weakSelf = self;
     [CNBPerAuthViewModel submitPerAuthData:submitStr successBlock:^(BOOL isSuccess) {
@@ -16,6 +16,7 @@
 #import "CNEmptyView.h"
 #import "CNBIdentifierModel.h"
 #import "CNBPerAuthManager.h"
+#import "UIButton+createButton.h"
 #define CNBSelecctIdentifier  @"CNBPerAuthTypeRadioCell"
 #define CNBottomSureBtnHeight 75
 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window
@@ -30,7 +31,7 @@
 @property (nonatomic, copy)   NSString  *homepageId;
 @property (nonatomic, assign) NSInteger page;
 @property (nonatomic, strong) NSMutableArray *dataSource;
-@property (nonatomic, strong) CNEmptyView *emptyView;
+@property (nonatomic, strong) CNEmptyView *selectEmptyView;
 @property (nonatomic, strong) UIButton    *sureBtn; //确定按钮
 @property (nonatomic, strong) CNBTypeModel *typeModel;
 @property (nonatomic, strong) NSMutableArray *sureDataArray;  //最后确定提交的数组,最多只能添加5个群组
@@ -148,10 +149,10 @@
             [strongSelf showEmptyView:self.selectType errorType:CNBPerShowErrorTypeNoData];
         }else {
             strongSelf.tableView.tableFooterView = [UIView new];
-            [strongSelf.emptyView removeFromSuperview];
+            [strongSelf.selectEmptyView removeFromSuperview];
         }
         if (strongSelf.selectType == CNBPerAuthRadioTypeCircle ) {
-            if (!strongSelf.isRefresh) {
+            if (!strongSelf.isRefresh && strongSelf.dataSource.count > 0) {
                 CNBPerAuthSelectTypeModel *selectModel = [[CNBPerAuthSelectTypeModel alloc]init];
                 selectModel.name = @"无";
                 selectModel.typeId = @"";
@@ -177,7 +178,7 @@
                 [weakSelf showEmptyView:self.selectType errorType:CNBPerShowErrorTypeFail];
             }
         }else {
-            [weakSelf.emptyView removeFromSuperview];
+            [weakSelf.selectEmptyView removeFromSuperview];
             [QMUITips showWithText:error.localizedDescription inView:CNBAppKeyWindow hideAfterDelay:1.5f];
         }
     }];
@@ -220,18 +221,20 @@
     }
  
     BOOL isHiden = errorType == CNBPerShowErrorTypeNoData;
-    [self.emptyView showImage:[CNLivePerAuthGetImage cnLivePerAuth_getImageName:imageName bundle:@"CNLiveBPersonalVerificationModule.bundle/CNLiveBPersonalVerificationModule" targetClass:[self class]] title:titleName detailTitle:@"" retryBtnTitle:retryName];
-     self.emptyView.retryBtn.hidden = isHiden;
-     self.emptyView.retryBtn.backgroundColor = kWhiteColor;
-     self.emptyView.retryBtn.layer.masksToBounds = YES;
-     self.emptyView.retryBtn.layer.cornerRadius = 14;
-     self.emptyView.retryBtn.layer.borderWidth = 1;
-     self.emptyView.retryBtn.layer.borderColor = CNLiveColorWithHexString(@"48A7F9").CGColor;
-     [self.emptyView.retryBtn setTitleColor:CNLiveColorWithHexString(@"48A7F9") forState:UIControlStateNormal];
-     [self.emptyView.retryBtn setTitleColor:CNLiveColorWithHexString(@"48A7F9") forState:UIControlStateHighlighted];
-    errorType == CNBPerShowErrorTypeNoData ?self.tableView.tableFooterView = self.emptyView :[self addSubview:self.emptyView];
+    UIImage *image = [CNLivePerAuthGetImage cnLivePerAuth_getImageName:imageName bundle:@"CNLiveBPersonalVerificationModule.bundle/CNLiveBPersonalVerificationModule" targetClass:[self class]] ;
+    self.selectEmptyView.imageSize = image.size;
+    [self.selectEmptyView showImage:image title:titleName detailTitle:@"" retryBtnTitle:retryName];
+     self.selectEmptyView.retryBtn.hidden = isHiden;
+     self.selectEmptyView.retryBtn.backgroundColor = kWhiteColor;
+     self.selectEmptyView.retryBtn.layer.masksToBounds = YES;
+     self.selectEmptyView.retryBtn.layer.cornerRadius = 14;
+     self.selectEmptyView.retryBtn.layer.borderWidth = 1;
+     self.selectEmptyView.retryBtn.layer.borderColor = CNLiveColorWithHexString(@"48A7F9").CGColor;
+     [self.selectEmptyView.retryBtn setTitleColor:CNLiveColorWithHexString(@"48A7F9") forState:UIControlStateNormal];
+     [self.selectEmptyView.retryBtn setTitleColor:CNLiveColorWithHexString(@"48A7F9") forState:UIControlStateHighlighted];
+    errorType == CNBPerShowErrorTypeNoData ?self.tableView.tableFooterView = self.selectEmptyView :[self addSubview:self.selectEmptyView];
     if (!isHiden) {
-        [self.emptyView.retryBtn addTarget:self action:@selector(retryloadData) forControlEvents:UIControlEventTouchUpInside];
+        [self.selectEmptyView.retryBtn addTarget:self action:@selector(retryloadData) forControlEvents:UIControlEventTouchUpInside];
     }
  
 }
@@ -414,7 +417,7 @@
     if (!_closeBtn) {
         _closeBtn = [[UIButton alloc]init];
         [_closeBtn setImage:[CNLivePerAuthGetImage cnLivePerAuth_getImageName:@"perAuth_cancel" bundle:@"CNLiveBPersonalVerificationModule.bundle/CNLiveBPersonalVerificationModule" targetClass:[self class]] forState:UIControlStateNormal];
-//        _closeBtn.touchAreaInsets = UIEdgeInsetsMake(15, 15, 15, 15);
+        _closeBtn.touchAreaInsets = UIEdgeInsetsMake(15, 15, 15, 15);
         [_closeBtn addTarget:self action:@selector(closeBtnAction) forControlEvents:UIControlEventTouchUpInside];
     }
     return _closeBtn;
@@ -466,12 +469,12 @@
     }
     return _sureDataArray;
 }
-- (CNEmptyView *)emptyView {
-    if (!_emptyView) {
-        _emptyView = [[CNEmptyView alloc]initWithFrame:CGRectMake(0, KScreenHeight/4 +kNavigationBarHeight + 40, KScreenWidth, KScreenHeight*3/4 - kNavigationBarHeight - kVerticalBottomSafeHeight - 40) type:0];
-        _emptyView.backgroundColor = [UIColor whiteColor];
+- (CNEmptyView *)selectEmptyView {
+    if (!_selectEmptyView) {
+        _selectEmptyView = [[CNEmptyView alloc]initWithFrame:CGRectMake(0, KScreenHeight/4 +kNavigationBarHeight + 40, KScreenWidth, KScreenHeight*3/4 - kNavigationBarHeight - kVerticalBottomSafeHeight - 40) type:0];
+        _selectEmptyView.backgroundColor = [UIColor whiteColor];
     }
-    return _emptyView;
+    return _selectEmptyView;
 }
 @end
  
@@ -15,6 +15,7 @@
 #import <SDWebImage/SDWebImage.h>
 #import "CNBImageZoom.h"
 #import "MJExtension.h"
+#import "NSString+CNLiveExtension.h"
 #pragma mark - 身份证cell
 @interface CNBPersonalInfoCell ()
 @property (nonatomic, strong) UILabel *nameLabel; //名字名称
@@ -257,7 +258,7 @@
 }
 - (void)setCircleModel:(CNBCirccleModel *)circleModel {
     _circleModel = circleModel;
-    _circleDescLabel.text = circleModel.quanziName;
+    _circleDescLabel.text = CNLiveStringIsEmpty(circleModel.quanziName)? @"" :circleModel.quanziName;
     NSMutableArray *groupArray = [NSMutableArray array];
     if (circleModel.groupItem && circleModel.groupItem.count > 0) {
          [self setTagView:circleModel.groupItem];
@@ -311,23 +312,7 @@
         [_groupDesView mas_updateConstraints:^(MASConstraintMaker *make) {
             make.height.mas_equalTo(tagsTotalHeigh);
         }];
-//    }else {
-//        UILabel *label = [[UILabel alloc]initWithFrame:CGRectMake(tagsTotalWidth, tagsTotalHeigh, 0, 0)];
-//        label.font = [UIFont systemFontOfSize:12];
-//        label.textAlignment = NSTextAlignmentCenter;
-//            label.textColor = CNLiveColorWithHexString(@"B9B9B9");
-//        label.text = @"无";
-//        [label sizeToFit];
-//        label.frame = CGRectMake(tagsTotalWidth, tagsTotalHeigh, CGRectGetWidth(label.frame) + 7.5, CGRectGetHeight(label.frame)+7.5);
-//        tagHeight = CGRectGetHeight(label.frame);
-//        [self.groupDesView addSubview:label];
-//        tagsTotalHeigh = tagsTotalHeigh +tagHeight;
-//        [_groupDesView mas_updateConstraints:^(MASConstraintMaker *make) {
-//            make.height.mas_equalTo(tagsTotalHeigh);
-//        }];
-//    }
-//    
-    
+
 }
 #pragma mark -Lazy
 - (UILabel *)circleLabel {
@@ -348,7 +333,7 @@
         _circleDescLabel.font = [UIFont systemFontOfSize:12.5];
         _circleDescLabel.numberOfLines = 1;
         _circleDescLabel.textAlignment = NSTextAlignmentLeft;
-        _circleDescLabel.text = @"李德文老师的圈子";
+        _circleDescLabel.text = @"无";
     }
     return _circleDescLabel;
 }
@@ -225,14 +225,14 @@ static const NSInteger CNBGroupTag   = 202;
             self.deleteBtn.hidden = YES;
         }
     }
-    if (CNLiveStringIsEmpty(typeModel.circleName)) {
+    if (CNLiveStringIsEmpty(typeModel.homePageId)) {
         self.circleView.showLabel.text = @"无";
         self.circleView.showLabel.textColor = CNLiveColorWithHexString(@"B9B9B9");
     }else {
         self.circleView.showLabel.text = typeModel.circleName;
         self.circleView.showLabel.textColor = CNLiveColorWithHexString(@"333333");
     }
-    if (CNLiveStringIsEmpty(typeModel.groupName)) {
+    if (CNLiveStringIsEmpty(typeModel.groupName) || [typeModel.groupName isEqualToString:@"无"]) {
         self.groupView.showLabel.text = @"无";
         self.groupView.showLabel.textColor = CNLiveColorWithHexString(@"B9B9B9");
     }else {
@@ -6,8 +6,6 @@
 //
  
 #import "CNBPerAuthManager.h"
-#import "CNUserInfoManager.h"
-#import "NSString+CNLiveExtension.h"
 @interface CNBPerAuthManager ()
  
 @end
@@ -29,6 +29,7 @@
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     NSString *url = cn_API_Classify(@"/contentApi/getAllSp");
+    
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:url Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (responseObject && [responseObject isKindOfClass:[NSDictionary class]]) {
             NSString *errorCode = [NSString stringWithFormat:@"%@",[responseObject objectForKey:@"errorCode"]];
@@ -85,7 +86,7 @@
 #pragma mark -请求认证成功
 + (void)getPerAuthSuccessList:(void (^)(NSMutableArray *dataArray))successBlock failureBlock:(void (^)(NSError * error))failureBlock {
     NSDictionary *param = @{
-//        @"sid":@"10505015"
+//        @"sid":@"10504908"
         @"sid":CNUserShareModelUid
     };
     [QMUITips showLoadingInView:CNBAppKeyWindow];
@@ -24,11 +24,11 @@
 #import "CNLiveBusinessTools.h"
 #import "CNLiveEnvironment.h"
 #import "CNLiveIDCardAuthGetImage.h"
-#import "CNBPersonalVerificationController.h"
 #import <CNLiveImagePickerController/TZImagePickerController.h>
 #import <CNLiveImagePickerController/TZImageManager.h>
 #import <CNLiveCommonCategory/CNLiveCommonCategory.h>
 #import "CNLiveIDCardAuthAlertView.h"
+#import "CNLiveBPersonAuthentProtocol.h"
 @interface ApplyForShootController ()<UITableViewDelegate,UITableViewDataSource,UINavigationControllerDelegate, UIImagePickerControllerDelegate, IDCardAuthAlertViewDelegate>
  
 @property (nonatomic, strong) UITableView *tableView;
@@ -483,11 +483,11 @@
         if ([[NSString stringWithFormat:@"%@",responseObject[@"errorCode"]] isEqualToString:@"0"]) {
  
             //成功
-            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];
+//            CNBPersonalVerificationController *vc = [[CNBPersonalVerificationController alloc]init];
+//            [self.navigationController pushViewController:vc animated:NO];
+             id <CNLiveBPersonAuthentProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveBPersonAuthentProtocol)];
+          UIViewController *vc = [service pushToAddPerAuthInstitutionsController:@{}];
+            [self.navigationController pushViewController:vc animated:YES];
  
         } else {//接口失败
  
@@ -45,9 +45,9 @@
 - (void)buttonAction {
 //    ApplyForShootController *vc = [[ApplyForShootController alloc] init];
  
-    id <CNLiveIDCardAuthenProtocol>service = [[BeeHive shareInstance]createService:@protocol(CNLiveIDCardAuthenProtocol)];
-            ApplyForShootController *vc = (ApplyForShootController *)[service pushToCNLiveIDCardAuthController];
-//    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];
 }
 - (void)successBtnAction {
@@ -12,7 +12,7 @@
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
-         [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBLive environmentType:CNLiveDebugAppStore];
+         [CNLiveEnvironmentManager setAppType:CNLiveAppTypeBLive environmentType:CNLiveProductionAppStore];
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class]));
     }
 }