0.1.6 重试重复问题和未填写数据时,定位到具体位置

yinqiaojuan
1 parent 9d621164
Showing 6 changed files with 47 additions and 43 deletions
CNLiveBPersonalVerificationModule.podspec
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPerCertificationController.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Controller/CNBPersonalVerificationController.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/Model/CNBIdentifierModel.h
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPerAuthTypeRadioView.m
CNLiveBPersonalVerificationModule/Classes/CNBInstitutionInfo/View/CNBPersonalVerificationCell.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveBPersonalVerificationModule'
-  s.version          = '0.1.5'
+  s.version          = '0.1.6'
   s.summary          = 'B端个人资料认证开发'
@@ -20,8 +20,6 @@
 @end
 @implementation CNBPerCertificationController
-
-
 - (instancetype)initControllerWithCertificatType:(NSDictionary *)data {
     if (self = [super init]) {
         if (data && [data isKindOfClass:[NSDictionary class]]) {
@@ -32,7 +30,6 @@
 }
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
-    
     if ([self.type isEqualToString:@"2"]) { //审核中禁用手势隐藏返回键
         self.navigationController.navigationBarHidden = YES;
         // 禁用返回手势
@@ -86,7 +83,6 @@
     }];
     self.titleLabel.text = text;
     [self.sureBtn setTitle:buttonName forState:UIControlStateNormal];
-    
 }
 #pragma mark - 配置UI
 - (void)configUI {
@@ -82,11 +82,11 @@
 - (void)addData:(NSString *)isDelete addSection:(NSString *)addSection{
     NSMutableArray *typeArray = [NSMutableArray array];
     NSArray *array = @[
-        @{@"showType":@"0",@"isDelete":@"0",@"addSection":addSection,@"addRow":@0,@"institutionsName":@"",@"circleName":@"",@"groupName":@"",@"spId":@"",@"type":@"",@"homePageId":@"",@"groupArray":@[]
+        @{@"showType":@"0",@"isDelete":@"0",@"addSection":addSection,@"addRow":@0,@"institutionsName":@"",@"circleName":@"",@"groupName":@"",@"spId":@"",@"type":@"",@"homePageId":@"",@"groupArray":@[],@"isRemind":@"0"
             },
-        @{@"showType":@"1",@"isDelete":@"0",@"addSection":addSection,@"addRow":@1,@"institutionsName":@"",@"circleName":@"",@"groupName":@"",@"spId":@"",@"type":@"",@"homePageId":@"",@"groupArray":@[]
+        @{@"showType":@"1",@"isDelete":@"0",@"addSection":addSection,@"addRow":@1,@"institutionsName":@"",@"circleName":@"",@"groupName":@"",@"spId":@"",@"type":@"",@"homePageId":@"",@"groupArray":@[],@"isRemind":@"0"
             },
-        @{@"showType":@"2",@"isDelete":@"0",@"addSection":addSection,@"addRow":@2,@"institutionsName":@"",@"circleName":@"",@"groupName":@"",@"spId":@"",@"type":@"",@"homePageId":@"",@"groupArray":@[]
+        @{@"showType":@"2",@"isDelete":@"0",@"addSection":addSection,@"addRow":@2,@"institutionsName":@"",@"circleName":@"",@"groupName":@"",@"spId":@"",@"type":@"",@"homePageId":@"",@"groupArray":@[],@"isRemind":@"0"
             }
         //           @{@"type":@"3",@"isDelete":@"0"},
         //           @{@"type":@"4",@"isDelete":@"0"}
@@ -96,7 +96,7 @@
         [typeArray addObject:model];
     }
     NSArray *sectionArray = @[
-        @{@"isDelete":isDelete,@"addSection":addSection,@"typeArray":typeArray,@"institutionName":@"",@"institutionId":@""},
+        @{@"isDelete":isDelete,@"addSection":addSection,@"typeArray":typeArray,@"institutionName":@"",@"institutionId":@"",@"isRemind":@"0"},
     ];
     for (NSDictionary *dic in sectionArray) {
         CNBAddSectionModel *model = [CNBAddSectionModel mj_objectWithKeyValues:dic];
@@ -152,6 +152,7 @@
         }
         cell.typeModel = model;
         cell.sectionModel = sectionModel;
+//        cell.institutionColor = @"C1C1C1";
         self.spId = model.spId;
         cell.refreshDataBlock = ^{ //选择完机构刷新
             [weakSelf.tableView reloadData];
@@ -203,41 +204,12 @@
             addModel.groupName = @"";
             addModel.groupArray = @[];
             addModel.homePageId = @"";
+            addModel.isRemind = @"0";
             [typeArray insertObject:addModel atIndex:circleArray.count + 1];
             sectionModel.typeArray = typeArray;
             [weakSelf.tableView reloadData];
         };
         return circleAddCell;
-    }else if ([model.showType isEqualToString:@"3"]) { //相关账号不会有了 ,已经删除了
-        CNBAccountGroupCell *accountCell = [tableView dequeueReusableCellWithIdentifier:CNBAccountGroupIdentifier];
-        if (!accountCell) {
-            accountCell = [[CNBAccountGroupCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CNBAccountGroupIdentifier];
-        }
-        __block NSMutableArray *accountTypeArr = [NSMutableArray arrayWithArray:sectionModel.typeArray];
-        __weak typeof(self) weakSelf = self;
-        accountCell.accountTypeModel = sectionModel.typeArray[indexPath.row];
-        accountCell.accountDeleteBlock = ^{
-            [accountTypeArr removeObjectAtIndex:indexPath.row];
-            sectionModel.typeArray = accountTypeArr;
-            [weakSelf.tableView reloadData];
-        };
-        return accountCell;
-    }else if ([model.showType isEqualToString:@"4"]) { //添加相关账号,已经删除了
-        CNBAddAccountGroupCell *addAccountCell = [tableView dequeueReusableCellWithIdentifier:CNBAddAccountGroupIdentifier];
-        if (!addAccountCell) {
-            addAccountCell = [[CNBAddAccountGroupCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CNBAddAccountGroupIdentifier];
-        }
-        __block NSMutableArray *addGroupArray = [NSMutableArray arrayWithArray:sectionModel.typeArray];
-        addAccountCell.addAccountGroupBlock = ^{
-                CNBTypeModel *model = [[CNBTypeModel alloc]init];
-                model.showType = @"3";
-                model.isDelete = @"1";
-                [addGroupArray insertObject:model atIndex:addGroupArray.count - 1];
-                sectionModel.typeArray = addGroupArray;
-                [weakSelf.tableView reloadData];
-        };
-        
-        return addAccountCell;
     }
     else {
         return nil;
@@ -308,7 +280,12 @@
     for (CNBAddSectionModel *sectionModel in self.sectionArray) {
         if (CNLiveStringIsEmpty(sectionModel.institutionId)) {
             [QMUITips showWithText:@"请填写机构信息" inView:CNBAppKeyWindow hideAfterDelay:1.5];
-            return ;
+            sectionModel.isRemind = @"1";
+            NSIndexSet *indexSet = [[NSIndexSet alloc]initWithIndex:sectionModel.addSection];
+            [self.tableView reloadSections:indexSet withRowAnimation:UITableViewRowAnimationAutomatic];
+            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:sectionModel.addSection];
+            [self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionTop animated:YES];
+            return;
         }
         NSMutableDictionary *instritutionDic = [NSMutableDictionary dictionary];
         NSMutableArray *circleArray = [NSMutableArray array];
@@ -330,9 +307,13 @@
                                 [groupDic setObject:groupModel.name forKey:@"groupName"];
                                 [groupArray addObject:groupDic];
                             }
-                             [circleDic setObject:groupArray forKey:@"groupItem"];
+                            [circleDic setObject:groupArray forKey:@"groupItem"];
                         }else {
                             [QMUITips showWithText:@"请填写圈子群组信息" inView:CNBAppKeyWindow hideAfterDelay:1.5];
+                            typeModel.isRemind = @"1";
+                            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:typeModel.addRow inSection:typeModel.addSection];
+                            [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath,nil] withRowAnimation:UITableViewRowAnimationNone];
+                            [self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionTop animated:YES];
                             return;
                         }
                         [circleArray addObject:circleDic];
@@ -346,7 +327,7 @@
     }
     [submitDic setObject:instritutionArray forKey:@"Institution"];
     [submitDic setObject:CNUserShareModelUid forKey:@"sid"];
-//    [submitDic setObject:@" 10511059" forKey:@"sid"];
+    //    [submitDic setObject:@" 10511059" forKey:@"sid"];
     NSString *submitStr = [self objectToJson:submitDic];
@@ -385,6 +366,9 @@
         _tableView.backgroundColor = CNLiveColorWithHexString(@"F7F7F7");
         [_tableView setSeparatorInset:UIEdgeInsetsMake(0, 0, 0, 0)];
         [_tableView setSeparatorColor:CNLiveColorWithHexString(@"EDEDED")];
+        [_tableView registerClass:[CNBPersonalVerificationCell class] forCellReuseIdentifier:CNBAffiliationCellIdentifier];
+        [_tableView registerClass:[CNBCircleGroupCell class] forCellReuseIdentifier:CNBCircleGroupIdentifier];
+        [_tableView registerClass:[CNBCircleAddGroupCell class] forCellReuseIdentifier:CNBCircleAddGroupIdentifier];
         _footerTBView = [[CNBPerAuthFooterTBView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, 168)];
         _footerTBView.backgroundColor = CNLiveColorWithHexString(@"F7F7F7");
         __weak typeof(self) weakSelf = self;
@@ -22,6 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy)   NSString     *homePageId;
 @property (nonatomic, strong) NSArray      <CNBPerAuthSelectTypeModel *>*groupArray; //存放groupArray
 @property (nonatomic, copy)  NSString      *type; //给后台传的圈子type
+@property (nonatomic, copy)  NSString      *isRemind; //没有填写,加粗和加颜色提醒 1提醒 0正常
 @end
 //添加机构
 @interface CNBAddSectionModel : NSObject
@@ -30,6 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSMutableArray <CNBTypeModel *>*typeArray;  //存放每种类型cell的数组
 @property (nonatomic, copy)   NSString  *institutionName; //机构名称
 @property (nonatomic, copy)   NSString  *institutionId; //机构Id
+@property (nonatomic, copy)   NSString  *isRemind ;// 没有填写,加粗和加颜色提醒 1提醒 0正常
 @end
 NS_ASSUME_NONNULL_END
@@ -189,6 +189,10 @@
 }
 #pragma mark - 重试
 - (void)retryloadData {
+    if (self.dataSource.count> 0) {
+        [self.dataSource removeAllObjects];
+    }
+    self.page = 1;
     [self requestTypeListData:self.page];
 }
 #pragma mark - 展示空视图
@@ -16,7 +16,7 @@
 #import "CNBPerAuthTypeRadioView.h"
 #import "CNBPerAuthManager.h"
 #define CNBAppKeyWindow ([UIApplication sharedApplication].delegate).window
-@interface CNBPersonalVerificationCell ()<UITextFieldDelegate>
+@interface CNBPersonalVerificationCell ()
 @property (nonatomic, strong) UIImageView *logoImageV;  //是不是必须的标识
 @property (nonatomic, strong) UILabel     *titleLabel; //标题
 @property (nonatomic, strong) CNBPerAuthShowView *institutionsView; //所属机构
@@ -69,11 +69,13 @@
         if (weakSelf.sectionModel.addSection == typeModel.addSection) {
             weakSelf.sectionModel.institutionId = selectModel.typeId;
             weakSelf.sectionModel.institutionName = selectModel.name;
+            weakSelf.sectionModel.isRemind = @"0";
             for (CNBTypeModel * circleModel in weakSelf.sectionModel.typeArray) {
                 circleModel.circleName = @"";
                 circleModel.homePageId = @"";
                 circleModel.groupName = @"";
                 circleModel.groupArray = @[]; //如果点击切换了机构,就将圈子和群组的数据都清空
+                circleModel.isRemind = @"0";
             }
             if ([CNBPerAuthManager shareManager].circleDic && [[[CNBPerAuthManager shareManager].circleDic allKeys]containsObject:[NSString stringWithFormat:@"%ld",typeModel.addSection]]) {
                 [[CNBPerAuthManager shareManager].circleDic removeObjectForKey:[NSString stringWithFormat:@"%ld",typeModel.addSection]]; //删除存储的圈子信息
@@ -94,6 +96,13 @@
 }
 - (void)setSectionModel:(CNBAddSectionModel *)sectionModel {
     _sectionModel = sectionModel;
+    if ([sectionModel.isRemind isEqualToString:@"0"]) {
+        _institutionsView.layer.borderWidth = 0.5;
+        _institutionsView.layer.borderColor = CNLiveColorWithHexString(@"C1C1C1").CGColor;
+    }else {
+        _institutionsView.layer.borderWidth = 1;
+               _institutionsView.layer.borderColor = CNLiveColorWithHexString(@"48A7F9").CGColor;
+    }
 }
 - (void)setTypeModel:(CNBTypeModel *)typeModel {
     _typeModel = typeModel;
@@ -239,6 +248,13 @@ static const NSInteger CNBGroupTag   = 202;
         self.groupView.showLabel.text = typeModel.groupName;
         self.groupView.showLabel.textColor = CNLiveColorWithHexString(@"333333");
     }
+    if ([typeModel.isRemind isEqualToString:@"0"]) {
+        _groupView.layer.borderWidth = 0.5;
+        _groupView.layer.borderColor = CNLiveColorWithHexString(@"C1C1C1").CGColor;
+    }else {
+        _groupView.layer.borderWidth = 1;
+        _groupView.layer.borderColor = CNLiveColorWithHexString(@"48A7F9").CGColor;
+    }
 }
 #pragma mark - Action
 - (void)deleteBtnAction {
@@ -261,6 +277,7 @@ static const NSInteger CNBGroupTag   = 202;
                     weakSelf.typeModel.homePageId = selectModel.typeId;
                     weakSelf.typeModel.type = selectModel.type;
                     weakSelf.typeModel.groupName = @"";
+                    weakSelf.typeModel.isRemind = @"0";
                     weakSelf.typeModel.groupArray = @[]; //切换圈子删掉群组信息
                     if (weakSelf.refreshDataBlock) {
                         weakSelf.refreshDataBlock();
@@ -289,6 +306,7 @@ static const NSInteger CNBGroupTag   = 202;
                 if (weakSelf.typeModel.addRow == typeMoedl.addRow) {
                     weakSelf.typeModel.groupName = [nameArray componentsJoinedByString:@","];
                     weakSelf.typeModel.groupArray = groupArray;
+                    weakSelf.typeModel.isRemind = @"0";
                     if (weakSelf.refreshDataBlock) {
                         weakSelf.refreshDataBlock();
                     }