提交调整UI和参数

梁星国
1 parent f219a73d
Showing 3 changed files with 313 additions and 69 deletions
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.m
@@ -128,23 +128,23 @@
             CNLiveBOrganizationImageVDetailCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationImageVDetailCell forIndexPath:indexPath];
             [cell editUIWithIndexPath:indexPath detailModel:self.detailModel];
             return cell;
-                     
+            
         }else {
             CNLiveBOrganizationDetailCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationDetailCell forIndexPath:indexPath];
             [cell editUIWithIndexPath:indexPath detailModel:self.detailModel];
             return cell;
         }
-       
-          
+        
+        
     }else {
         UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath];
         [cell setBackgroundColor:[UIColor yellowColor]];
         return cell;
-          
+        
     }
-      
+    
 }
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
@@ -156,7 +156,7 @@
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
     if (section == 0) {
-       return [UIView new];
+        return [UIView new];
     }else {
         return [UIView new];
@@ -172,9 +172,172 @@
         }else if (indexPath.row == 12){
             return 200;
         }else {
+            
+            BOOL isDetail = NO;
+            if (self.detailModel) {
+                if (self.detailModel.account) {
+                    isDetail = YES;
+                }
+            }
+            
+            if (indexPath.row == 0) {
+                
+                NSString *titleStr = @"公司全称:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.company?self.detailModel.account.company:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+                
+            }else if (indexPath.row == 2) {
+                
+                NSString *titleStr = @"企业简称:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.sname?self.detailModel.account.sname:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+            }else if (indexPath.row == 3) {
+                
+                NSString *titleStr = @"企业代码:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.sp_code?self.detailModel.account.sp_code:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+            }else if (indexPath.row == 4) {
+                
+                NSString *titleStr = @"企业简介:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.jianjie?self.detailModel.account.jianjie:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+            }else if (indexPath.row == 5) {
+                
+                NSString *titleStr = @"企业地址:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.address?self.detailModel.account.address:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+            }else if (indexPath.row == 6) {
+                
+                NSString *titleStr = @"企业类型:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.com_type_id?self.detailModel.account.com_type_id:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+            }else if (indexPath.row == 7) {
+                
+                NSString *titleStr = @"网站:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.siteDomain?self.detailModel.account.siteDomain:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+            }else if (indexPath.row == 8) {
+                NSString *titleStr = @"企业法人:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.qiyefaren?self.detailModel.account.qiyefaren:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+            }else if (indexPath.row == 9) {
+                NSString *titleStr = @"联系人:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.contacts?self.detailModel.account.contacts:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+            }else if (indexPath.row == 10) {
+                NSString *titleStr = @"合同编号:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.htno?self.detailModel.account.htno:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+            }else if (indexPath.row == 11) {
+                NSString *titleStr = @"营业执照号:";
+                NSString *content = @"";
+                if (isDetail) {
+                    content = [NSString stringWithFormat:@"%@",self.detailModel.account.idCard?self.detailModel.account.idCard:@""];
+                }
+                NSString *contentStr = [NSString stringWithFormat:@"%@ %@",titleStr,content];
+                CGFloat descHeight = [contentStr boundingRectWithSize:CGSizeMake(KScreenWidth-2*10, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12]} context:nil].size.height + 20;
+                if (descHeight < 32) {
+                    descHeight = 32;
+                }
+                return descHeight;
+                
+            }else {
+                
+            }
+            
+            
             return 32;
         }
-       
+        
     }else {
         return 0.01;
     }
@@ -213,41 +376,41 @@
 #pragma mark - TODO: 记得加入验证
     //URL: https://api.cnlive.com/open/api2/auser/getAccount.action?
-       NSString *strUrl = CNLiveBOrganizationValidattionStatusUrl;
-       NSDictionary *dict = @{
-                              @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid],
-                              @"sign":@""
-                              };
-       [QMUITips showLoadingInView:self.view];
-       [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-       [CNLiveNetworking setupShowDataResult:NO];
-       [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-           [QMUITips hideAllTipsInView:self.view];
-           
-           NSLog(@"点播详情数据 = %@",responseObject);
-           
-           NSString *resultCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
-           NSError *err = nil;
-           id data = nil;
-           if([resultCode isEqualToString:@"0"]) {
-               data = responseObject[@"data"];
-           } else {
-               @try {
-                   err = [[NSError alloc] initWithDomain:responseObject[@"errorMessage"] code:[resultCode integerValue] userInfo:nil];
-               } @catch (NSException *exception) {
-                   err = [[NSError alloc] initWithDomain:@"接口异常" code:500 userInfo:nil];
-               }
-           }
-           
-           if (!error) {
-               CNLiveOrganizationDetailModel *detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:data];
-               self.detailModel = detailModel;
-               [self.tableView reloadData];
-                         
-           }
+    NSString *strUrl = CNLiveBOrganizationValidattionStatusUrl;
+    NSDictionary *dict = @{
+        @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid],
+        @"sign":@""
+    };
+    [QMUITips showLoadingInView:self.view];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        [QMUITips hideAllTipsInView:self.view];
+        
+        NSLog(@"点播详情数据 = %@",responseObject);
+        
+        NSString *resultCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
+        NSError *err = nil;
+        id data = nil;
+        if([resultCode isEqualToString:@"0"]) {
+            data = responseObject[@"data"];
+        } else {
+            @try {
+                err = [[NSError alloc] initWithDomain:responseObject[@"errorMessage"] code:[resultCode integerValue] userInfo:nil];
+            } @catch (NSException *exception) {
+                err = [[NSError alloc] initWithDomain:@"接口异常" code:500 userInfo:nil];
+            }
+        }
+        
+        if (!error) {
+            CNLiveOrganizationDetailModel *detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:data];
+            self.detailModel = detailModel;
+            [self.tableView reloadData];
+            
+        }
 #pragma mark - TODO: 报错信息
-           
-       }];
+        
+    }];
@@ -707,6 +707,16 @@
         return;
     }
+    if (!self.companyId || self.companyId.length == 0) {
+        [QMUITips showWithText:@"请输入企业代码" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.companyContent || self.companyContent.length == 0) {
+        [QMUITips showWithText:@"请输入企业简介" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
     if (!self.tipModel) {
         [QMUITips showWithText:@"请选择企业类型" inView:AppKeyWindow hideAfterDelay:0.5];
         return;
@@ -852,28 +862,106 @@
     NSString *strUrl = CNLiveBOrganizationUpLoadUrl;
+    
+    
+    if (!self.footerView.agreementBtn.isSelected) {
+        [QMUITips showWithText:@"请同意安全协议" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.companyName || self.companyName.length == 0) {
+        [QMUITips showWithText:@"请输入公司全称" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.logoUrl || self.logoUrl.length == 0) {
+        [QMUITips showWithText:@"提交失败,请重试" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.companyShortName || self.companyShortName.length == 0) {
+        [QMUITips showWithText:@"请输入企业简称" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.companyId || self.companyId.length == 0) {
+        [QMUITips showWithText:@"请输入企业代码" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.companyContent || self.companyContent.length == 0) {
+        [QMUITips showWithText:@"请输入企业简介" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+
+    if (!self.tipModel) {
+        [QMUITips showWithText:@"请选择企业类型" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.webUrl || self.webUrl.length == 0) {
+        [QMUITips showWithText:@"请输入企业网站访问链接" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.legalPerson || self.legalPerson.length == 0) {
+        [QMUITips showWithText:@"请输入企业法人姓名" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.contact || self.contact.length == 0) {
+        [QMUITips showWithText:@"请输入企业联系人姓名" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.licenseCount || self.licenseCount.length == 0) {
+        [QMUITips showWithText:@"请输入营业执照号" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.licenseImageUrl || self.companyShortName.length == 0) {
+        [QMUITips showWithText:@"提交失败,请重试" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    NSString *sid = [NSString stringWithFormat:@"%@",@"10514570"];
+    NSString *mobile = [NSString stringWithFormat:@"%@",@"15027621766"];
+    NSString *userLogo = [NSString stringWithFormat:@"%@",@"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg"];
+    NSString *company = [NSString stringWithFormat:@"%@",self.companyName ? self.companyName : @""];
+    NSString *logo = [NSString stringWithFormat:@"%@",self.logoUrl ? self.logoUrl : @""];
+    NSString *sname = [NSString stringWithFormat:@"%@",self.companyShortName ? self.companyShortName : @""];
+    NSString *sp_code = [NSString stringWithFormat:@"%@",self.companyId ? self.companyId : @""];
+    NSString *jianjie = [NSString stringWithFormat:@"%@",self.companyContent ? self.companyContent : @""];
+    NSString *address = [NSString stringWithFormat:@"%@",self.companyAdress ? self.companyAdress : @""];
+    NSString *com_type_id = [NSString stringWithFormat:@"%@",self.tipModel.ID ? self.tipModel.ID : @""];
+    NSString *siteDomain = [NSString stringWithFormat:@"%@",self.webUrl ? self.webUrl : @""];
+    NSString *qiyefaren = [NSString stringWithFormat:@"%@",self.legalPerson ? self.legalPerson : @""];
+    NSString *contacts = [NSString stringWithFormat:@"%@",self.contact ? self.contact : @""];
+    NSString *htno = [NSString stringWithFormat:@"%@",self.contractCount ? self.contractCount : @""];
+    NSString *idCard = [NSString stringWithFormat:@"%@",self.licenseCount ? self.licenseCount : @""];
+    NSString *idCardPic = [NSString stringWithFormat:@"%@",self.licenseImageUrl ? self.licenseImageUrl : @""];
+ 
     NSMutableDictionary *dict = @{
-        @"sid": @"10514575",
-        @"mobile": @"15027621766",
-        @"userLogo": @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg",
-        @"company": @"123",//企业全称
-//        @"logo": self.logoUrl,//logo
-        @"sname": @"123",//企业简称
-        @"sp_code": @"123",//企业代码
-        @"jianjie": @"123",//企业简介
-        @"address": @"123",//地址
-        @"com_type_id": @"2",//企业类型
-        @"siteDomain": @"www.cnlive.com",//网站
-        @"qiyefaren": @"l23",//企业法人
-        @"contacts": @"l23",//联系人
-        @"idCard": @"12345678912",//营业执照号
-//        @"idCardPic": self.licenseImageUrl,//营业执照
-        @"htno":@""
+        @"sid": sid,
+        @"mobile": mobile,
+        @"userLogo": userLogo,
+        @"company": company,//企业全称
+        @"logo": logo,//logo
+        @"sname": sname,//企业简称
+        @"sp_code": sp_code,//企业代码
+        @"jianjie": jianjie,//企业简介
+        @"address": address,//地址
+        @"com_type_id": com_type_id,//企业类型
+        @"siteDomain": siteDomain,//网站
+        @"qiyefaren": qiyefaren,//企业法人
+        @"contacts": contacts,//联系人
+        @"htno":htno,//合同编号,
+        @"idCard": idCard,//营业执照号
+        @"idCardPic": idCardPic//营业执照
+       
     }.mutableCopy;
-    [dict setValue:self.logoUrl forKey:@"logo"];
-    [dict setValue:self.licenseImageUrl forKey:@"idCardPic"];
-    NSString *contentDic = [self objectToJson:dict];
+    NSString *contentDic = [NSString stringWithFormat:@"%@",[self objectToJson:dict]];
     contentDic = [contentDic stringByReplacingOccurrencesOfString:@"\\/" withString:@"/"];
     NSMutableDictionary *dicCotent = [NSMutableDictionary dictionary];
     [dicCotent setValue:contentDic forKey:@"account"];
@@ -899,8 +987,6 @@
             }
         }
-        
-        
     }];
@@ -257,6 +257,7 @@
         _contentL.textAlignment = NSTextAlignmentLeft;
         _contentL.textColor = RGBOF(0xB9B9B9);
         _contentL.numberOfLines = 0;
+        [_contentL sizeToFit];
     }
     return _contentL;
 }
@@ -311,19 +312,13 @@
     [self setBackgroundColor:[UIColor whiteColor]];
     [self addSubview:self.titleL];
     [self addSubview:self.contentImageV];
+    self.titleL.frame = CGRectMake(10, 10, 72, 12);
     self.contentImageV.frame = CGRectMake(95, 10, 60, 60);
 }
 #pragma mark - ***layoutUI***
 - (void)layoutUI {
-    __weak typeof(self) weakSelf = self;
-    [self.titleL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.mas_left).offset(10);
-        make.top.equalTo(weakSelf.mas_top).offset(10);
-        make.width.mas_equalTo(72);
-        make.height.mas_equalTo(12);
-    }];
 }
 #pragma mark - ***editUI***