no message

zhangxiaowen
1 parent 596912b5
Showing 12 changed files with 430 additions and 117 deletions
CNLiveLoginModule.podspec
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_back_black_b.imageset/Contents.json
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_back_black_b.imageset/mine_back_black_b@2x.png
CNLiveLoginModule/Assets/CNLiveLoginModule.xcassets/mine_back_black_b.imageset/mine_back_black_b@3x.png
CNLiveLoginModule/Classes/Controller/CNLiveCompleteInfoController.m
CNLiveLoginModule/Classes/View/CNLiveCompleteInfoView.m
CNLiveLoginModule/Classes/View/CNLiveLoginNavigationBar.h
CNLiveLoginModule/Classes/View/CNLiveLoginNavigationBar.m
CNLiveLoginModule/Classes/View/CNLiveLoginView.m
Example/CNLiveLoginModule.xcodeproj/project.pbxproj
Example/CNLiveLoginModule/CNLiveLoginModule-Info.plist
Example/Podfile
@@ -100,6 +100,12 @@ TODO: 网家家-登录模块.
   # 管理类
   s.dependency 'CNLiveManager'
+  # 相册
+  s.dependency 'CNLiveImagePickerController'
+  
+  # 相机
+  s.dependency 'CNLiveAVCamera'
+  
   s.static_framework = true
 end
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_back_black_b@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "mine_back_black_b@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -12,26 +12,33 @@
 #import "QMUIKit.h"
 #import "YYKit.h"
+#import "CNLiveLoginNavigationBar.h"
 #import "CNLiveCompleteInfoView.h"
-@interface CNLiveCompleteInfoController()<CNLiveCompleteInfoViewDelegate>
+@interface CNLiveCompleteInfoController()<CNLiveCompleteInfoViewDelegate,CNLiveLoginNavigationBarDelegate>
 @property (nonatomic, strong) CNLiveCompleteInfoView *infoView;
+@property (nonatomic, strong) CNLiveLoginNavigationBar *navigationBar;
 @end
 @implementation CNLiveCompleteInfoController
+#pragma mark - 生命周期
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBarHidden = YES;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.automaticallyAdjustsScrollViewInsets = NO;
     self.view.backgroundColor = [UIColor whiteColor];
-    self.title = @"完善信息";
     [self createUI];
 }
 - (void)createUI{
+    [self.view addSubview:self.navigationBar];
     [self.view addSubview:self.infoView];
 }
@@ -60,28 +67,38 @@
 */
 #pragma mark - 懒加载
+- (CNLiveLoginNavigationBar *)navigationBar {
+    if (!_navigationBar) {
+        _navigationBar = [[CNLiveLoginNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
+        _navigationBar.backgroundColor = [UIColor whiteColor];
+        _navigationBar.delegate = self;
+        _navigationBar.title.text = @"完善信息";
+        _navigationBar.right = nil;
+    }
+    return _navigationBar;
+}
+
 - (CNLiveCompleteInfoView *)infoView{
     if(!_infoView){
-        _infoView = [[CNLiveCompleteInfoView alloc] initWithFrame:CGRectMake(self.view.frame.size.width/8.0, NavigationContentTop, self.view.frame.size.width*3/4.0, 250)];
+        _infoView = [[CNLiveCompleteInfoView alloc] initWithFrame:CGRectMake(self.view.frame.size.width/8.0, NavigationContentTop+40, self.view.frame.size.width*3/4.0, 250)];
+        _infoView.center = CGPointMake(self.view.center.x, self.view.center.y-50);
         _infoView.delegate = self;
     }
     return _infoView;
 }
-/**
- *  创建图片
- *
- *  @param imageName 图片名字
- *  @param bundleName 图片所在的bundle名字
- *  @param targetClass 类和bundle的同级目录
- *  @return 返回UIImage
- */
-- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
-    NSBundle *bundle = [NSBundle bundleForClass:targetClass];
-    NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
-    NSBundle *targetBundle = [NSBundle bundleWithURL:url];
-    UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
-    return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
+#pragma mark - CNLiveLoginNavigationBarDelegate
+- (void)navigationBar:(CNLiveLoginNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+        if (self.navigationController.topViewController == self) {
+            [self.navigationController popViewControllerAnimated:YES];
+        }else{
+            [self dismissViewControllerAnimated:YES completion:nil];
+        }
+        
+    }else if ([actionEvents isEqualToString:@"2"]){
+        
+    }
 }
 @end
@@ -13,19 +13,12 @@
 #import "CNUserInfoManager.h"
-//#import "UIView+Layout.h"
-//#import "UIImage+Bundle.h"
-//#import "XWColorHeader.h"
-//#import <XWUserCenter/XWUserCenter.h>
-//#import "XWAlertView.h"
-//#import "XWAlertController.h"
+#import <AVFoundation/AVCaptureDevice.h>
+#import <AVFoundation/AVMediaFormat.h>
+#import "XFCameraController.h"
+#import "TZImagePickerController.h"
-//#import "NSString+Validation.h"
-//#import <ZLPhotoBrowser/ZLPhotoBrowser.h>
-//#import <ZLPhotoBrowser/ZLCustomCamera.h>
-//#import "XWLoginNotification.h"
-
-@interface CNLiveCompleteInfoView()<UITextFieldDelegate>{
+@interface CNLiveCompleteInfoView()<UITextFieldDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,QMUIAlertControllerDelegate>{
     UIImage *_image;
 }
@@ -55,8 +48,8 @@ static const NSInteger timeValue = 1.5;
     head.layer.cornerRadius = 40;
     head.layer.masksToBounds = YES;
     head.adjustsImageWhenHighlighted = NO;
-    UIImage *image1 = [self xw_getImageName:@"login_camera" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
-    [head setImage:image1 forState:UIControlStateNormal];
+    UIImage *image = [self xw_getImageName:@"login_camera" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    [head setImage:image forState:UIControlStateNormal];
     [head addTarget:self action:@selector(headDidClicked:) forControlEvents:UIControlEventTouchUpInside];
     [self addSubview:head];
     self.head = head;
@@ -149,92 +142,85 @@ static const NSInteger timeValue = 1.5;
 #pragma mark - Action
 - (void)headDidClicked:(UIButton *)btn{
     btn.userInteractionEnabled = NO;
-//    NSArray *optionArray = @[@"从相册中选择",@"相机"];
-//    XWActionSheetView *sheetView = [[XWActionSheetView alloc] initWithOptions:optionArray select:^(NSInteger index) {
-//        NSLog(@"%@",optionArray[index]);
-//        if(index == 0){
-//            // 相册
-//            ZLPhotoActionSheet *ac = [[ZLPhotoActionSheet alloc] init];
-//            // 相册参数配置，configuration有默认值，可直接使用并对其属性进行修改
-//            ac.configuration.maxSelectCount = 1;
-//            ac.configuration.maxPreviewCount = 10;
-//            //如调用的方法无sender参数，则该参数必传
-//            ac.sender = (UIViewController *)self.delegate;
-//            __weak typeof(self) weakSelf = self;
-//            [ac setSelectImageBlock:^(NSArray<UIImage *> * _Nonnull images, NSArray<PHAsset *> * _Nonnull assets, BOOL isOriginal) {
-//                __strong typeof(weakSelf) strongSelf = weakSelf;
-//                if(!strongSelf) return;
-//                strongSelf->_image = images[0];
-//                [strongSelf.head setImage:images[0] forState:UIControlStateNormal];
-//
-//            }];
-//            [ac showPreviewAnimated:YES];
-//
-//        }else if (index == 1){
-//            // 相机
-//            ZLCustomCamera *camera = [[ZLCustomCamera alloc] init];
-//            camera.allowTakePhoto = YES;
-//            __weak typeof(self) weakSelf = self;
-//            camera.doneBlock = ^(UIImage *image, NSURL *videoUrl) {
-//                __strong typeof(weakSelf) strongSelf = weakSelf;
-//                if(!strongSelf) return;
-//                strongSelf->_image = image;
-//                [strongSelf.head setImage:image forState:UIControlStateNormal];
-//
-//            };
-//            [(UIViewController *)self.delegate showDetailViewController:camera sender:nil];
-//        }
-//        btn.userInteractionEnabled = YES;
-//
-//    } cancel:^{
-//        btn.userInteractionEnabled = YES;
-//        NSLog(@"取消");
-//
-//    }];
-//    [sheetView show];
-//    XWAlertController *alertController = [XWAlertController alertControllerWithTitle:@"" message:@"" preferredStyle:XWAlertControllerStyleActionSheet];
-//    alertController.needDialogBlur = NO;
-//    XWAlertAction *action1 = [XWAlertAction actionWithTitle:@"从相册中选择" style:XWAlertActionStyleDefault handler:^(XWAlertAction * _Nonnull action) {
-//        ZLPhotoActionSheet *ac = [[ZLPhotoActionSheet alloc] init];
-//        // 相册参数配置，configuration有默认值，可直接使用并对其属性进行修改
-//        ac.configuration.maxSelectCount = 1;
-//        ac.configuration.maxPreviewCount = 10;
-//        //如调用的方法无sender参数，则该参数必传
-//        ac.sender = (UIViewController *)self.delegate;
-//        __weak typeof(self) weakSelf = self;
-//        [ac setSelectImageBlock:^(NSArray<UIImage *> * _Nonnull images, NSArray<PHAsset *> * _Nonnull assets, BOOL isOriginal) {
-//            __strong typeof(weakSelf) strongSelf = weakSelf;
-//            if(!strongSelf) return;
-//            strongSelf->_image = images[0];
-//            [strongSelf.head setImage:images[0] forState:UIControlStateNormal];
-//
-//        }];
-//        [ac showPreviewAnimated:YES];
-//        btn.userInteractionEnabled = YES;
-//    }];
-//    XWAlertAction *action2 = [XWAlertAction actionWithTitle:@"相机" style:XWAlertActionStyleDefault handler:^(XWAlertAction * _Nonnull action) {
-//        // 相机
-//        ZLCustomCamera *camera = [[ZLCustomCamera alloc] init];
-//        camera.allowTakePhoto = YES;
-//        __weak typeof(self) weakSelf = self;
-//        camera.doneBlock = ^(UIImage *image, NSURL *videoUrl) {
-//            __strong typeof(weakSelf) strongSelf = weakSelf;
-//            if(!strongSelf) return;
-//            strongSelf->_image = image;
-//            [strongSelf.head setImage:image forState:UIControlStateNormal];
-//
-//        };
-//        [(UIViewController *)weakSelf.delegate presentViewController:camera animated:YES completion:nil];
-//        btn.userInteractionEnabled = YES;
-//    }];
-//
-//    XWAlertAction *action3 = [XWAlertAction actionWithTitle:@"取消" style:XWAlertActionStyleCancel handler:^(XWAlertAction * _Nonnull action) {
-//        btn.userInteractionEnabled = YES;
-//    }];
-//    [alertController addAction:action1];
-//    [alertController addAction:action3]; // 取消按钮一定排在最底部
-//    [alertController addAction:action2];
-//    [(UIViewController *)self.delegate presentViewController:alertController animated:YES completion:^{}];
+    __weak typeof(self) weakSelf = self;
+    QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"拍照" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+        btn.userInteractionEnabled = YES;
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        __strong typeof(strongSelf) weakSelf = strongSelf;
+        [strongSelf getAVAuthorizationStatus:^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            XFCameraController *cameraController = [[XFCameraController alloc] init];
+            cameraController.isCanShootVideo = NO;
+            cameraController.modalPresentationStyle = UIModalPresentationFullScreen;
+            __weak XFCameraController *weakCameraController = cameraController;
+            __weak typeof(strongSelf) weakSelf = strongSelf;
+            cameraController.takePhotosCompletionBlock = ^(UIImage *image, NSError *error) {
+                __strong typeof(weakSelf) strongSelf = weakSelf;
+                if(!strongSelf) return ;
+                strongSelf->_image = image;
+                [strongSelf.head setImage:image forState:UIControlStateNormal];
+               
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [weakCameraController dismissViewControllerAnimated:YES completion:nil];
+                });
+            };
+            [(UIViewController *)self.delegate presentViewController:cameraController animated:YES completion:nil];
+        }];
+
+    }];
+    QMUIAlertAction *action2 = [QMUIAlertAction actionWithTitle:@"从手机相册中选择" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+        btn.userInteractionEnabled = YES;
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        __strong typeof(strongSelf) weakSelf = strongSelf;
+        [strongSelf getPHAuthorizationStatus:^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            TZImagePickerController *picker = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:strongSelf];
+            picker.modalPresentationStyle = UIModalPresentationFullScreen;
+            picker.allowPickingVideo = NO;
+            picker.allowPreview = NO;
+            __weak typeof(strongSelf) weakSelf = strongSelf;
+            [picker setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+                __strong typeof(weakSelf) strongSelf = weakSelf;
+                if(!strongSelf) return ;
+                strongSelf->_image = [photos firstObject];
+                [strongSelf.head setImage:[photos firstObject] forState:UIControlStateNormal];
+            }];
+            [(UIViewController *)strongSelf.delegate presentViewController:picker animated:YES completion:nil];
+        }];
+
+    }];
+    QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"取消" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+          __strong typeof(weakSelf) strongSelf = weakSelf;
+          if(!strongSelf) return ;
+
+      }];
+           
+    QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"" message:@"" preferredStyle:QMUIAlertControllerStyleActionSheet];
+    alertController.delegate = self;
+    [alertController addAction:action1];
+    [alertController addAction:action2];
+    [alertController addAction:cancel];
+    
+    NSMutableDictionary *titleAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
+           
+    titleAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+    
+    NSMutableDictionary *cancelAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
+    cancelAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
+
+    action1.buttonAttributes = titleAttributs;
+    action2.buttonAttributes = titleAttributs;
+    cancel.buttonAttributes = cancelAttributs;
+
+    [alertController showWithAnimated:YES];
+
+}
+- (void)didHideAlertController:(QMUIAlertController *)alertController{
+    self.head.userInteractionEnabled = YES;
 }
 - (void)nextDidClicked:(UIButton *)btn{
@@ -291,4 +277,92 @@ static const NSInteger timeValue = 1.5;
     return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
 }
+- (void)getAVAuthorizationStatus:(void (^)(void))block{
+    AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
+    if (device) {
+        AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+        switch (status) {
+            case AVAuthorizationStatusNotDetermined: {
+                [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL granted) {
+                    if (granted) {
+                        dispatch_sync(dispatch_get_main_queue(), ^{
+                            block();
+                        });
+                        NSLog(@"用户第一次同意了访问相机权限 - - %@", [NSThread currentThread]);
+                    } else {
+                        NSLog(@"用户第一次拒绝了访问相机权限 - - %@", [NSThread currentThread]);
+                    }
+                }];
+                break;
+            }
+            case AVAuthorizationStatusAuthorized: {
+                block();
+                break;
+            }
+            case AVAuthorizationStatusDenied: {
+                NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
+                NSString *app_Name = [infoDict objectForKey:@"CFBundleDisplayName"];
+                if (app_Name == nil) {
+                    app_Name = [infoDict objectForKey:@"CFBundleName"];
+                }
+                NSString *messageString = [NSString stringWithFormat:@"请在iPhone的\"设置 - 隐私 - 相机\"选项中,允许%@访问你的相机", app_Name];
+                UIAlertController *alertC = [UIAlertController alertControllerWithTitle:nil message:messageString preferredStyle:(UIAlertControllerStyleAlert)];
+                UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"好" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {
+                    
+                }];
+                
+                [alertC addAction:alertA];
+                [(UIViewController *)self.delegate presentViewController:alertC animated:YES completion:nil];
+                break;
+            }
+            case AVAuthorizationStatusRestricted: {
+                NSLog(@"因为系统原因, 无法访问相册");
+                break;
+            }
+                
+            default:
+                break;
+        }
+        return;
+    }
+    [QMUITips showError:@"未检测到您的摄像头" inView:self.superview hideAfterDelay:timeValue];
+}
+
+- (void)getPHAuthorizationStatus:(void (^)(void))block{
+    // 1.获取当前App的相册授权状态
+    PHAuthorizationStatus authorizationStatus = [PHPhotoLibrary authorizationStatus];
+    
+    // 2.判断授权状态
+    if (authorizationStatus == PHAuthorizationStatusAuthorized) {
+        // 2.1 如果已经授权, 保存图片(调用步骤2的方法)
+        block();
+        
+    } else if (authorizationStatus == PHAuthorizationStatusNotDetermined) { // 如果没决定, 弹出指示框, 让用户选择
+        [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
+            // 如果用户选择授权, 则保存图片
+            if (status == PHAuthorizationStatusAuthorized) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    block();
+                });
+            }
+        }];
+        
+    } else {
+        NSDictionary *infoDict = [[NSBundle mainBundle] infoDictionary];
+        NSString *app_Name = [infoDict objectForKey:@"CFBundleDisplayName"];
+        if (app_Name == nil) {
+            app_Name = [infoDict objectForKey:@"CFBundleName"];
+        }
+        NSString *messageString = [NSString stringWithFormat:@"请在iPhone的\"设置 - 隐私 - 相机\"选项中,允许%@访问你的相册", app_Name];
+        UIAlertController *alertC = [UIAlertController alertControllerWithTitle:nil message:messageString preferredStyle:(UIAlertControllerStyleAlert)];
+        UIAlertAction *alertA = [UIAlertAction actionWithTitle:@"好" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {
+            
+        }];
+        
+        [alertC addAction:alertA];
+        [(UIViewController *)self.delegate presentViewController:alertC animated:YES completion:nil];
+    }
+}
+
+
 @end
+//
+//  CNLiveLoginNavigationBar.m
+//  CNLiveLoginModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@class CNLiveLoginNavigationBar;
+
+@protocol CNLiveLoginNavigationBarDelegate <NSObject>
+- (void)navigationBar:(CNLiveLoginNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents;
+
+@end
+
+@interface CNLiveLoginNavigationBar : UIView
+@property (nonatomic, weak) id<CNLiveLoginNavigationBarDelegate> delegate;
+@property (nonatomic, strong) UIView *navView;
+@property (nonatomic, strong) UIButton *left;
+@property (nonatomic, strong) UILabel *title;
+@property (nonatomic, strong, nullable) UIButton *right;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveLoginNavigationBar.m
+//  CNLiveLoginModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright © 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveLoginNavigationBar.h"
+#import "QMUIKit.h"
+
+@interface CNLiveLoginNavigationBar ()
+
+@end
+
+@implementation CNLiveLoginNavigationBar
+static const NSInteger margin = 15;
+
+- (instancetype)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    if(self){
+        self.userInteractionEnabled = YES;
+        self.backgroundColor = [UIColor clearColor];
+        [self createSubViews];
+    }
+    return self;
+}
+
+- (void)dealloc {
+    NSLog(@"CNLiveSettingNavigationBar -- dealloc");
+}
+
+- (void)createSubViews {
+    [self addSubview:self.navView];
+    [self addSubview:self.left];
+    [self addSubview:self.title];
+    [self addSubview:self.right];
+}
+
+/*
+ // Only override drawRect: if you perform custom drawing.
+ // An empty implementation adversely affects performance during animation.
+ - (void)drawRect:(CGRect)rect {
+ // Drawing code
+ }
+ */
+
+#pragma mark - 懒加载
+- (UIView *)navView {
+    if (!_navView) {
+        _navView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, NavigationContentTop)];
+        _navView.backgroundColor = [UIColor clearColor];
+    }
+    return _navView;
+}
+
+- (UIButton *)left {
+    if (!_left) {
+        _left= [UIButton buttonWithType:UIButtonTypeCustom];
+        _left.adjustsImageWhenHighlighted = NO;
+        _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
+        UIImage *image = [self xw_getImageName:@"mine_back_black_b" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+        [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
+        _left.titleLabel.font = [UIFont systemFontOfSize:15];
+        [_left setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
+        [_left addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _left;
+}
+
+- (UILabel *)title {
+    if (!_title) {
+        _title = [[UILabel alloc] initWithFrame:CGRectMake(margin+NavigationBarHeight, StatusBarHeight, SCREEN_WIDTH-2*(margin+NavigationBarHeight), NavigationBarHeight)];
+        [_title setFont:[UIFont systemFontOfSize:18]];
+        _title.textColor = [UIColor blackColor];
+        _title.textAlignment = NSTextAlignmentCenter;
+    }
+    return _title;
+}
+
+- (UIButton *)right {
+    if (!_right) {
+        _right = [UIButton buttonWithType:UIButtonTypeCustom];
+        _right.frame = CGRectMake(SCREEN_WIDTH-NavigationBarHeight-margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
+        [_right setContentHorizontalAlignment:UIControlContentHorizontalAlignmentRight];
+        _right.adjustsImageWhenHighlighted = NO;
+        _right.titleLabel.font = [UIFont systemFontOfSize:15];
+        [_right setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_right addTarget:self action:@selector(rightDidClicked:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _right;
+}
+
+#pragma mark - 响应方法
+- (void)goBack{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(navigationBar:actionEvents:)]) {
+        [self.delegate navigationBar:self actionEvents:@"1"];
+    }
+}
+- (void)rightDidClicked:(UIButton *)btn{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(navigationBar:actionEvents:)]) {
+        [self.delegate navigationBar:self actionEvents:@"2"];
+    }
+}
+
+/**
+ *  创建图片
+ *
+ *  @param imageName 图片名字
+ *  @param bundleName 图片所在的bundle名字
+ *  @param targetClass 类和bundle的同级目录
+ *  @return 返回UIImage
+ */
+- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
+    NSBundle *bundle = [NSBundle bundleForClass:targetClass];
+    NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
+    NSBundle *targetBundle = [NSBundle bundleWithURL:url];
+    UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
+    return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
+    
+}
+
+@end
@@ -331,6 +331,11 @@ static const NSInteger timeValue = 1.5;
         if(!strongSelf) return;
         [QMUITips hideAllToastInView:strongSelf.superview animated:YES];
         [QMUITips showError:[errorDic objectForKey:@"errorMessage"] inView:strongSelf.superview hideAfterDelay:timeValue];
+        // YES 新用户   NO 老用户
+        BOOL isNewUser = YES;
+        if (self.delegate && [self.delegate respondsToSelector:@selector(loginSuccess:isNewUser:result:)]) {
+            [self.delegate loginSuccess:self isNewUser:isNewUser result:nil];
+        }
     }];
 }
@@ -369,34 +369,54 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveLoginModule_Example/Pods-CNLiveLoginModule_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveAVCamera/CNLiveAVCamera.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveUploadManager/CNLiveUploadManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserAgreementManager/CNLiveUserAgreementManager.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+				"${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework",
+				"${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/YYKit/YYKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveAVCamera.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveImagePickerController.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUploadManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserAgreementManager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYKit.framework",
 			);
@@ -2,6 +2,19 @@
 <!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>NSCameraUsageDescription</key>
+    <string>App需要您的同意,才能访问相机</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>App需要您的同意,才能访问麦克风</string>
+    <key>NSPhotoLibraryAddUsageDescription</key>
+    <string>App需要您的同意,才能访问相册</string>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>App需要您的同意,才能访问相册</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -7,6 +7,10 @@ platform :ios, &#39;9.0&#39;
 target 'CNLiveLoginModule_Example' do
   pod 'CNLiveLoginModule', :path => '../'
+  #依赖三方私有库,如果里面有.a的时候加上这个
+  pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+  end
+
   target 'CNLiveLoginModule_Tests' do
     inherit! :search_paths