no message

zhangxiaowen
1 parent 5b1cc58e
Showing 11 changed files with 101 additions and 265 deletions
CNLiveSettingModule.podspec
CNLiveSettingModule/Classes/AboutUs/CNLiveAboutUsController.m
CNLiveSettingModule/Classes/BackgroundImage/CNLiveBackgroundImageController.m
CNLiveSettingModule/Classes/Cancellation/CNLiveCancellationController.m
CNLiveSettingModule/Classes/Controller/CNLiveSettingController.m
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingController.m
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyController.m
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelController.m
CNLiveSettingModule/Classes/View/CNLiveSettingNavigationBar.h
CNLiveSettingModule/Classes/View/CNLiveSettingNavigationBar.m
Example/CNLiveSettingModule.xcodeproj/project.pbxproj
@@ -159,6 +159,9 @@ TODO: 网家家-设置模块.
  
   # 分类
   s.dependency 'CNLiveCategory'
+  
+  # 自定义控件
+  s.dependency 'CNLiveCustomControl'
  
   s.static_framework = true
  
@@ -15,14 +15,14 @@
 #import "CNLiveEnvironment.h"
 #import "CNLiveCategory.h"
 #import "CNLiveBaseKit.h"
+#import "CNLiveNavigationBar.h"
  
 #import "CNLiveSettingModel.h"
 #import "CNLiveSettingCell.h"
-#import "CNLiveSettingNavigationBar.h"
  
 @interface CNLiveAboutUsController ()
-<UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
+<UITableViewDelegate, UITableViewDataSource>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) UIView *headerView;
 @property (nonatomic, strong) UIView *footerView;
@@ -231,13 +231,16 @@ static const NSInteger timeValue = 1.5;
     return _data;
 }
  
-- (CNLiveSettingNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveSettingNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = [NSString stringWithFormat:@"关于%@",DisplayName];
-        _navigationBar.right = nil;
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
     }
     return _navigationBar;
 }
@@ -266,7 +269,7 @@ static const NSInteger timeValue = 1.5;
         _headerView.clipsToBounds = YES;
         _headerView.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
         UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-70)/2.0, 30, 70, 140)];
-        UIImage *image = [self getImageWithImageName:@"about_us_icon" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar class]];
+        UIImage *image = [self getImageWithImageName:@"about_us_icon" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
         imageView.image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         imageView.contentMode = UIViewContentModeScaleAspectFill;
         imageView.clipsToBounds = YES;
@@ -306,13 +309,4 @@ static const NSInteger timeValue = 1.5;
     }
 }
  
-#pragma mark - CNLiveSettingNavigationBarDelegate
-- (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
-
 @end
@@ -19,14 +19,14 @@
 #import "CNLiveSettingModel.h"
 #import "CNLiveSettingCell.h"
 #import "CNLiveServices.h"
-#import "CNLiveSettingNavigationBar.h"
+#import "CNLiveNavigationBar.h"
 #import "CNLiveBaseKit.h"
  
 @interface CNLiveBackgroundImageController ()
-<UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate>{
+<UITableViewDelegate, UITableViewDataSource,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate>{
     UIImage *_selectedImage;// 当 isSettingAll为 YES 才需要用到
 }
-@property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) UIButton *setting;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -159,13 +159,16 @@ static const NSInteger timeValue = 1.5;
     return _data;
 }
  
-- (CNLiveSettingNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveSettingNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"聊天背景";
-        _navigationBar.right = nil;
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
     }
     return _navigationBar;
 }
@@ -299,14 +302,5 @@ static const NSInteger timeValue = 1.5;
     });
 }
  
-#pragma mark - CNLiveSettingNavigationBarDelegate
-- (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
-
  
 @end
@@ -15,15 +15,15 @@
 #import "CNLiveEnvironment.h"
 #import "CNUserInfoManager.h"
  
-#import "CNLiveSettingNavigationBar.h"
+#import "CNLiveNavigationBar.h"
 #import "CNLiveCancellationView.h"
  
 //#import "CNIntegralRulesViewController.h"
 //#import "CNMineHomeController.h"
 #import "CNLiveUserAgreementManager.h"
  
-@interface CNLiveCancellationController ()<WKNavigationDelegate,WKUIDelegate,CNLiveCancellationViewDelegate,CNLiveSettingNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
+@interface CNLiveCancellationController ()<WKNavigationDelegate,WKUIDelegate,CNLiveCancellationViewDelegate>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, weak) WKWebView *webView;
 @property (nonatomic, weak) CNLiveCancellationView *cancellationView;
  
@@ -243,25 +243,20 @@ static const NSInteger timeValue = 1.5;
 */
  
 #pragma mark - 懒加载
-- (CNLiveSettingNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveSettingNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"审核申请";
-        _navigationBar.right = nil;
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
     }
     return _navigationBar;
 }
  
-#pragma mark - CNLiveSettingNavigationBarDelegate
-- (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
 #pragma mark - 响应方法
 - (void)goBack {
     if (self.presentingViewController != nil) {
@@ -17,7 +17,7 @@
 #import "CNLiveSettingModel.h"
 #import "CNLiveSettingCell.h"
 #import "CNLiveServices.h"
-#import "CNLiveSettingNavigationBar.h"
+#import "CNLiveNavigationBar.h"
  
 #import "CNLiveUpdateTelController.h"//修改手机号
 #import "CNLivePrivacyController.h"//隐私
@@ -28,8 +28,8 @@
 #import "CNLiveBaseKit.h"
  
 @interface CNLiveSettingController ()
-<UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
+<UITableViewDelegate, UITableViewDataSource>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) UIButton *logout;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -274,13 +274,14 @@ static const NSInteger timeValue = 1.5;
     return _data;
 }
  
-- (CNLiveSettingNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveSettingNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"设置";
-        _navigationBar.right = nil;
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            [weakSelf goBack];
+        };
     }
     return _navigationBar;
 }
@@ -376,13 +377,4 @@ static const NSInteger timeValue = 1.5;
     }];
 }
  
-#pragma mark - CNLiveSettingNavigationBarDelegate
-- (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
-
 @end
@@ -12,14 +12,14 @@
 #import "CNLiveBaseKit.h"
 #import "CNUserInfoManager.h"
 #import "CNLiveCategory.h"
+#import "CNLiveNavigationBar.h"
  
-#import "CNLiveSettingNavigationBar.h"
 #import "CNLiveFontSettingFrame.h"
 #import "CNLiveFontSettingModel.h"
 #import "CNLiveFontSettingCell.h"
  
-@interface CNLiveFontSettingController ()<UITableViewDelegate, UITableViewDataSource, CNLiveSettingNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
+@interface CNLiveFontSettingController ()<UITableViewDelegate, UITableViewDataSource>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *data;
  
@@ -157,21 +157,6 @@
     return FontSettingFrame.cellHeight;
 }
  
-#pragma mark - CNLiveSettingNavigationBarDelegate
-- (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [[NSUserDefaults standardUserDefaults] setInteger:tempCoefficient forKey:@"CNSizeFontCoefficient"];
-        
-    }else if ([actionEvents isEqualToString:@"2"]){
-        NSInteger temp = [[NSUserDefaults standardUserDefaults] integerForKey:@"CNSizeFontCoefficient"];
-        if (temp != tempCoefficient) {
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"CNFONTSIZECHANGE" object:nil];
-        }
-    }
-    [self goBack];
-    
-}
-
 #pragma mark - 懒加载
 - (NSMutableArray *)data{
     if (_data == nil) {
@@ -191,20 +176,35 @@
     return _tableView;
 }
  
-- (CNLiveSettingNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveSettingNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
-        [_navigationBar.left setTitle:@"取消" forState:UIControlStateNormal];
-        [_navigationBar.left setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+        _navigationBar = [CNLiveNavigationBar navigationBar];
+        _navigationBar.leftTitle = @"取消";
         [_navigationBar.left setImage:nil forState:UIControlStateNormal];
         _navigationBar.title.text = @"设置字体大小";
         _navigationBar.left.titleLabel.font = [UIFont systemFontOfSize:17.0];
         _navigationBar.right.titleLabel.font = [UIFont systemFontOfSize:17.0];
-        [_navigationBar.right setTitle:@"完成" forState:UIControlStateNormal];
-        [_navigationBar.right setTitleColor:[UIColor colorWithRed:31/255.0 green:185/255.0 blue:34/255.0 alpha:1.0] forState:UIControlStateNormal];          
+        _navigationBar.rightTitle = @"完成";
+        [_navigationBar.right setTitleColor:[UIColor colorWithRed:31/255.0 green:185/255.0 blue:34/255.0 alpha:1.0] forState:UIControlStateNormal];
         [_navigationBar.right setTitleColor:[UIColor colorWithRed:63/255.0 green:109/255.0 blue:61/255.0 alpha:1.0] forState:UIControlStateSelected];
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [[NSUserDefaults standardUserDefaults] setInteger:strongSelf->tempCoefficient forKey:@"CNSizeFontCoefficient"];
+            [strongSelf goBack];
+
+        };
+        _navigationBar.onClickRightButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            NSInteger temp = [[NSUserDefaults standardUserDefaults] integerForKey:@"CNSizeFontCoefficient"];
+            if (temp != strongSelf->tempCoefficient) {
+                [[NSNotificationCenter defaultCenter] postNotificationName:@"CNFONTSIZECHANGE" object:nil];
+            }
+            [strongSelf goBack];
+
+        };
     }
     return _navigationBar;
 }
@@ -15,8 +15,8 @@
 #import "CNLiveNetworking.h"
 #import "CNLiveEnvironment.h"
 #import "CNUserInfoManager.h"
+#import "CNLiveNavigationBar.h"
  
-#import "CNLiveSettingNavigationBar.h"
 #import "CNLivePrivacyCell.h"
 #import "CNLivePrivacyHeaderView.h"
 #import "CNLivePrivacyModel.h"
@@ -25,8 +25,8 @@
 #import "CNLiveUserDefaultsModel.h"
 #import "CNLivePrivacyRequest.h"
  
-@interface CNLivePrivacyController ()<UITableViewDelegate,UITableViewDataSource,CNLiveSettingNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
+@interface CNLivePrivacyController ()<UITableViewDelegate,UITableViewDataSource>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
  
 @property (nonatomic, strong) CNLivePrivacyModel *model;
@@ -189,13 +189,6 @@
  
 }
  
-#pragma mark - CNLiveSettingNavigationBarDelegate
-- (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }
-}
-
 #pragma mark - Action
 - (void)goBack {
     if (self.presentingViewController != nil) {
@@ -207,13 +200,18 @@
 }
  
 #pragma mark - Lazy loading
-- (CNLiveSettingNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveSettingNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"隐私";
-        _navigationBar.right = nil;
+                
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
+
     }
     return _navigationBar;
 }
@@ -18,12 +18,12 @@
 #import "CNLiveCategory.h"
 #import "CNLiveBaseKit.h"
  
-#import "CNLiveSettingNavigationBar.h"
+#import "CNLiveNavigationBar.h"
 #import "CNLiveUpdateTelView.h"
  
-@interface CNLiveUpdateTelController()<UITextFieldDelegate, CNLiveSettingNavigationBarDelegate, CNLiveUpdateTelViewDelegate, ChooseCountriesDelegate>
+@interface CNLiveUpdateTelController()<UITextFieldDelegate, CNLiveUpdateTelViewDelegate, ChooseCountriesDelegate>
  
-@property (nonatomic, strong) CNLiveSettingNavigationBar *navigationBar;
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveUpdateTelView *updateTel;//背景
 @property (nonatomic, strong) YYLabel *connection;
  
@@ -55,8 +55,7 @@ static const NSInteger timeValue = 1.5;
           __strong typeof(weakSelf) strongSelf = weakSelf;
           if(!strongSelf) return ;
           [strongSelf.navigationController popViewControllerAnimated:YES];
-
-      }];
+    }];
  
     QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"更换手机号将只能使用新绑定的手机号登录app，是否继续修改？" message:@"" preferredStyle:QMUIAlertControllerStyleAlert];
     [alertController addAction:sure];
@@ -86,7 +85,7 @@ static const NSInteger timeValue = 1.5;
 - (void)xw_layoutSubviews{
     [self.updateTel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.equalTo(self.view);
-        make.top.equalTo(self.view).offset(NavigationContentTop+1);
+        make.top.equalTo(self.view).offset(NavigationContentTop);
         make.height.mas_equalTo(220);
     }];
     [self.connection mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -126,13 +125,17 @@ static const NSInteger timeValue = 1.5;
 }
  
 #pragma mark - Lazy Loading
-- (CNLiveSettingNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveSettingNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"更换手机号";
-        _navigationBar.right = nil;
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf.navigationController popViewControllerAnimated:YES];
+        };
+
     }
     return _navigationBar;
 }
@@ -203,13 +206,4 @@ static const NSInteger timeValue = 1.5;
 }
 */
  
-#pragma mark - CNLiveSettingNavigationBarDelegate
-- (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self.navigationController popViewControllerAnimated:YES];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
-
 @end
-//
-//  CNLiveSettingNavigationBar.m
-//  CNLiveSettingModule
-//
-//  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 CNLiveSettingNavigationBar;
-
-@protocol CNLiveSettingNavigationBarDelegate <NSObject>
-- (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents;
-
-@end
-
-@interface CNLiveSettingNavigationBar : UIView
-@property (nonatomic, weak) id<CNLiveSettingNavigationBarDelegate> 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
-//
-//  CNLiveSettingNavigationBar.m
-//  CNLiveSettingModule
-//
-//  Created by 153993236@qq.com on 11/12/2019.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveSettingNavigationBar.h"
-#import "QMUIKit.h"
-#import "CNLiveCategory.h"
-
-@interface CNLiveSettingNavigationBar ()
-
-@end
-
-@implementation CNLiveSettingNavigationBar
-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 getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar 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"];
-    }
-}
-
-@end
@@ -360,6 +360,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveImagePickerController/CNLiveImagePickerController.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
@@ -389,6 +390,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.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",