提交Ui完成和交互完成

梁星国
1 parent b59bd700
Showing 12 changed files with 609 additions and 49 deletions
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_normal@2x.png
CNLiveOrganizationValidationModule/Assets/CNLiveOrganizationValidationModule.bundle/organization_normal@3x.png
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBAgreementContentController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationImageView.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPhotoSelectedView.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPhotoSelectedView.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Other/CNLiveBOrganizationPopSelectedView.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationContentCell.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationValidationHeaderView.h
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationValidationHeaderView.m
Example/CNLiveOrganizationValidationModule/CNLiveOrganizationValidationModule-Info.plist
@@ -15,7 +15,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    
+    [self.view setBackgroundColor:[UIColor whiteColor]];
 }
 /*
@@ -11,9 +11,16 @@
 #import "CNLiveBOrganizationValidationHeaderView.h"
 #import "CNLiveBOrganizationContentCell.h"
 #import "CNLiveBAgreementCommitFinishController.h"
+#import "CNLiveBAgreementContentController.h"
 #import "CNLiveBOrganizationPopSelectedView.h"
-
-@interface CNLiveBOrganizationValidattionController ()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,UITextViewDelegate>{
+#import "CNLiveBOrganizationPhotoSelectedView.h"
+#import <CNLiveImagePickerController/CNImagePickerController.h>
+#import <RSKImageCropper/RSKImageCropper.h>
+#import <QMUIKit/QMUIKit.h>
+#import <YYKit/YYKit.h>
+#import <objc/runtime.h>
+
+@interface CNLiveBOrganizationValidattionController ()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,UITextViewDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate, RSKImageCropViewControllerDelegate,RSKImageCropViewControllerDataSource>{
     CGPoint   contentoffset;
 }
@@ -28,6 +35,11 @@
 /** 弹出视图*/
 @property (nonatomic , strong) CNLiveBOrganizationPopSelectedView *popSelectedView;
+/** 相册弹出实体图*/
+@property (nonatomic , strong) CNLiveBOrganizationPhotoSelectedView *photoSelecctedView;
+
+@property (nonatomic, strong) UIImagePickerController *pickerVC;
+
 @end
@@ -84,7 +96,18 @@
     self.footerView.clickCommitButtonBlock = ^(CNLiveBOrganizationTVFooteriew * _Nonnull footerView, UIButton * _Nonnull commitBtn) {
         [weakSelf jumpCommitVC];
     };
+    self.footerView.clickAgreementButtonBlock = ^(CNLiveBOrganizationTVFooteriew * _Nonnull footerView, UIButton * _Nonnull agreementBtn) {
+        footerView.agreementBtn.selected = ! footerView.agreementBtn.selected;
+#pragma mark - TODO: 记录内容
+        
+    };
+    self.footerView.clickAgreementLBlock = ^(CNLiveBOrganizationTVFooteriew * _Nonnull footerView, UILabel * _Nonnull agreementL) {
+        [weakSelf jumpContentVC];
+        
+    };
+    self.pickerVC = [[UIImagePickerController alloc] init];
+    self.pickerVC.delegate = self;
 }
 #pragma mark -
@@ -107,12 +130,12 @@
         //获取当前cell在tableview中的位置
         CGRect rectInTableview = [self.tableView rectForRowAtIndexPath:indexpath];
         //获取当前cell在屏幕中的位置
-//        CGRect rectInSuperview = [self.tableView convertRect:rectInTableview fromView:self.tableView.superview];
+        //        CGRect rectInSuperview = [self.tableView convertRect:rectInTableview fromView:self.tableView.superview];
         contentoffset.x = self.tableView.contentOffset.x;
         contentoffset.y = self.tableView.contentOffset.y;
         if ((rectInTableview.origin.y+50-self.tableView.contentOffset.y)>200) {
             [self.tableView setContentOffset:CGPointMake(self.tableView.contentOffset.x,((rectInTableview.origin.y-self.tableView.contentOffset.y)-150)+self.tableView.contentOffset.y) animated:YES];
-
+            
         }
     }
@@ -132,12 +155,12 @@
         //获取当前cell在tableview中的位置
         CGRect rectInTableview = [self.tableView rectForRowAtIndexPath:indexpath];
         //获取当前cell在屏幕中的位置
-//        CGRect rectInSuperview = [self.tableView convertRect:rectInTableview fromView:self.tableView.superview];
+        //        CGRect rectInSuperview = [self.tableView convertRect:rectInTableview fromView:self.tableView.superview];
         contentoffset.x = self.tableView.contentOffset.x;
         contentoffset.y = self.tableView.contentOffset.y;
         if ((rectInTableview.origin.y+50-self.tableView.contentOffset.y)>200) {
             [self.tableView setContentOffset:CGPointMake(self.tableView.contentOffset.x,((rectInTableview.origin.y-self.tableView.contentOffset.y)-150)+self.tableView.contentOffset.y) animated:YES];
-
+            
         }
     }
@@ -219,7 +242,7 @@
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
     if (section == 0) {
-       return [UIView new];
+        return [UIView new];
     }else {
         return [UIView new];
@@ -241,7 +264,7 @@
         }else {
             return 44;
         }
-       
+        
     }else {
         return 80;
     }
@@ -271,11 +294,221 @@
 /** 点击cell实现 */
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    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) {
+                
+                [weakSelf checkPermissionsWithCount:indexCount type:0];
+                
+            };
+            
+            
+        }else if (indexPath.row == 12){
+            
+            [self.photoSelecctedView popViewForView:self.view];
+            __weak typeof(self) weakSelf = self;
+            self.photoSelecctedView.clickViewBlock = ^(CNLiveBOrganizationPhotoSelectedView * _Nonnull view, NSInteger indexCount) {
+                [weakSelf checkPermissionsWithCount:indexCount type:1];
+                
+            };
+            
+        }
+    }
+    
+    
+    
+}
+
+#pragma mark - RSKImageCropViewControllerDelegate
+- (void)imageCropViewController:(RSKImageCropViewController *)controller didCropImage:(UIImage *)croppedImage usingCropRect:(CGRect)cropRect rotationAngle:(CGFloat)rotationAngle {
+    NSLog(@"%@",croppedImage);
+    
+#pragma mark - TODO: 获取图片
+    if (self.navigationController) {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+
+- (void)imageCropViewControllerDidCancelCrop:(RSKImageCropViewController *)controller {
+    NSLog(@"取消");
+    if (self.navigationController) {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+   
+}
+
+#pragma mark - RSKImageCropViewControllerDataSource
+- (CGRect)imageCropViewControllerCustomMaskRect:(RSKImageCropViewController *)controller {
+    //返回所截取图片的位置
+    return CGRectMake(0, (KScreenHeight-KScreenWidth)/2, KScreenWidth, KScreenWidth);
+}
+
+- (UIBezierPath *)imageCropViewControllerCustomMaskPath:(RSKImageCropViewController *)controller {
+    //返回裁剪框的位置
+    UIBezierPath *path=[UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, (KScreenHeight-KScreenWidth)/2, KScreenWidth, KScreenWidth) cornerRadius:0];
+    return path;
+}
+
+- (CGRect)imageCropViewControllerCustomMovementRect:(RSKImageCropViewController *)controller {
+    //返回图片可移动的框框大小
+    return CGRectMake(0, (KScreenHeight-KScreenWidth)/2, KScreenWidth, KScreenWidth);
+}
+
+#pragma mark -  UIImagePickerControllerDelegate
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
+
+    NSString *type = [info objectForKey:UIImagePickerControllerMediaType];
+    
+    //当选择的类型是图片
+    if ([type isEqualToString:@"public.image"])//@"public.image"
+    {
+        NSString *key = nil;
+        
+        if (picker.allowsEditing) {
+            key = UIImagePickerControllerEditedImage;
+        }
+        else {
+            key = UIImagePickerControllerOriginalImage;
+        }
+        //获取图片
+        UIImage *image = [info objectForKey:key];
+#pragma mark - TODO:获取图片
+        //关闭相册界面
+        [picker dismissViewControllerAnimated:YES completion:^{
+            
+        }];
+    }
+}
+
+
+//当用户取消选择的时候，调用该方法
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
+    [picker dismissViewControllerAnimated:YES completion:^{}];
+}
+
+
+
+
+
+#pragma mark - ***私有方法***
+///检查拍照权限
+- (void)checkPermissionsWithCount:(NSInteger)indexCount type:(NSInteger)type {
+    AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+    if ((authStatus == AVAuthorizationStatusRestricted || authStatus ==AVAuthorizationStatusDenied) && kiOS7Later) {
+        // 无权限 做一个友好的提示
+        
+        [self goPrivacySetting];
+    } else if (authStatus == AVAuthorizationStatusNotDetermined) {
+        // fix issue 466, 防止用户首次拍照拒绝授权时相机页黑屏
+        if (kiOS7Later) {
+            [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
+                if (granted) {
+                    dispatch_sync(dispatch_get_main_queue(), ^{
+                        [self jumpPhotoWithCount:indexCount type:type];
+                    });
+                }
+            }];
+        } else {
+            [self jumpPhotoWithCount:indexCount type:type];
+        }
+    } else {
+        [self jumpPhotoWithCount:indexCount type:type];
+    }
+}
+
+- (void)goPrivacySetting {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSString *appName = [[NSBundle mainBundle].infoDictionary valueForKey:@"CFBundleDisplayName"];
+        if (!appName) appName = [[NSBundle mainBundle].infoDictionary valueForKey:@"CFBundleName"];
+        NSString *message = [NSString stringWithFormat:@"请去-> [设置 - 隐私 - 相机 - %@] 打开访问开关",appName];
+        
+        QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"确定" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+            
+        }];
+        QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"警告" message:message preferredStyle:QMUIAlertControllerStyleAlert];
+        [alertController addAction:action1];
+        [alertController showWithAnimated:YES];
+        
+    });
+}
+
+
+
+/// 跳转相册,相机
+- (void)jumpPhotoWithCount:(NSInteger)indexCount type:(NSInteger) type {
+    
+    if (type == 0) {
+        if (indexCount == 0) {
+            if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
+                self.pickerVC.sourceType = UIImagePickerControllerSourceTypeCamera;
+                //设置拍照后的图片可被编辑
+                self.pickerVC.modalPresentationStyle = UIModalPresentationFullScreen;
+                self.pickerVC.allowsEditing = YES;
+                [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;
+                //                        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];
+            }];
+            [self presentViewController:imagePickerVc animated:YES completion:nil];
+            return;
+            
+        }
+    }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;
+                  
+              }
+        
+    }
+    
 }
+
+
 #pragma mark - TODO:
 #pragma mark - *** 事件实现 ***
@@ -284,7 +517,12 @@
     [self.navigationController pushViewController:commitVC animated:YES];
 }
-                 
+- (void)jumpContentVC {
+    CNLiveBAgreementContentController *contentVC = [[CNLiveBAgreementContentController alloc] init];
+    [self.navigationController pushViewController:contentVC animated:YES];
+}
+
+
 - (void)popView {
     [self.popSelectedView popViewForView:self.view];
@@ -293,8 +531,8 @@
     };
-                    
-               
+    
+    
 }
@@ -346,6 +584,13 @@
     return _popSelectedView;;
 }
+- (CNLiveBOrganizationPhotoSelectedView *)photoSelecctedView {
+    if (!_photoSelecctedView) {
+        _photoSelecctedView = [[CNLiveBOrganizationPhotoSelectedView alloc]initWithFrame:CGRectZero];
+    }
+    return _photoSelecctedView;
+}
+
 /*
  #pragma mark - Navigation
@@ -6,6 +6,9 @@
 //
 #import "CNLiveBOrganizationImageView.h"
+#import <Masonry/Masonry.h>
+#import "UIImage+OrganizationValidation.h"
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
 @implementation CNLiveBOrganizationImageView
@@ -30,11 +33,32 @@
 - (void)setUpUI
 {
+    self.layer.cornerRadius = 5;
+    self.layer.masksToBounds = YES;
+    
+    [self addSubview:self.tipLabel];
+    self.tipLabel.frame = CGRectMake(0, self.frame.size.height - 19, self.frame.size.width, 19);
 }
+/***  头部 ***/
+- (UILabel *)tipLabel {
+    
+    if (!_tipLabel) {
+        _tipLabel = [[UILabel alloc]init];
+        _tipLabel.font = [UIFont systemFontOfSize:12];
+        _tipLabel.numberOfLines = 1;
+        _tipLabel.textColor = [UIColor whiteColor];
+        _tipLabel.text = @"更改";
+        _tipLabel.backgroundColor = [UIColor blackColor];
+        _tipLabel.textAlignment = NSTextAlignmentCenter;
+    }
+    return _tipLabel;
+    
+}
+
 @end
+//
+//  CNLiveBOrganizationPhotoSelectedView.h
+//  CNLiveOrganizationValidationModule
+//
+//  Created by 梁星国 on 2020/4/14.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveBOrganizationPhotoSelectedView : UIView
+
+/** 点击按钮l回调 */
+@property (nonatomic, copy) void(^clickViewBlock)(CNLiveBOrganizationPhotoSelectedView *view,NSInteger indexCount);
+
+-(void)popViewForView:(UIView *)view;
+
+-(void)dismissView;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveBOrganizationPhotoSelectedView.m
+//  CNLiveOrganizationValidationModule
+//
+//  Created by 梁星国 on 2020/4/14.
+//
+
+#import "CNLiveBOrganizationPhotoSelectedView.h"
+
+#import <Masonry/Masonry.h>
+#import "UIImage+OrganizationValidation.h"
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import "CNLiveBOrganizationPopCell.h"
+
+@interface CNLiveBOrganizationPhotoSelectedView ()
+
+@property (strong ,nonatomic) UIView *contentView;
+
+@property (strong ,nonatomic) UIButton *cancelBtn;
+
+@property (strong , nonatomic) UIButton *photoAlbumBtn;
+
+@property (strong , nonatomic) UIButton *takePhotoBtn;
+
+@end
+
+@implementation CNLiveBOrganizationPhotoSelectedView
+
+
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+        [self setupUI];
+        [self editUI];
+        
+    }
+    return self;
+}
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    [self setupUI];
+
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    
+    [self layoutUI];
+}
+
+#pragma mark - getter,setter
+
+
+#pragma mark - setupUI
+- (void)setupUI {
+    
+    self.contentView.frame = CGRectMake(0, KScreenHeight - 160-kVerticalBottomSafeHeight, KScreenWidth, 160 +kVerticalBottomSafeHeight);
+    [self.contentView setBackgroundColor:RGBOF(0xD8D8D8)];
+    [self.contentView addSubview:self.cancelBtn];
+    [self.contentView addSubview:self.photoAlbumBtn];
+    [self.contentView addSubview:self.takePhotoBtn];
+    
+    self.takePhotoBtn.frame = CGRectMake(0, 0, KScreenWidth, 50);
+    self.photoAlbumBtn.frame = CGRectMake(0, 51, KScreenWidth, 50);
+    self.cancelBtn.frame = CGRectMake(0, 111, KScreenWidth, 50);
+    [self.takePhotoBtn setBackgroundColor:[UIColor whiteColor]];
+    [self.photoAlbumBtn setBackgroundColor:[UIColor whiteColor]];
+    [self.cancelBtn setBackgroundColor:[UIColor whiteColor]];
+    
+    
+    [self addSubview:self.contentView];
+    
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(viewTapAction:)];
+    [self addGestureRecognizer:tap];
+    
+    [self.takePhotoBtn addTarget:self action:@selector(takePhotoBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    [self.photoAlbumBtn addTarget:self action:@selector(photoAlbumBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    [self.cancelBtn addTarget:self action:@selector(cancelBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+}
+
+#pragma mark - layoutUI
+- (void)layoutUI {
+
+
+}
+
+#pragma mark - editUI
+- (void)editUI {
+    
+}
+
+#pragma mark - 事件实现
+- (void)viewTapAction:(UITapGestureRecognizer *)tap {
+    
+    [self dismissView];
+}
+
+- (void)takePhotoBtnAction:(UIButton *)sender {
+    
+    if (self.clickViewBlock) {
+        self.clickViewBlock(self, 0);
+        __weak typeof(self) weakSelf = self;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            if (weakSelf) {
+                [weakSelf dismissView];
+            }
+        });
+    }
+}
+
+- (void)photoAlbumBtnAction:(UIButton *)sender {
+    if (self.clickViewBlock) {
+        self.clickViewBlock(self, 1);
+        __weak typeof(self) weakSelf = self;
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            if (weakSelf) {
+                [weakSelf dismissView];
+            }
+            
+        });
+    }
+}
+
+- (void)cancelBtnAction:(UIButton *)sender {
+    
+    if (self) {
+        [self dismissView];
+    }
+}
+
+#pragma mark - 私有方法
+
+#pragma mark - 弹出
+-(void)popViewForView:(UIView *)view{
+    
+    [view addSubview:self];
+    [view bringSubviewToFront:self];
+    self.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
+    [self setBackgroundColor:RGBA(0, 0, 0, 0.5)];
+    self.alpha = 0.3;
+    self.contentView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, 160 +kVerticalBottomSafeHeight);
+
+    [UIView animateWithDuration:0.25 animations:^{
+        self.alpha = 1.0;
+        
+        self.contentView.frame = CGRectMake(0, KScreenHeight - 160-kVerticalBottomSafeHeight, KScreenWidth, 160 +kVerticalBottomSafeHeight);
+        
+    }];
+}
+
+-(void)dismissView{
+    
+    [UIView animateWithDuration:0.25 animations:^{
+        self.alpha = 0.3;
+        self.contentView.frame = CGRectMake(0, KScreenHeight, KScreenWidth, 160 +kVerticalBottomSafeHeight);
+    } completion:^(BOOL finished) {
+        
+        [self removeFromSuperview];
+        
+    }];
+}
+
+
+
+#pragma mark - 懒加载
+
+- (UIView *)contentView {
+    if (!_contentView) {
+        _contentView = [[UIView alloc]initWithFrame:CGRectZero];
+    }
+    return _contentView;
+}
+
+
+/** 取消按钮 */
+- (UIButton *)cancelBtn {
+
+    if (!_cancelBtn) {
+        _cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_cancelBtn setTitle:@"取消" forState:UIControlStateNormal];
+        [_cancelBtn setTitleColor:RGBOF(0x999999) forState:UIControlStateNormal];
+    }
+    return _cancelBtn;
+}
+
+/** 相册 */
+- (UIButton *)photoAlbumBtn{
+
+    if (!_photoAlbumBtn) {
+        _photoAlbumBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_photoAlbumBtn setTitle:@"从手机相册选择" forState:UIControlStateNormal];
+        [_photoAlbumBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+    }
+    return _photoAlbumBtn;
+}
+
+/** 拍照 */
+- (UIButton *)takePhotoBtn{
+
+    if (!_takePhotoBtn) {
+        _takePhotoBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_takePhotoBtn setTitle:@"相机" forState:UIControlStateNormal];
+        [_takePhotoBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+    }
+    return _takePhotoBtn;
+}
+
+
+
+@end
@@ -14,7 +14,7 @@
 @interface CNLiveBOrganizationPopSelectedView ()<UITableViewDelegate,UITableViewDataSource>
 {
-
+    
 }
 @property (strong ,nonatomic) UIView *headerView;
@@ -43,7 +43,7 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     [self setupUI];
-
+    
 }
 - (void)layoutSubviews {
@@ -61,22 +61,19 @@
     [self.headerView addSubview:self.headerL];
     [self.headerView addSubview:self.returnBtn];
-    self.headerView.frame = CGRectMake(0, 0, KScreenWidth, 50);
+    self.headerView.frame = CGRectMake(0, KScreenHeight/2 -kVerticalBottomSafeHeight, KScreenWidth, KScreenHeight/2 + kVerticalBottomSafeHeight);
+    self.headerL.frame = CGRectMake(44, 0, KScreenWidth - 88, 50);
+    self.headerL.text = @"请选择企业类型";
+    self.returnBtn.frame = CGRectMake(KScreenWidth - 54, 0, 44, 44);
+    [self addSubview:self.headerView];
     UIBezierPath *fieldPath = [UIBezierPath bezierPathWithRoundedRect:self.headerView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(15 , 15)];
     CAShapeLayer *fieldLayer = [[CAShapeLayer alloc] init];
     fieldLayer.frame = self.headerView.bounds;
     fieldLayer.path = fieldPath.CGPath;
     self.headerView.layer.mask = fieldLayer;
-    self.headerL.frame = CGRectMake(44, 0, KScreenWidth - 88, 50);
-    self.headerL.text = @"请选择企业类型";
-    self.returnBtn.frame = CGRectMake(KScreenWidth - 54, 0, 44, 44);
-    self.tableView.tableHeaderView = self.headerView;
-    UIView *footerView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, kVerticalBottomSafeHeight)];
-    self.tableView.tableFooterView = footerView;
-    [self.tableView setBackgroundColor:[UIColor clearColor]];
-
-    [self addSubview:self.tableView];
+    self.tableView.frame = CGRectMake(0, 50, KScreenWidth, KScreenHeight/2);
+    [self.headerView addSubview:self.tableView];
     /** tableView */
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
@@ -91,15 +88,8 @@
 #pragma mark - layoutUI
 - (void)layoutUI {
-    __weak typeof(self) weakSelf = self;
-    [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(weakSelf.mas_left);
-        make.top.equalTo(weakSelf.mas_top).offset(KScreenHeight/2);
-        make.right.equalTo(weakSelf.mas_right);
-        make.height.mas_equalTo(KScreenHeight/2);
-    }];
-
+    
 }
 #pragma mark - editUI
@@ -116,8 +106,8 @@
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-   CNLiveBOrganizationPopCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationPopCell forIndexPath:indexPath];
-
+    CNLiveBOrganizationPopCell *cell = [tableView dequeueReusableCellWithIdentifier:kCNLiveBOrganizationPopCell forIndexPath:indexPath];
+    
     return cell;
 }
@@ -168,15 +158,17 @@
 #pragma mark - 弹出
 -(void)popViewForView:(UIView *)view{
-    
-    self.frame = CGRectMake(0, KScreenHeight/2, KScreenWidth, KScreenHeight);
-    [self setBackgroundColor:RGBA(0, 0, 0, 0.5)];
     [view addSubview:self];
     [view bringSubviewToFront:self];
-
+    
+    self.alpha = 0.3;
+    self.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
+    self.headerView.frame =  CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight/2 + kVerticalBottomSafeHeight);
+    [self setBackgroundColor:RGBA(0, 0, 0, 0.5)];
     [UIView animateWithDuration:0.25 animations:^{
+        self.alpha = 1.0;
+        self.headerView.frame = CGRectMake(0, KScreenHeight/2 -kVerticalBottomSafeHeight, KScreenWidth, KScreenHeight/2 + kVerticalBottomSafeHeight);
-        self.frame = CGRectMake(0,KScreenHeight - CGRectGetHeight(self.frame), KScreenWidth, CGRectGetHeight(self.frame));
     }];
 }
@@ -184,7 +176,9 @@
 -(void)dismissView{
     [UIView animateWithDuration:0.25 animations:^{
-        self.frame = CGRectMake(0, KScreenHeight, KScreenWidth,CGRectGetHeight(self.frame));
+        self.alpha = 0.3;
+        self.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
+        self.headerView.frame =  CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight/2 + kVerticalBottomSafeHeight);
     } completion:^(BOOL finished) {
         self.dataSourceArr = [NSMutableArray array];
         [self removeFromSuperview];
@@ -197,7 +191,7 @@
 #pragma mark - 接口
 - (void)getAllList{
-
+    
 }
@@ -233,7 +227,7 @@
 /** 提示视图 */
 - (UIButton *)returnBtn {
-
+    
     if (!_returnBtn) {
         _returnBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_returnBtn setImage:[UIImage imageNamedFromOrganization:@"organization_return"] forState:UIControlStateNormal];
@@ -11,6 +11,7 @@
 #import <CNLiveBaseKit/CNLiveBaseKit.h>
 #import "CNLiveBOrganizationTextField.h"
 #import "CNLiveBOrganizationButton.h"
+#import "CNLiveBOrganizationImageView.h"
 #pragma mark -
 #pragma mark - UITextField 类型
@@ -586,7 +587,7 @@
 /** 必须标记*/
 @property (nonatomic, strong) UIImageView *tipImageV;
 /** 图片*/
-@property (nonatomic, strong) UIImageView *contentImageView;
+@property (nonatomic, strong) CNLiveBOrganizationImageView *contentImageView;
 /** 头部*/
 @property (nonatomic, strong) UILabel *titleL;
 /** 内容*/
@@ -667,6 +668,7 @@
             self.tipImageV.centerY = self.contentImageView.centerY;
             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);
 #pragma mark - TODO:判断是否有图
         }else if (indexPath.row == 12){
@@ -681,6 +683,7 @@
             self.tipImageV.centerY =  self.titleL.centerY;
             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:判断是否有图
         }else {
@@ -716,10 +719,10 @@
 }
 /***  内容 ***/
-- (UIImageView *)contentImageView {
+- (CNLiveBOrganizationImageView *)contentImageView {
     if (!_contentImageView) {
-        _contentImageView = [[UIImageView alloc]init];
+        _contentImageView = [[CNLiveBOrganizationImageView alloc]init];
     }
     return _contentImageView;
@@ -740,6 +743,14 @@
 }
+- (UIImageView *)tipImageV {
+    if (!_tipImageV) {
+        _tipImageV = [[UIImageView alloc]init];
+        _tipImageV.image = [UIImage imageNamedFromOrganization:@"organization_must"];
+    }
+    return _tipImageV;
+}
+
@@ -37,7 +37,10 @@ NS_ASSUME_NONNULL_BEGIN
 /** 点击item实现*/
 @property (nonatomic, copy) void(^clickCommitButtonBlock)(CNLiveBOrganizationTVFooteriew *footerView, UIButton *commitBtn);
-
+/** 点击是否同意协议实现*/
+@property (nonatomic, copy) void(^clickAgreementButtonBlock)(CNLiveBOrganizationTVFooteriew *footerView, UIButton *agreementBtn);
+/** 点击协议内容*/
+@property (nonatomic, copy) void(^clickAgreementLBlock)(CNLiveBOrganizationTVFooteriew *footerView, UILabel *agreementL);
 /** 协议按钮*/
 @property (nonatomic, strong) UIButton *agreementBtn;
 /** 协议文字*/
@@ -316,9 +316,13 @@
     NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:contentStr attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:11],NSForegroundColorAttributeName: [UIColor colorWithRed:153/255.0 green:153/255.0 blue:153/255.0 alpha:1.0]}];
     NSRange range = [contentStr rangeOfString:@"《中国网+内容安全协议》"];
     [string addAttributes:@{NSFontAttributeName: [UIFont systemFontOfSize:11], NSForegroundColorAttributeName: [UIColor colorWithRed:72/255.0 green:167/255.0 blue:249/255.0 alpha:1.0]} range:range];
-    _agreementL.attributedText = string;
+    self.agreementL.attributedText = string;
     [self.commitBtn addTarget:self action:@selector(commitBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    [self.agreementBtn addTarget:self action:@selector(agreementBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(agreementLAction:)];
+    self.agreementL.userInteractionEnabled = YES;
+    [self.agreementL addGestureRecognizer:tap];
 }
@@ -361,6 +365,20 @@
 }
+- (void)agreementBtnAction:(UIButton *)btn {
+    if (self.clickAgreementButtonBlock) {
+        self.clickAgreementButtonBlock(self, btn);
+    }
+}
+
+- (void)agreementLAction:(UITapGestureRecognizer *)tap {
+    UILabel *agreementL = (UILabel  *)tap.view;
+    if (self.clickAgreementLBlock) {
+        self.clickAgreementLBlock(self, agreementL);
+    }
+}
+
+
 #pragma mark - ***私有方法***
 #pragma mark - ***懒加载***
@@ -370,7 +388,7 @@
     if (!_agreementBtn) {
         _agreementBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_agreementBtn setImage:[UIImage imageNamedFromOrganization:@"organization_selected"] forState:UIControlStateNormal];
+        [_agreementBtn setImage:[UIImage imageNamedFromOrganization:@"organization_normal"] forState:UIControlStateNormal];
         [_agreementBtn setImage:[UIImage imageNamedFromOrganization:@"organization_selected"] forState:UIControlStateSelected];
     }
     return _agreementBtn;
@@ -2,8 +2,34 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSContactsUsageDescription</key>
+	<string>请求访问通讯录</string>
+	<key>NSCameraUsageDescription</key>
+	<string>App需要您的同意,才能访问相机</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>App需要您的同意,才能访问相册</string>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>App需要您的同意,才能访问媒体资料库</string>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>App需要您的同意,才能访问蓝牙</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>App需要您的同意,才能访问日历</string>
+	<key>NSHealthShareUsageDescription</key>
+	<string>App需要您的同意,才能访问健康分享</string>
+	<key>NSHealthUpdateUsageDescription</key>
+	<string>App需要您的同意,才能访问健康更新 </string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>App需要您的同意,才能始终访问位置</string>
+	<key>NSLocationUsageDescription</key>
+	<string>App需要您的同意,才能访问位置</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>App需要您的同意,才能访问麦克风</string>
+	<key>NSMotionUsageDescription</key>
+	<string>App需要您的同意,才能访问运动与健身</string>
+	<key>NSRemindersUsageDescription</key>
+	<string>App需要您的同意,才能访问提醒事项</string>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>zh_CN</string>
 	<key>CFBundleDisplayName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>