提交

梁星国
1 parent 5bdd3e11
Showing 14 changed files with 734 additions and 65 deletions
CNLiveOrganizationValidationModule.podspec
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOraganizationDetailController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Model/CNLiveOrganizationDetailModel.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Model/CNLiveOrganizationDetailModel.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopCell.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopCell.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopSelectedView.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopSelectedView.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationTextView.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Service/CNLiveBOrganizationValidattionService.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationContentCell.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationContentCell.m
Example/CNLiveOrganizationValidationModule.xcodeproj/project.pbxproj
@@ -55,7 +55,7 @@ Pod::Spec.new do |s|
   #分享工具库
   s.dependency 'CNLiveShareToolKit'
   #基础请求组件库
-  s.dependency 'CNLiveRequestBastKit'
+  s.dependency 'CNLiveRequestBastKit','0.2.4.2'
   #基础UI组件库
   s.dependency 'CNLiveCustomUI'
   #基础组件库
@@ -88,6 +88,7 @@ Pod::Spec.new do |s|
   ###    所有github三方管理库(非频繁更新)
   ########################################
   s.dependency  'CNLiveTripartiteManagement'
+  s.dependency 'CNLiveTripartiteManagement/AFNetworking','0.1.6'
@@ -10,6 +10,17 @@
 #import "CNLiveBOraganizationDetailController.h"
 #import "CNLiveBOrganizationDetailHeaderView.h"
 #import "CNLiveBOrganizationDetailCell.h"
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNLiveRequestBastKit/CNLiveNetworkRequest.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <CNLiveUserManagement/CNUserInfoManager.h>
+#import <CNLiveBeeHive/CNLiveBeeHive.h>
+#import "CNLiveOrganizationDetailModel.h"
+#import <MJExtension/MJExtension.h>
+
+
+//体育中国-详情
+#define CNLiveBOrganizationValidattionStatusUrl                cn_API_OpenApi2(@"/auser/getAccount.action")
 @interface CNLiveBOraganizationDetailController ()
 <UITableViewDataSource,UITableViewDelegate>
@@ -193,6 +204,46 @@
 #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.tableView reloadData];
+           
+           
+       }];
+    
+    
+    
+}
+
 #pragma mark -
 #pragma mark - *** 私有属性 ***
@@ -19,6 +19,23 @@
 #import <QMUIKit/QMUIKit.h>
 #import <YYKit/YYKit.h>
 #import <objc/runtime.h>
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNLiveRequestBastKit/CNLiveNetworkRequest.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <CNLiveUserManagement/CNUserInfoManager.h>
+#import <CNLiveBeeHive/CNLiveBeeHive.h>
+#import "CNLiveOrganizationDetailModel.h"
+#import <MJExtension/MJExtension.h>
+#import <CNLiveUploadManager/CNLiveUploadManager.h>
+
+
+
+#define CNLiveBOrganizationValidattionStatusUrl                cn_API_OpenApi2(@"/auser/getAccount.action")
+#define CNLiveBOrganizationUpImageUrl                cn_API_OpenApi2(@"/auser/uploadFile.action")
+#define CNLiveBOrganizationUpLoadUrl                cn_API_OpenApi2(@"/auser/updateAccount.action")
+
+
+
 @interface CNLiveBOrganizationValidattionController ()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,UITextViewDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate, RSKImageCropViewControllerDelegate,RSKImageCropViewControllerDataSource>{
     CGPoint   contentoffset;
@@ -40,6 +57,44 @@
 @property (nonatomic, strong) UIImagePickerController *pickerVC;
+@property (nonatomic, strong) CNLiveOrganizationDetailModel *detailModel;
+
+@property (nonatomic, strong) NSMutableArray *tipArray;
+
+/** 1公司全称*/
+@property (nonatomic, copy) NSString *companyName;
+/** 2企业logo*/
+@property (nonatomic, copy) UIImage *logoImage;
+/** 2企业logo上传路径*/
+@property (nonatomic, copy) NSString *logoUrl;
+/** 3企业简称*/
+@property (nonatomic, copy) NSString *companyShortName;
+/** 4企业代码*/
+@property (nonatomic, copy) NSString *companyId;
+/** 5企业简介*/
+@property (nonatomic, copy) NSString *companyContent;
+/** 6企业地址*/
+@property (nonatomic, copy) NSString *companyAdress;
+/** 7选择企业类型*/
+@property (nonatomic, strong) CNLiveOrganizationTipModel *tipModel;
+/** 8webUrl*/
+@property (nonatomic, copy) NSString *webUrl;
+/** 9法人*/
+@property (nonatomic, copy) NSString *legalPerson;
+/** 10联系人*/
+@property (nonatomic, copy) NSString *contact;
+/** 11合同编号*/
+@property (nonatomic, copy) NSString *contractCount;
+/** 12营业执照编号*/
+@property (nonatomic, copy) NSString *licenseCount;
+/** 13营业执照*/
+@property (nonatomic, copy) UIImage *licenseImage;
+/** 13营业执照*/
+@property (nonatomic, copy) NSString *licenseImageUrl;
+
+/** 标记点击第几个*/
+@property (nonatomic, assign) NSInteger selectRow;
+
 @end
@@ -69,7 +124,11 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.tipArray = [NSMutableArray array];
+    self.detailModel = [[CNLiveOrganizationDetailModel alloc]init];
+    
     [self editUI];
+    [self loadData];
 }
 - (void)viewDidAppear:(BOOL)animated {
@@ -142,6 +201,52 @@
 }
+- (void)textFieldDidEndEditing:(UITextField *)textField {
+    
+    if (!textField) {
+        return;
+    }
+    CNLiveBOrganizationTextField *TF = (CNLiveBOrganizationTextField *)textField;
+    
+    if (TF.tfIndexPath) {
+        
+        NSString *content = [NSString stringWithFormat:@"%@",TF.text ? TF.text : @""];
+        if (TF.tfIndexPath.row == 0) {
+            
+            self.companyName = [NSString stringWithFormat:@"%@",content];
+        }else if (TF.tfIndexPath.row == 2) {
+            
+            self.companyShortName = [NSString stringWithFormat:@"%@",content];
+        }else if (TF.tfIndexPath.row == 3) {
+            
+            self.companyId = [NSString stringWithFormat:@"%@",content];
+        }else if (TF.tfIndexPath.row == 5) {
+            
+            self.companyAdress = [NSString stringWithFormat:@"%@",content];
+        }else if (TF.tfIndexPath.row == 7) {
+            
+            self.webUrl = [NSString stringWithFormat:@"%@",content];
+        }else if (TF.tfIndexPath.row == 8) {
+            
+            self.legalPerson = [NSString stringWithFormat:@"%@",content];
+        }else if (TF.tfIndexPath.row == 9) {
+            
+            self.contact = [NSString stringWithFormat:@"%@",content];
+        }else if (TF.tfIndexPath.row == 10) {
+            
+            self.contractCount = [NSString stringWithFormat:@"%@",content];
+        }else if (TF.tfIndexPath.row == 11) {
+            
+            self.licenseCount = [NSString stringWithFormat:@"%@",content];
+        }
+        
+        
+    }
+    
+    
+}
+
+
 #pragma mark  textView delegate
 -(void)textViewDidBeginEditing:(UITextView *)textView
@@ -167,6 +272,20 @@
 }
+- (void)textViewDidEndEditing:(UITextView *)textView {
+    if (!textView) {
+        return;
+    }
+    CNLiveBOrganizationTextView *TV = (CNLiveBOrganizationTextView *)textView;
+    if (TV.tvIndexPath) {
+        if (TV.tvIndexPath.row == 4) {
+            self.companyContent = [NSString stringWithFormat:@"%@",TV.text ? TV.text : @""];
+        }
+    }
+    
+    
+}
+
@@ -200,7 +319,7 @@
         }else if (indexPath.row == 6) {
             CNLiveBOrganizationSelectedCell *selectedCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationSelectedCell forIndexPath:indexPath];
-            [selectedCell editUIWithIndexPath:indexPath];
+            [selectedCell editUIWithIndexPath:indexPath tipModel:self.tipModel];
             __weak typeof(self) weakSelf = self;
             selectedCell.clickSelectedCellBlock = ^(CNLiveBOrganizationSelectedCell * _Nonnull selectedCell, CNLiveBOrganizationButton * _Nonnull selectedBtn) {
                 [weakSelf popView];
@@ -209,7 +328,13 @@
         }else if (indexPath.row == 1 || indexPath.row == 12) {
             CNLiveBOrganizationImageVSelectedCell *imageVCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationImageVSelectedCell forIndexPath:indexPath];
-            [imageVCell editUIWithIndexPath:indexPath];
+            if (indexPath.row == 1) {
+                [imageVCell editUIWithIndexPath:indexPath image:self.logoImage];
+            }else if (indexPath.row == 12){
+                [imageVCell editUIWithIndexPath:indexPath image:self.licenseImage];
+            }
+            
+            
             return imageVCell;
         }else {
             CNLiveBOrganizationTFCell *tfCell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationTFCell forIndexPath:indexPath];
@@ -299,7 +424,7 @@
             [self.photoSelecctedView popViewForView:self.view];
             __weak typeof(self) weakSelf = self;
             self.photoSelecctedView.clickViewBlock = ^(CNLiveBOrganizationPhotoSelectedView * _Nonnull view, NSInteger indexCount) {
-                
+                weakSelf.selectRow = 1;
                 [weakSelf checkPermissionsWithCount:indexCount type:0];
             };
@@ -310,6 +435,7 @@
             [self.photoSelecctedView popViewForView:self.view];
             __weak typeof(self) weakSelf = self;
             self.photoSelecctedView.clickViewBlock = ^(CNLiveBOrganizationPhotoSelectedView * _Nonnull view, NSInteger indexCount) {
+                weakSelf.selectRow = 12;
                 [weakSelf checkPermissionsWithCount:indexCount type:1];
             };
@@ -324,6 +450,11 @@
 #pragma mark - RSKImageCropViewControllerDelegate
 - (void)imageCropViewController:(RSKImageCropViewController *)controller didCropImage:(UIImage *)croppedImage usingCropRect:(CGRect)cropRect rotationAngle:(CGFloat)rotationAngle {
     NSLog(@"%@",croppedImage);
+    if (croppedImage) {
+        self.logoImage = croppedImage;
+        [self.tableView reloadData];
+    }
+    
 #pragma mark - TODO: 获取图片
     if (self.navigationController) {
@@ -336,7 +467,7 @@
     if (self.navigationController) {
         [self.navigationController popViewControllerAnimated:YES];
     }
-   
+    
 }
 #pragma mark - RSKImageCropViewControllerDataSource
@@ -358,7 +489,7 @@
 #pragma mark -  UIImagePickerControllerDelegate
 - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
-
+    
     NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
     //当选择的类型是图片
@@ -374,7 +505,16 @@
         }
         //获取图片
         UIImage *image = [info objectForKey:key];
-#pragma mark - TODO:获取图片
+        if (image) {
+            if (self.selectRow == 1) {
+                self.logoImage = image;
+            }else if (self.selectRow == 12) {
+                self.licenseImage = image;
+            }
+            [self.tableView reloadData];
+        }
+        
+        
         //关闭相册界面
         [picker dismissViewControllerAnimated:YES completion:^{
@@ -460,13 +600,16 @@
             [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
                 UIImage *image = photos.firstObject;
-                //                        weakSelf.prepareImage = image;
-                RSKImageCropViewController *imageCropVC = [[RSKImageCropViewController alloc] initWithImage:image cropMode:RSKImageCropModeCustom];//传入图片与裁剪框的类型 RSKImageCropModeCustom RSKImageCropModeSquare
-                imageCropVC.delegate = self;
-                imageCropVC.dataSource = self;
-                imageCropVC.maskLayerStrokeColor = kWhiteColor;
-                imageCropVC.avoidEmptySpaceAroundImage = YES;
-                [self.navigationController pushViewController:imageCropVC animated:YES];
+                if (image) {
+                    RSKImageCropViewController *imageCropVC = [[RSKImageCropViewController alloc] initWithImage:image cropMode:RSKImageCropModeCustom];//传入图片与裁剪框的类型 RSKImageCropModeCustom RSKImageCropModeSquare
+                    imageCropVC.delegate = self;
+                    imageCropVC.dataSource = self;
+                    imageCropVC.maskLayerStrokeColor = kWhiteColor;
+                    imageCropVC.avoidEmptySpaceAroundImage = YES;
+                    [self.navigationController pushViewController:imageCropVC animated:YES];
+                }
+                
+                
             }];
             [self presentViewController:imagePickerVc animated:YES completion:nil];
             return;
@@ -474,31 +617,35 @@
         }
     }else {
         if (indexCount == 0) {
-                  if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
-                      self.pickerVC.sourceType = UIImagePickerControllerSourceTypeCamera;
-                      //设置拍照后的图片可被编辑
-                      self.pickerVC.modalPresentationStyle = UIModalPresentationFullScreen;
-                      self.pickerVC.allowsEditing = NO;
-                      [self presentViewController:self.pickerVC animated:YES completion:nil];
-                      
-                  }
-                  
-              } else if (indexCount == 1) {
-                  TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
-                  imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
-                  imagePickerVc.allowTakePicture = NO; // 在内部显示拍照按钮
-                  imagePickerVc.allowPreview = NO;
-                  imagePickerVc.allowPickingOriginalPhoto = NO;
-                  imagePickerVc.allowPickingVideo = NO;
-                  
-                  [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
-                      UIImage *image = photos.firstObject;
-                      
-                  }];
-                  [self presentViewController:imagePickerVc animated:YES completion:nil];
-                  return;
-                  
-              }
+            if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
+                self.pickerVC.sourceType = UIImagePickerControllerSourceTypeCamera;
+                //设置拍照后的图片可被编辑
+                self.pickerVC.modalPresentationStyle = UIModalPresentationFullScreen;
+                self.pickerVC.allowsEditing = NO;
+                [self presentViewController:self.pickerVC animated:YES completion:nil];
+                
+            }
+            
+        } else if (indexCount == 1) {
+            TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
+            imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
+            imagePickerVc.allowTakePicture = NO; // 在内部显示拍照按钮
+            imagePickerVc.allowPreview = NO;
+            imagePickerVc.allowPickingOriginalPhoto = NO;
+            imagePickerVc.allowPickingVideo = NO;
+            __weak typeof(self) weakSelf = self;
+            [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+                UIImage *image = photos.firstObject;
+                if (image) {
+                    weakSelf.licenseImage = image;
+                    [weakSelf.tableView reloadData];
+                }
+                
+            }];
+            [self presentViewController:imagePickerVc animated:YES completion:nil];
+            return;
+            
+        }
     }
@@ -513,10 +660,109 @@
 #pragma mark - *** 事件实现 ***
 - (void)jumpCommitVC {
-    CNLiveBAgreementCommitFinishController *commitVC = [[CNLiveBAgreementCommitFinishController alloc]init];
-    [self.navigationController pushViewController:commitVC animated:YES];
+    
+    
+    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) {
+//
+            NSLog(@"所有成功----------");
+            [self uploadMessage];
+            
+//        }failure:^(CNLiveUploadModel *uploadModel, NSError *error) {
+//
+//            NSLog(@"失败----------");
+//
+//
+//
+//        }];
+//
+//
+//    } failure:^(CNLiveUploadModel *uploadModel, NSError *error) {
+//
+//        NSLog(@"失败----------");
+//
+//
+//
+//    }];
+    
 }
+
+
 - (void)jumpContentVC {
     CNLiveBAgreementContentController *contentVC = [[CNLiveBAgreementContentController alloc] init];
     [self.navigationController pushViewController:contentVC animated:YES];
@@ -525,10 +771,19 @@
 - (void)popView {
+    if (!self.detailModel || !self.detailModel.comTypList || self.detailModel.comTypList.count == 0) {
+        return;
+    }
+    
     [self.popSelectedView popViewForView:self.view];
-    self.popSelectedView.clickCellBlock = ^(CNLiveBOrganizationPopSelectedView * _Nonnull view, NSString * _Nonnull text) {
-        NSLog(@"选择结束返回");
-        
+    self.popSelectedView.dataSourceArr = self.detailModel.comTypList;
+    self.popSelectedView.tipSelectModel = self.tipModel;
+    __weak typeof(self) weakSelf = self;
+    self.popSelectedView.clickCellBlock = ^(CNLiveBOrganizationPopSelectedView * _Nonnull view, CNLiveOrganizationTipModel * _Nonnull tipSelectModel) {
+        weakSelf.tipModel = tipSelectModel;
+        if (weakSelf.tipModel) {
+            [weakSelf.tableView reloadData];
+        }
     };
@@ -539,6 +794,104 @@
 #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]
+    };
+    
+    [CNLiveNetworking setAllowRequestDefaultArgument:NO];
+    [CNLiveNetworking setupShowDataResult:NO];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dicCotent 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];
+        
+        
+    }];
+    
+    
+    
+    
+    
+}
+
+
 #pragma mark -
 #pragma mark - *** 私有属性 ***
+//
+//  CNLiveOrganizationDetailModel.h
+//  CNLiveOrganizationValidationModule
+//
+//  Created by 梁星国 on 2020/4/15.
+//
+
+#import <Foundation/Foundation.h>
+@class CNLiveOrganizationTipModel;
+@class CNLiveOrganizationDetailContentModel;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveOrganizationDetailModel : NSObject
+/** 机构认证状态*/
+@property (nonatomic, copy) NSString *isCertification;
+/** 标签数组*/
+@property (nonatomic, strong) NSMutableArray<CNLiveOrganizationTipModel *> *comTypList;
+/** 认证成功用户信息*/
+@property (nonatomic, strong) CNLiveOrganizationDetailContentModel *account;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+NS_ASSUME_NONNULL_BEGIN
+
+
+@interface CNLiveOrganizationTipModel : NSObject
+/** ID*/
+@property (nonatomic, copy) NSString *ID;
+/** 标签名字*/
+@property (nonatomic, copy) NSString *name;
+/** 选中*/
+@property (nonatomic, copy) NSString *ordernum;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+
+@interface CNLiveOrganizationDetailContentModel : NSObject
+/** 地址*/
+@property (nonatomic, copy) NSString *address;
+/** */
+@property (nonatomic, copy) NSString *app_count;
+/** 选中*/
+@property (nonatomic, copy) NSString *autoid;
+/** 选中*/
+@property (nonatomic, copy) NSString *ordernum;
+/** 选中*/
+@property (nonatomic, copy) NSString *com_type_id;
+/** 选中*/
+@property (nonatomic, copy) NSString *company;
+/** 选中*/
+@property (nonatomic, copy) NSString *contacts;
+/** 选中*/
+@property (nonatomic, copy) NSString *created;
+/** 选中*/
+@property (nonatomic, copy) NSString *dev_id;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *email;
+/** 选中*/
+@property (nonatomic, copy) NSString *htno;
+/** 选中*/
+@property (nonatomic, copy) NSString *idCard;
+/** 选中*/
+@property (nonatomic, copy) NSString *idCardPic;
+/** 选中*/
+@property (nonatomic, copy) NSString *institution_id;
+/** 选中*/
+@property (nonatomic, copy) NSString *isCertification;
+/** 选中*/
+@property (nonatomic, copy) NSString *jianjie;
+/** 选中*/
+@property (nonatomic, copy) NSString *logo;
+/** 选中*/
+@property (nonatomic, copy) NSString *mobile;
+/** 选中*/
+@property (nonatomic, copy) NSString *perm;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *qiyefaren;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *role;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *sequence;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *shzluTime;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *sid;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *siteDomain;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *sname;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *sp_code;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *sp_id;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *status;
+/** 选中*/
+@property (nonatomic, copy) NSString *temp_code;
+/** 选中*/
+@property (nonatomic, copy) NSString *tjsh_time;
+/** 选中*/
+@property (nonatomic, copy) NSString *tm;
+/** 选中*/
+@property (nonatomic, copy) NSString *userLogo;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *userType;
+
+/** 选中*/
+@property (nonatomic, copy) NSString *username;
+
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveOrganizationDetailModel.m
+//  CNLiveOrganizationValidationModule
+//
+//  Created by 梁星国 on 2020/4/15.
+//
+
+#import "CNLiveOrganizationDetailModel.h"
+
+@implementation CNLiveOrganizationDetailModel
+
++ (NSDictionary *)mj_objectClassInArray{
+    return @{
+             @"comTypList" : [CNLiveOrganizationTipModel class]
+             };//前边，是属性数组的名字，后边就是类名
+}
+
+@end
+
+@implementation CNLiveOrganizationTipModel
+
++(NSDictionary *)mj_replacedKeyFromPropertyName
+{
+    return @{@"ID":@"id"};
+}
+
+
+@end
+
+@implementation CNLiveOrganizationDetailContentModel
+
+
+
+
+@end
@@ -6,6 +6,7 @@
 //
 #import <UIKit/UIKit.h>
+#import "CNLiveOrganizationDetailModel.h"
 ///选着类型cell
@@ -15,6 +16,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveBOrganizationPopCell : UITableViewCell
+@property (strong, nonatomic) CNLiveOrganizationTipModel * model;
+- (void)eidtUIWithModel:(CNLiveOrganizationTipModel *)model selectModel:(CNLiveOrganizationTipModel *)selecteModel;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -66,9 +66,24 @@
 #pragma mark - editUI
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath {
+- (void)eidtUIWithModel:(CNLiveOrganizationTipModel *)model selectModel:(CNLiveOrganizationTipModel *)selecteModel{
- 
+    if (!model) {
+        return;
+    }
+    
+
+    self.titleL.text = [NSString stringWithFormat:@"%@",model.name];
+    
+    if (selecteModel) {
+        if ([[NSString stringWithFormat:@"%@",selecteModel.ID] isEqualToString:[NSString stringWithFormat:@"%@",model.ID]]) {
+            self.tipImageV.hidden = NO;
+        }else {
+            self.tipImageV.hidden = YES;
+        }
+    }else {
+        self.tipImageV.hidden = YES;
+    }
 }
@@ -7,6 +7,7 @@
 //
 #import <UIKit/UIKit.h>
+#import "CNLiveOrganizationDetailModel.h"
 NS_ASSUME_NONNULL_BEGIN
@@ -15,9 +16,11 @@ NS_ASSUME_NONNULL_BEGIN
 /** 数据数组 */
 @property (strong , nonatomic) NSMutableArray *dataSourceArr;
+@property (strong , nonatomic) CNLiveOrganizationTipModel *tipSelectModel;
+
 /** 点击Cell回调 */
-@property (nonatomic, copy) void(^clickCellBlock)(CNLiveBOrganizationPopSelectedView *view,NSString *text);
+@property (nonatomic, copy) void(^clickCellBlock)(CNLiveBOrganizationPopSelectedView *view,CNLiveOrganizationTipModel *tipSelectModel);
 -(void)popViewForView:(UIView *)view;
@@ -12,7 +12,7 @@
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
 #import "CNLiveBOrganizationPopCell.h"
-@interface CNLiveBOrganizationPopSelectedView ()<UITableViewDelegate,UITableViewDataSource>
+@interface CNLiveBOrganizationPopSelectedView ()<UIGestureRecognizerDelegate,UITableViewDelegate,UITableViewDataSource>
 {
 }
@@ -32,7 +32,7 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
-        
+        self.dataSourceArr = [NSMutableArray array];
         [self setupUI];
         [self editUI];
@@ -53,6 +53,19 @@
 }
 #pragma mark - getter,setter
+- (void)setDataSourceArr:(NSMutableArray *)dataSourceArr {
+    _dataSourceArr = dataSourceArr;
+    if (dataSourceArr.count > 0) {
+        [self.tableView reloadData];
+    }
+}
+
+- (void)setTipSelectModel:(CNLiveOrganizationTipModel *)tipSelectModel {
+    _tipSelectModel = tipSelectModel;
+    if (tipSelectModel) {
+        [self.tableView reloadData];
+    }
+}
 #pragma mark - setupUI
@@ -82,6 +95,7 @@
     [self.tableView registerClass:[UITableViewHeaderFooterView class] forHeaderFooterViewReuseIdentifier:@"HeaderFooter"];
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(viewTapAction:)];
+    tap.delegate = self;
     [self addGestureRecognizer:tap];
 }
@@ -100,13 +114,32 @@
 #pragma mark - delegate
+
+#pragma mark - UIGestureRecognizer delegate -
+/*- 解决左划手势和确认按钮冲突bug -*/
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
+    // 若为UIButton
+    if ([[touch.view class] isKindOfClass:[UITableViewCell class]] || [[touch.view class] isMemberOfClass:[UITableViewCell class]] ||  [[touch.view class] isKindOfClass:[UITableView class]]  || [[touch.view class] isMemberOfClass:[UITableView class]]  ||[NSStringFromClass([touch.view class]) isEqualToString:@"UITableViewCellContentView"] ) {
+        // UIButton 不需要响应 父视图的手势，保证出发方法 可以正常
+        return NO;
+    }
+    //默认都需要响应
+    return  YES;
+}
+
+
 #pragma mark - <UITableViewDelegate,UITableViewDataSource>
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 13;
+    return self.dataSourceArr.count;
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     CNLiveBOrganizationPopCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationPopCell forIndexPath:indexPath];
+    if (indexPath.row < self.dataSourceArr.count) {
+        CNLiveOrganizationTipModel *model = [self.dataSourceArr objectAtIndex:indexPath.row];
+        [cell eidtUIWithModel:model selectModel:self.tipSelectModel];
+    }
+   
     return cell;
 }
@@ -137,13 +170,19 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     if (self.clickCellBlock) {
-        self.clickCellBlock(self, @"影视");
-        __weak typeof(self) weakSelf = self;
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            if (weakSelf) {
-                [weakSelf dismissView];
-            }
-        });
+        if (indexPath.row < self.dataSourceArr.count) {
+            CNLiveOrganizationTipModel *model = [self.dataSourceArr objectAtIndex:indexPath.row];
+            self.clickCellBlock(self, model);
+            
+            __weak typeof(self) weakSelf = self;
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                if (weakSelf) {
+                    [weakSelf dismissView];
+                }
+            });
+        }
+        
+       
     }
 }
@@ -36,6 +36,8 @@ NS_ASSUME_NONNULL_BEGIN
 */
 @property (nonatomic, assign) NSInteger contentLengthMax;
+@property (nonatomic, strong) NSIndexPath *tvIndexPath;
+
 @end
@@ -17,6 +17,8 @@
 @end
+@BeeHiveService(CNLiveBOrganizationValidationProtocol, CNLiveBOrganizationValidattionService)
+
 @implementation CNLiveBOrganizationValidattionService
 - (UIViewController *)getOrganizationValidationController:(NSDictionary *)params {
@@ -9,6 +9,7 @@
 #import "CNLiveBOrganizationTextField.h"
 #import "CNLiveBOrganizationTextView.h"
 #import "CNLiveBOrganizationButton.h"
+#import "CNLiveOrganizationDetailModel.h"
 ///UITextField 类型
 #define kCNLiveBOrganizationTFCell @"CNLiveBOrganizationTFCell"
@@ -64,8 +65,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) void(^clickSelectedCellBlock)(CNLiveBOrganizationSelectedCell *selectedCell, CNLiveBOrganizationButton *selectedBtn);
 @property (strong, nonatomic) NSIndexPath *indexPath;
+@property (strong, nonatomic) CNLiveOrganizationTipModel *tipModel;
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath;
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath tipModel:(CNLiveOrganizationTipModel *)tipModel;
 @end
@@ -81,7 +83,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSIndexPath *indexPath;
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath;
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath image:(UIImage *)image;
 @end
@@ -59,6 +59,7 @@
     [self addSubview:self.contentTF];
     [self addSubview:self.titleL];
     [self addSubview:self.contentL];
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
     [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(textFieldTextChange:) name:UITextFieldTextDidChangeNotification object:nil];
@@ -321,6 +322,7 @@
     [self addSubview:self.contentTV];
     [self addSubview:self.titleL];
     [self addSubview:self.tipImageV];
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
     self.tipImageV.frame = CGRectMake(10, 18 , 7, 8);
     self.titleL.frame = CGRectMake(21.5, 16, 72, 12);
@@ -353,6 +355,7 @@
             self.contentTV.placeholder = @"请输入企业简介(400字以内)";
             self.contentTV.placeholderFont = [UIFont systemFontOfSize:12];
             self.contentTV.placeholderColor = RGBOF(0xB9B9B9);
+            self.contentTV.tvIndexPath = indexPath;
         }else {
             return;
         }
@@ -477,7 +480,7 @@
     [self addSubview:self.titleL];
     [self addSubview:self.selectedBtn];
     [self addSubview:self.tipImageV];
-    
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
     self.tipImageV.frame = CGRectMake(10, 18, 7, 8);
     self.titleL.frame = CGRectMake(21.5, 16, 72, 12);
@@ -496,7 +499,7 @@
 }
 #pragma mark - editUI
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath {
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath tipModel:(nonnull CNLiveOrganizationTipModel *)tipModel {
     if (!indexPath) {
         return;
@@ -507,6 +510,15 @@
     if (indexPath.section == 0) {
         if (indexPath.row == 6) {
             self.titleL.text = @"企业类型";
+            if (tipModel) {
+                self.selectedBtn.isSelectedStatus = YES;
+                self.selectedBtn.textL.text = [NSString stringWithFormat:@"%@",tipModel.name];
+                
+            }else{
+                self.selectedBtn.isSelectedStatus = NO;
+                self.selectedBtn.textL.text = @"请选择企业类型";
+                
+            }
         }else {
             return;
@@ -555,7 +567,7 @@
 }
 /***  内容 ***/
-- (UIButton *)selectedBtn {
+- (CNLiveBOrganizationButton *)selectedBtn {
     if (!_selectedBtn) {
         _selectedBtn = [[CNLiveBOrganizationButton alloc]initWithFrame:CGRectMake(104.5, 10, KScreenWidth - 104.5 - 30.5, 28)];
@@ -629,6 +641,7 @@
     [self addSubview:self.titleL];
     [self addSubview:self.contentL];
     [self addSubview:self.tipImageV];
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
     self.tipImageV.frame = CGRectMake(10, 18 , 7, 8);
     self.tipImageV.image = [UIImage imageNamedFromOrganization:@"organization_must"];
@@ -649,7 +662,7 @@
 }
 #pragma mark - editUI
-- (void)editUIWithIndexPath:(NSIndexPath *)indexPath {
+- (void)editUIWithIndexPath:(NSIndexPath *)indexPath image:(UIImage *)image {
     self.indexPath = indexPath;
@@ -669,6 +682,14 @@
             self.contentL.frame = CGRectMake(104.5, self.contentImageView.bottom + 6, KScreenWidth - 104.5 - 30.5, 30);
             self.contentImageView.image = [UIImage imageNamedFromOrganization:@"organization_selectedImageS"];
             self.contentImageView.tipLabel.frame = CGRectMake(0, 60 - 19, 60, 19);
+            
+            if (image) {
+                self.contentImageView.tipLabel.hidden = NO;
+                self.contentImageView.image = image;
+            }else {
+                self.contentImageView.tipLabel.hidden = YES;
+            }
+            
 #pragma mark - TODO:判断是否有图
         }else if (indexPath.row == 12){
@@ -684,7 +705,12 @@
             self.contentL.frame = CGRectMake(104.5, self.contentImageView.bottom + 6, KScreenWidth - 104.5 - 30.5, 30);
             self.contentImageView.image = [UIImage imageNamedFromOrganization:@"organization_selectedImageL"];
             self.contentImageView.tipLabel.frame = CGRectMake(0, 137 - 19, 100, 19);
-#pragma mark - TODO:判断是否有图
+            if (image) {
+                self.contentImageView.tipLabel.hidden = NO;
+                self.contentImageView.image = image;
+            }else {
+                self.contentImageView.tipLabel.hidden = YES;
+            }
         }else {
             return;
@@ -452,7 +452,7 @@
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveOrganizationValidationModule_Example/Pods-CNLiveOrganizationValidationModule_Example-resources.sh",
 				"${PODS_ROOT}/BaiduMapKit/BaiduMapKit/BaiduMapAPI_Map.framework/mapapi.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveShareToolKit/CNLiveShareToolKit.bundle",
-				"${PODS_ROOT}/WeiboSDK/libWeiboSDK/WeiboSDK.bundle",
+				"${PODS_ROOT}/Weibo_SDK/libWeiboSDK/WeiboSDK.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (