提交UI更改

梁星国
1 parent 99ded1d6
Showing 11 changed files with 467 additions and 195 deletions
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Model/CNLiveOrganizationDetailModel.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Service/CNLiveBOrganizationValidattionService.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.m
Example/CNLiveOrganizationValidationModule/CNLIVEBAppDelegate.m
Example/CNLiveOrganizationValidationModule/CNLIVEBViewController.m
Example/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule-Info.plist
@@ -6,11 +6,14 @@
 //
 #import <UIKit/UIKit.h>
+#import "CNLiveOrganizationDetailModel.h"
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveBOraganizationDetailController : UIViewController
+@property (nonatomic, strong) CNLiveOrganizationDetailModel *detailModel;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -17,6 +17,9 @@
 #import <CNLiveBeeHive/CNLiveBeeHive.h>
 #import "CNLiveOrganizationDetailModel.h"
 #import <MJExtension/MJExtension.h>
+#import <QMUIKit/QMUIKit.h>
+#import <YYKit/YYKit.h>
+#import <objc/runtime.h>
 //体育中国-详情
@@ -46,7 +49,7 @@
 {
     self = [super init];
     if (self) {
-        
+        self.detailModel = [[CNLiveOrganizationDetailModel alloc]init];
     }
     return self;
 }
@@ -84,7 +87,9 @@
     [self.view addSubview:self.tableView];
     self.tableView.tableHeaderView = self.headerView;
-//    self.tableView.tableFooterView = self.footerView;
+    if (!self.detailModel.account) {
+        [self loadData];
+    }
 }
@@ -121,13 +126,13 @@
     if (indexPath.section == 0) {
         if (indexPath.row == 1 || indexPath.row == 12) {
             CNLiveBOrganizationImageVDetailCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationImageVDetailCell forIndexPath:indexPath];
-            [cell editUIWithIndexPath:indexPath];
+            [cell editUIWithIndexPath:indexPath detailModel:self.detailModel];
             return cell;
         }else {
             CNLiveBOrganizationDetailCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationDetailCell forIndexPath:indexPath];
-            [cell editUIWithIndexPath:indexPath];
+            [cell editUIWithIndexPath:indexPath detailModel:self.detailModel];
             return cell;
         }
@@ -213,10 +218,11 @@
                               @"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);
@@ -233,10 +239,13 @@
                }
            }
-           CNLiveOrganizationDetailModel *detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:data];
-          
-           [self.tableView reloadData];
-           
+           if (!error) {
+               CNLiveOrganizationDetailModel *detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:data];
+               self.detailModel = detailModel;
+               [self.tableView reloadData];
+                         
+           }
+#pragma mark - TODO: 报错信息
        }];
@@ -6,11 +6,15 @@
 //
 #import <UIKit/UIKit.h>
+#import "CNLiveOrganizationDetailModel.h"
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveBOrganizationValidattionController : UIViewController
+
+@property (nonatomic, strong) CNLiveOrganizationDetailModel *detailModel;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -24,9 +24,9 @@
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
 #import <CNLiveUserManagement/CNUserInfoManager.h>
 #import <CNLiveBeeHive/CNLiveBeeHive.h>
-#import "CNLiveOrganizationDetailModel.h"
 #import <MJExtension/MJExtension.h>
 #import <CNLiveUploadManager/CNLiveUploadManager.h>
+#import <YYKit/YYKit.h>
@@ -57,8 +57,6 @@
 @property (nonatomic, strong) UIImagePickerController *pickerVC;
-@property (nonatomic, strong) CNLiveOrganizationDetailModel *detailModel;
-
 @property (nonatomic, strong) NSMutableArray *tipArray;
 /** 1公司全称*/
@@ -95,6 +93,9 @@
 /** 标记点击第几个*/
 @property (nonatomic, assign) NSInteger selectRow;
+@property (nonatomic, strong) UITextField *selectedTF;
+@property (nonatomic, strong) UITextView *selectedTV;
+
 @end
@@ -107,7 +108,8 @@
 {
     self = [super init];
     if (self) {
-        
+        self.tipArray = [NSMutableArray array];
+        self.detailModel = [[CNLiveOrganizationDetailModel alloc]init];
     }
     return self;
 }
@@ -124,11 +126,10 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.tipArray = [NSMutableArray array];
-    self.detailModel = [[CNLiveOrganizationDetailModel alloc]init];
+    
+    
     [self editUI];
-    [self loadData];
 }
 - (void)viewDidAppear:(BOOL)animated {
@@ -180,9 +181,11 @@
 -(void)textFieldDidBeginEditing:(UITextField *)textField
 {
+    self.selectedTF = textField;
     if (!textField.superview || !textField) {
         return;
     }
+    
     CNLiveBOrganizationTextField *TF = (CNLiveBOrganizationTextField *)textField;
     if ([TF.superview isKindOfClass:[CNLiveBOrganizationTFCell class]]) {
         NSIndexPath *indexpath = [self.tableView indexPathForCell:((CNLiveBOrganizationTFCell *)textField.superview)];
@@ -251,6 +254,8 @@
 -(void)textViewDidBeginEditing:(UITextView *)textView
 {
+    
+    self.selectedTV = textView;
     if (!textView.superview || !textView) {
         return;
     }
@@ -322,6 +327,7 @@
             [selectedCell editUIWithIndexPath:indexPath tipModel:self.tipModel];
             __weak typeof(self) weakSelf = self;
             selectedCell.clickSelectedCellBlock = ^(CNLiveBOrganizationSelectedCell * _Nonnull selectedCell, CNLiveBOrganizationButton * _Nonnull selectedBtn) {
+                
                 [weakSelf popView];
             };
             return selectedCell;
@@ -419,8 +425,22 @@
 /** 点击cell实现 */
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (self.selectedTF) {
+        if ([self.selectedTF isFirstResponder]) {
+            [self.selectedTF resignFirstResponder];
+        }
+    }
+    
+    if (self.selectedTV) {
+        if ([self.selectedTV isFirstResponder]) {
+            [self.selectedTV resignFirstResponder];
+        }
+    }
+    
+    
     if (indexPath.section == 0) {
         if (indexPath.row == 1) {
+            
             [self.photoSelecctedView popViewForView:self.view];
             __weak typeof(self) weakSelf = self;
             self.photoSelecctedView.clickViewBlock = ^(CNLiveBOrganizationPhotoSelectedView * _Nonnull view, NSInteger indexCount) {
@@ -663,101 +683,124 @@
     NSLog(@"公司全称 = %@,企业logo上传路径 = %@,企业简称 = %@,企业代码 = %@,企业简介 = %@,企业地址 = %@,选择企业类型 = %@,webUrl = %@,法人 = %@,联系人* = %@,合同编号 = %@,营业执照编号 = %@,营业执照 = %@",self.companyName,self.logoUrl,self.companyShortName,self.companyId,self.companyContent,self.companyAdress,self.tipModel.name,self.webUrl,self.legalPerson,self.contact,self.contractCount,self.licenseCount,self.licenseImageUrl);
-    //    self.footerView.agreementBtn
-    
-    
     //    CNLiveBAgreementCommitFinishController *commitVC = [[CNLiveBAgreementCommitFinishController alloc]init];
     //    [self.navigationController pushViewController:commitVC animated:YES];
-//    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.logoImage) {
-//        [QMUITips showWithText:@"请选择企业logo" inView:AppKeyWindow hideAfterDelay:0.5];
-//        return;
-//    }
-//
-//    if (!self.companyShortName || self.companyShortName.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.licenseImage) {
-//        [QMUITips showWithText:@"请选择营业执照" inView:AppKeyWindow hideAfterDelay:0.5];
-//        return;
-//    }
-//
-//    NSDictionary *dic = @{
-//        @"d":@"1"
-//    };
-//
-//    NSString *url = [NSString stringWithFormat:@"%@",CNLiveBOrganizationUpImageUrl];
-//
-//    [CNLiveUploadManager uploadRequestType:CNLiveUploadTypeThird url:url dic:dic image:self.logoImage isOriginal:YES limitType:AppPhototLimitTypeFriendsCircle progress:^(float progress) {
-//
-//    } success:^(CNLiveUploadModel *uploadModel) {
-//
-//
-//        NSLog(@"成功----------");
-//        NSDictionary *dic = @{
-//            @"d":@"0"
-//        };
-//        [CNLiveUploadManager uploadRequestType:CNLiveUploadTypeThird url:url dic:dic image:self.licenseImage isOriginal:YES limitType:AppPhototLimitTypeFriendsCircle progress:^(float progress) {
-//
-//        } success:^(CNLiveUploadModel *uploadModel) {
-//
+    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.logoImage) {
+        [QMUITips showWithText:@"请选择企业logo" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    if (!self.companyShortName || self.companyShortName.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.licenseImage) {
+        [QMUITips showWithText:@"请选择营业执照" inView:AppKeyWindow hideAfterDelay:0.5];
+        return;
+    }
+    
+    [QMUITips showLoadingInView:self.view];
+    
+    NSDictionary *dic = @{
+        @"d":@"1"
+    };
+    NSString *url = [NSString stringWithFormat:@"%@",CNLiveBOrganizationUpImageUrl];
+    [CNLiveUploadManager uploadRequestType:CNLiveUploadTypeThird url:url dic:dic image:self.logoImage isOriginal:YES limitType:AppPhototLimitTypeFriendsCircle progress:^(float progress) {
+        
+    } success:^(CNLiveUploadModel *uploadModel) {
+        
+        [QMUITips hideAllTipsInView:self.view];
+        NSLog(@"成功----------");
+        NSDictionary *responseObjectDic = uploadModel.responseObject;
+        if ([responseObjectDic containsObjectForKey:@"errorCode"]) {
+            if ([[NSString stringWithFormat:@"%@",[responseObjectDic objectForKey:@"errorCode"]] isEqualToString:@"0"] && [responseObjectDic containsObjectForKey:@"data"]) {
+                NSDictionary *dataDic = [dic objectForKey:@"data"];
+                if ([dataDic containsObjectForKey:@"url"]) {
+                    self.logoUrl = [NSString stringWithFormat:@"%@",[dataDic objectForKey:@"url"] ? [dataDic objectForKey:@"url"]:@""];
+                }
+                
+                
+            }
+        }
+        
+        
+        [QMUITips showLoadingInView:self.view];
+        NSDictionary *dic = @{
+            @"d":@"0"
+        };
+        [CNLiveUploadManager uploadRequestType:CNLiveUploadTypeThird url:url dic:dic image:self.licenseImage isOriginal:YES limitType:AppPhototLimitTypeFriendsCircle progress:^(float progress) {
+            
+        } success:^(CNLiveUploadModel *uploadModel) {
+            [QMUITips hideAllTipsInView:self.view];
+            
             NSLog(@"所有成功----------");
+            NSDictionary *responseObjectNextDic = uploadModel.responseObject;
+            if ([responseObjectNextDic containsObjectForKey:@"errorCode"]) {
+                if ([[NSString stringWithFormat:@"%@",[responseObjectNextDic objectForKey:@"errorCode"]] isEqualToString:@"0"] && [responseObjectNextDic containsObjectForKey:@"data"]) {
+                    NSDictionary *dataNextDic = [responseObjectNextDic objectForKey:@"data"];
+                    if ([dataNextDic containsObjectForKey:@"url"]) {
+                        self.licenseImageUrl = [NSString stringWithFormat:@"%@",[dataNextDic objectForKey:@"url"] ? [dataNextDic objectForKey:@"url"]:@""];
+                    }
+                    
+                    
+                }
+            }
             [self uploadMessage];
-//        }failure:^(CNLiveUploadModel *uploadModel, NSError *error) {
-//
-//            NSLog(@"失败----------");
-//
-//
-//
-//        }];
-//
-//
-//    } failure:^(CNLiveUploadModel *uploadModel, NSError *error) {
-//
-//        NSLog(@"失败----------");
-//
-//
-//
-//    }];
+        }failure:^(CNLiveUploadModel *uploadModel, NSError *error) {
+            
+            NSLog(@"失败----------");
+            [QMUITips hideAllTipsInView:self.view];
+            
+            
+        }];
+        
+        
+    } failure:^(CNLiveUploadModel *uploadModel, NSError *error) {
+        
+        NSLog(@"失败----------");
+        [QMUITips hideAllTipsInView:self.view];
+        
+        
+    }];
 }
@@ -770,6 +813,17 @@
 - (void)popView {
+    if (self.selectedTF) {
+        if ([self.selectedTF isFirstResponder]) {
+            [self.selectedTF resignFirstResponder];
+        }
+    }
+    
+    if (self.selectedTV) {
+        if ([self.selectedTV isFirstResponder]) {
+            [self.selectedTV resignFirstResponder];
+        }
+    }
     if (!self.detailModel || !self.detailModel.comTypList || self.detailModel.comTypList.count == 0) {
         return;
@@ -794,76 +848,43 @@
 #pragma mark -
 #pragma mark - *** 接口 ***
-- (void)loadData {
-    
-#pragma mark - TODO: 记得加入验证
-    //URL: https://api.cnlive.com/open/api2/auser/getAccount.action?
-    NSString *strUrl = CNLiveBOrganizationValidattionStatusUrl;
-    NSDictionary *dict = @{
-        @"sid": [NSString stringWithFormat:@"%@",CNUserShareModel.uid],
-        @"sign":@""
-    };
-    
-    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-    [CNLiveNetworking setupShowDataResult:NO];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        
-        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];
-            }
-        }
-        
-        CNLiveOrganizationDetailModel *detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:data];
-        self.detailModel = detailModel;
-        [self.tableView reloadData];
-        
-        
-    }];
-    
-    
-    
-}
-
 - (void)uploadMessage{
     NSString *strUrl = CNLiveBOrganizationUpLoadUrl;
-    NSDictionary *dict = @{
-        @"sid": @"10514333",
-        @"mobile": @"13011158888",
-        @"userLogo": @"/open/image/userlogo/20200331/6911edce-b9a9-4309-ac36-2dd3015d1efa.png",
-        @"company": @"aaabbb",
-        @"logo": @"/open/image/userlogo/20190305/c4b8c7cb-1bb3-4f4f-bba6-483050af331e.png",
-        @"sname": @"aaa",
-        @"sp_code": @"aaa",
-        @"jianjie": @"测试",
-        @"address": @"北京",
-        @"com_type_id": @"2",
-        @"siteDomain": @"www.cnlive.com",
-        @"qiyefaren": @"ll",
-        @"contacts": @"ll",
-        @"idCard": @"12345678912",
-        @"idCardPic": @"/open/image/idcard/20190305/6b6893f3-3cdf-45bd-8c17-684c12128274.png"
-    };
-    NSDictionary *dicCotent = @{
-        @"account":[dict mj_JSONString]
-    };
-    
+    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":@""
+    }.mutableCopy;
+    [dict setValue:self.logoUrl forKey:@"logo"];
+    [dict setValue:self.licenseImageUrl forKey:@"idCardPic"];
+    
+    NSString *contentDic = [self objectToJson:dict];
+    contentDic = [contentDic stringByReplacingOccurrencesOfString:@"\\/" withString:@"/"];
+    NSMutableDictionary *dicCotent = [NSMutableDictionary dictionary];
+    [dicCotent setValue:contentDic forKey:@"account"];
+    
+    [QMUITips showLoadingInView:self.view];
     [CNLiveNetworking setAllowRequestDefaultArgument:NO];
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dicCotent CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        NSLog(@"点播详情数据 = %@",responseObject);
+        [QMUITips hideAllTipsInView:self.view];
+        NSLog(@"上传数据 = %@",responseObject);
         NSString *resultCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
         NSError *err = nil;
@@ -878,9 +899,6 @@
             }
         }
-        CNLiveOrganizationDetailModel *detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:data];
-        self.detailModel = detailModel;
-        [self.tableView reloadData];
     }];
@@ -891,6 +909,22 @@
 }
+- (NSString *)objectToJson:(id)obj{
+    if (obj == nil) {
+        return nil;
+    }
+    NSError *error = nil;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:obj
+                                                       options:0
+                                                         error:&error];
+    
+    if ([jsonData length] && error == nil){
+        return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    }else{
+        return nil;
+    }
+}
+
 #pragma mark -
@@ -12,7 +12,7 @@
 NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveOrganizationDetailModel : NSObject
-/** 机构认证状态*/
+/** 机构认证状态 0未认证  1已认证 2待审核*/
 @property (nonatomic, copy) NSString *isCertification;
 /** 标签数组*/
 @property (nonatomic, strong) NSMutableArray<CNLiveOrganizationTipModel *> *comTypList;
@@ -10,6 +10,8 @@
 #import "CNLiveBAgreementCommitFinishController.h"
 #import "CNLiveBAgreementContentController.h"
 #import "CNLiveBOrganizationValidattionController.h"
+#import "CNLiveBOraganizationDetailController.h"
+#import <MJExtension/MJExtension.h>
 @interface CNLiveBOrganizationValidattionService()<CNLiveBOrganizationValidationProtocol>
@@ -24,6 +26,21 @@
 - (UIViewController *)getOrganizationValidationController:(NSDictionary *)params {
     CNLiveBOrganizationValidattionController *VC = [[CNLiveBOrganizationValidattionController  alloc]init];
+    if (params) {
+        if (params.count > 0) {
+            VC.detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:params];
+        }
+    }
+    return VC;
+}
+
+- (UIViewController *)getOrganizationDetailController:(NSDictionary *)params{
+     CNLiveBOraganizationDetailController *VC = [[CNLiveBOraganizationDetailController  alloc]init];
+     if (params) {
+        if (params.count > 0) {
+            VC.detailModel = [CNLiveOrganizationDetailModel mj_objectWithKeyValues:params];
+        }
+    }
     return VC;
 }
@@ -6,6 +6,7 @@
 //
 #import <UIKit/UIKit.h>
+#import "CNLiveOrganizationDetailModel.h"
 #define kCNLiveBOrganizationDetailCell @"CNLiveBOrganizationDetailCell"
@@ -16,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSIndexPath *indexPath;
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath;
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel;
 @end
@@ -30,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSIndexPath *indexPath;
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath;
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel;
 @end
@@ -75,77 +75,149 @@
 #pragma mark - ***监听实现***
 #pragma mark - ***editUI**
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath {
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel {
     if (!indexPath) {
         return;
     }
+    BOOL isDetail = NO;
+    if (detailModel) {
+        if (detailModel.account) {
+            isDetail = YES;
+        }
+    }
+    
+//       @"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":@""
+//
+    
+    
+    
     self.indexPath = indexPath;
     if (indexPath.section == 0) {
         if (indexPath.row == 0) {
             NSString *titleStr = @"公司全称:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测"];
+            
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.company?detailModel.account.company:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 2) {
             NSString *titleStr = @"企业简称:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测发达发大水范德萨范德萨范德萨范德萨范德萨范德萨范德萨发"];
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.sname?detailModel.account.sname:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 3) {
             NSString *titleStr = @"企业代码:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测范德萨范德萨发大水发大厦范德萨发大水发大水"];
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.sp_code?detailModel.account.sp_code:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 4) {
             NSString *titleStr = @"企业简介:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测"];
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.jianjie?detailModel.account.jianjie:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 5) {
-            NSString *titleStr = @"企业类型:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测"];
+            NSString *titleStr = @"企业地址:";
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.address?detailModel.account.address:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 6) {
-            NSString *titleStr = @"网站:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测"];
+            NSString *titleStr = @"企业类型:";
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.com_type_id?detailModel.account.com_type_id:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 7) {
             NSString *titleStr = @"网站:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测"];
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.siteDomain?detailModel.account.siteDomain:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 8) {
             NSString *titleStr = @"企业法人:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测"];
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.qiyefaren?detailModel.account.qiyefaren:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 9) {
             NSString *titleStr = @"联系人:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测"];
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.contacts?detailModel.account.contacts:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 10) {
             NSString *titleStr = @"合同编号:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测"];
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.htno?detailModel.account.htno:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else if (indexPath.row == 11) {
             NSString *titleStr = @"营业执照号:";
-            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:@"测试测试测测"];
+            NSString *content = @"";
+            if (isDetail) {
+                content = [NSString stringWithFormat:@"%@",detailModel.account.idCard?detailModel.account.idCard:@""];
+            }
+            NSMutableAttributedString *str = [self returnAllContentWithTitle:titleStr content:content];
             self.contentL.attributedText = str;
         }else {
@@ -252,14 +324,10 @@
         make.width.mas_equalTo(72);
         make.height.mas_equalTo(12);
     }];
-    
-    
-    
-    [self.contentImageV setBackgroundColor:[UIColor yellowColor]];
 }
 #pragma mark - ***editUI***
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath {
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath detailModel:(CNLiveOrganizationDetailModel *)detailModel {
     if (!indexPath) {
         return;
@@ -273,19 +341,36 @@
     self.indexPath = indexPath;
+    BOOL isDetail = NO;
+    if (detailModel) {
+        if (detailModel.account) {
+            isDetail = YES;
+        }
+    }
+    
     if (indexPath.section == 0) {
         if (indexPath.row == 1) {
             NSString *titleStr = @"企业logo:";
             self.titleL.text = titleStr;
-            [self.contentImageV sd_setImageWithURL:[NSURL URLWithString:@""] placeholderImage:[UIImage imageNamedFromOrganization:@""]];
+            NSString *url = @"";
+            if (isDetail) {
+                url = [NSString stringWithFormat:@"%@",detailModel.account.userLogo?detailModel.account.userLogo:@""];
+            }
             self.contentImageV.frame = CGRectMake(95, 10, 60, 60);
+            [self.contentImageV sd_setImageWithURL:[NSURL URLWithString:url] placeholderImage:[UIImage imageNamedFromOrganization:@""]];
+            
         }else if (indexPath.row == 12) {
             NSString *titleStr = @"营业执照:";
             self.titleL.text = titleStr;
-            [self.contentImageV sd_setImageWithURL:[NSURL URLWithString:@""] placeholderImage:[UIImage imageNamedFromOrganization:@""]];
+            NSString *url = @"";
+            if (isDetail) {
+                url = [NSString stringWithFormat:@"%@",detailModel.account.idCardPic?detailModel.account.idCardPic:@""];
+            }
             self.contentImageV.frame = CGRectMake(95, 10, 101, 151);
+            [self.contentImageV sd_setImageWithURL:[NSURL URLWithString:url] placeholderImage:[UIImage imageNamedFromOrganization:@""]];
+            
         }else {
             self.titleL.text = @"";
@@ -7,12 +7,20 @@
 //
 #import "CNLIVEBAppDelegate.h"
+#import <CNLiveRequestBastKit/CNLiveNetworkRequest.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <CNLiveUserManagement/CNUserInfoManager.h>
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+
+static NSString * uuid;
 @implementation CNLIVEBAppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     // Override point for customization after application launch.
+    [self networkParamAction];
+    [self appUUIDString];
     return YES;
 }
@@ -43,4 +51,29 @@
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 }
+- (void)networkParamAction {
+    NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
+    [mDict setValue:@"10514575" forKey:@"loginSid"];
+    [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey:@"platform_id"];
+    [mDict setValue:[self appUUIDString] forKey:@"uuid"];
+    [mDict setValue:@"i" forKey:@"plat"];
+    [mDict setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] forKey:@"ver"];
+    [mDict setObject:AppId forKey:@"appId"];
+    [CNLiveNetworking setupDefaultParam:mDict];
+    [CNLiveNetworking setupShowResult:NO];
+    [CNLiveNetworking setupSignKey:APPKey];
+    NSLog(@"打印appkey%@",APPKey);
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setResponseSerializerType:CNLiveResponseSerializerJSON];
+   
+}
+- (NSString *)appUUIDString
+    {
+        static dispatch_once_t onceToken;
+        dispatch_once(&onceToken, ^{
+            uuid = [[[[UIDevice currentDevice] identifierForVendor] UUIDString] stringByReplacingOccurrencesOfString:@"-" withString:@""];
+        });
+        return uuid;
+    }
+
 @end
@@ -10,6 +10,17 @@
 #import "UIColor+MLPFlatColors.h"
 #import "CNLiveBOrganizationValidattionController.h"
 #import "CNLiveBOraganizationDetailController.h"
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNLiveRequestBastKit/CNLiveNetworkRequest.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <CNLiveUserManagement/CNUserInfoManager.h>
+#import <CNLiveBeeHive/CNLiveBeeHive.h>
+#import "CNLiveBOrganizationValidationProtocol.h"
+#import <YYKit/YYKit.h>
+
+
+
+#define CNLiveBOrganizationValidattionStatusUrl                cn_API_OpenApi2(@"/auser/getAccount.action")
 @interface CNLIVEBViewController ()
@@ -45,8 +56,76 @@
 }
 - (void)button1Action:(UIButton *)button {
-    CNLiveBOraganizationDetailController *vc = [[CNLiveBOraganizationDetailController alloc]init];
-    [self.navigationController  pushViewController:vc animated:YES];
+     //URL: https://api.cnlive.com/open/api2/auser/getAccount.action?
+        NSString *strUrl = CNLiveBOrganizationValidattionStatusUrl;
+        NSDictionary *dict = @{
+            @"sid": [NSString stringWithFormat:@"%@",@"10514575"],
+            @"sign":@""
+        };
+        
+        [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+        [CNLiveNetworking setupShowDataResult:NO];
+        [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+            
+            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) {
+                BOOL isEnter = NO;
+                NSDictionary *dicContent = (NSDictionary *)data;
+                if (dicContent) {
+                    if ([dicContent containsObjectForKey:@"isCertification"]) {
+                        NSString *isCertificationStr = [NSString stringWithFormat:@"%@",[dicContent objectForKey:@"isCertification"]];
+                        if ([isCertificationStr isEqualToString:@"0"]) {
+                            ///  填表页
+                            id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
+                            UIViewController *vc = [organizationValidationProtocol getOrganizationValidationController:dicContent];
+                            [self.navigationController pushViewController:vc animated:YES];
+                            
+                            isEnter = YES;
+                        }else if ([isCertificationStr isEqualToString:@"1"]) {
+                            /// 详情页
+                            id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
+                            UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
+                            [self.navigationController pushViewController:vc animated:YES];
+                            
+                            isEnter = YES;
+                        }else if ([isCertificationStr isEqualToString:@"2"]) {
+                            
+                           /// 详情页
+                                                     id<CNLiveBOrganizationValidationProtocol> organizationValidationProtocol = [[BeeHive shareInstance] createService:@protocol(CNLiveBOrganizationValidationProtocol)];
+                                                     UIViewController *vc = [organizationValidationProtocol getOrganizationDetailController:dicContent];
+                                                     [self.navigationController pushViewController:vc animated:YES];
+                                                     
+                                                     isEnter = YES;
+                            
+                            isEnter = YES;
+                        }
+                    }
+                }
+                
+                if (!isEnter) {
+    #pragma mark - TODO:弹框
+                    ///弹框
+                }
+                
+            }else {
+                
+            }
+      
+        }];
 }
@@ -2,6 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>LSApplicationCategoryType</key>
+	<string></string>
 	<key>NSContactsUsageDescription</key>
 	<string>请求访问通讯录</string>
 	<key>NSCameraUsageDescription</key>