no message

zhangxiaowen
1 parent 0dfb42b9
Showing 12 changed files with 131 additions and 317 deletions
CNLiveBalanceModule.podspec
CNLiveBalanceModule/Classes/Controller/CNLiveBalanceController.m
CNLiveBalanceModule/Classes/Detail/CNLiveBalanceDetailController.m
CNLiveBalanceModule/Classes/PayCenter/CNLivePayCenterController.m
CNLiveBalanceModule/Classes/PayManager/CNLiveChangePayPasswordController.m
CNLiveBalanceModule/Classes/PayManager/CNLivePayManagerController.m
CNLiveBalanceModule/Classes/TradingRecord/CNLiveMonthBillController.m
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordController.m
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailController.m
CNLiveBalanceModule/Classes/View/CNLiveBalanceNavigationBar.h
CNLiveBalanceModule/Classes/View/CNLiveBalanceNavigationBar.m
Example/CNLiveBalanceModule.xcodeproj/project.pbxproj
@@ -120,6 +120,9 @@ TODO: 网家家-余额模块.
   #
   s.dependency 'CNLiveCustomUI'
+  # 自定义控件
+  s.dependency 'CNLiveCustomControl'
+  
   s.static_framework = true
 end
@@ -15,15 +15,15 @@
 #import "CNLiveBaseKit.h"
 #import "CNLiveServices.h"
 #import "CNLiveCategory.h"
+#import "CNLiveNavigationBar.h"
 #import "CNLiveBalanceRequest.h"
-#import "CNLiveBalanceNavigationBar.h"
 #import "CNLiveBalanceView.h"
 #import "CNLivePayCenterController.h"
 #import "CNLiveBalanceDetailController.h"
-@interface CNLiveBalanceController ()<CNLiveBalanceNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
+@interface CNLiveBalanceController ()
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveBalanceView *balanceView;
 @property (nonatomic, copy) NSString *type;
@@ -80,26 +80,6 @@
 }
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-        
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-        if ([self.type isEqualToString:@"1"]) { // 支付中心
-            CNLivePayCenterController *vc = [CNLivePayCenterController new];
-            [self.navigationController pushViewController:vc animated:YES];
-            
-        } else if ([self.type isEqualToString:@"2"]) { // 明细
-            CNLiveBalanceDetailController *vc = [CNLiveBalanceDetailController new];
-            vc.ID = self.ID;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
-    
-    }
-}
-
 #pragma mark - 响应方法
 - (void)goBack {
     if (self.presentingViewController != nil) {
@@ -111,21 +91,50 @@
 }
 #pragma mark - 懒加载
-- (CNLiveBalanceNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveBalanceNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
+        _navigationBar.backgroundColor = [UIColor clearColor];
+        _navigationBar.title.textColor = [UIColor whiteColor];
+
+        UIImage *image = [self getImageWithImageName:@"cnlive_back_white_b" bundleName:@"CNLiveCustomControl" targetClass:[CNLiveNavigationBar class]];
+        _navigationBar.leftImage = image;
+        
         if([self.type isEqualToString:@"1"]){
             // 个人余额
             _navigationBar.title.text = @"中国网家家补贴余额";
             UIImage *image = [self getImageWithImageName:@"balance_pay_center" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
-            [_navigationBar.right setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
+            _navigationBar.rightImage = image;
         }else if ([self.type isEqualToString:@"2"]){
             // 特色群组
             _navigationBar.title.text = @"余额";
-            [_navigationBar.right setTitle:@"明细" forState:UIControlStateNormal];
+            _navigationBar.rightTitle = @"明细";
+            [_navigationBar.right setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         }
+        
+        _navigationBar.lineHidden = YES;
+
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
+        _navigationBar.onClickRightButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            if ([strongSelf.type isEqualToString:@"1"]) { // 支付中心
+                CNLivePayCenterController *vc = [CNLivePayCenterController new];
+                [strongSelf.navigationController pushViewController:vc animated:YES];
+                
+            } else if ([strongSelf.type isEqualToString:@"2"]) { // 明细
+                CNLiveBalanceDetailController *vc = [CNLiveBalanceDetailController new];
+                vc.ID = strongSelf.ID;
+                [strongSelf.navigationController pushViewController:vc animated:YES];
+            }
+
+        };
     }
     return _navigationBar;
 }
@@ -12,12 +12,12 @@
 #import "CNLiveBaseKit.h"
 #import "CNLiveCategory.h"
 #import "JXCategoryView.h"
+#import "CNLiveNavigationBar.h"
-#import "CNLiveBalanceNavigationBar.h"
 #import "CNLiveBalanceDetailBaseController.h"
-@interface CNLiveBalanceDetailController ()<CNLiveBalanceNavigationBarDelegate,JXCategoryViewDelegate,JXCategoryListContainerViewDelegate>
-@property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
+@interface CNLiveBalanceDetailController ()<JXCategoryViewDelegate,JXCategoryListContainerViewDelegate>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) JXCategoryTitleView *titleCategoryView;
 @property (nonatomic, strong) JXCategoryListContainerView *listContainerView;
 @property (nonatomic, strong) NSArray *titles;
@@ -58,21 +58,6 @@ static const CGFloat height = 44;
 }
-#pragma mark - 懒加载
-- (CNLiveBalanceNavigationBar *)navigationBar {
-    if (!_navigationBar) {
-        _navigationBar = [[CNLiveBalanceNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
-        _navigationBar.title.text = @"明细";
-        _navigationBar.title.textColor = [UIColor blackColor];
-        UIImage *image = [self getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
-        [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-        _navigationBar.right = nil;
-    }
-    return _navigationBar;
-}
-
 #pragma mark - JXCategoryViewDelegate
 - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index {
     //侧滑手势处理
@@ -90,14 +75,6 @@ static const CGFloat height = 44;
     return self.titles.count;
 }
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-        
-    }
-}
-
 #pragma mark - 响应方法
 - (void)goBack {
     if (self.presentingViewController != nil) {
@@ -109,6 +86,20 @@ static const CGFloat height = 44;
 }
 #pragma mark - 懒加载
+- (CNLiveNavigationBar *)navigationBar {
+    if (!_navigationBar) {
+        _navigationBar = [CNLiveNavigationBar navigationBar];
+        _navigationBar.title.text = @"明细";
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
+    }
+    return _navigationBar;
+}
+
 - (UIView *)tline {
     if (!_tline) {
         _tline = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop, self.view.bounds.size.width, 0.5)];
@@ -12,15 +12,15 @@
 #import "CNLiveCategory.h"
 #import "CNUserInfoManager.h"
+#import "CNLiveNavigationBar.h"
-#import "CNLiveBalanceNavigationBar.h"
 #import "CNLiveBalanceModel.h"
 #import "CNLivePayCenterCell.h"
 #import "CNLiveTradingRecordController.h" // 交易记录
 #import "CNLivePayManagerController.h"// 支付管理
-@interface CNLivePayCenterController ()<UITableViewDelegate, UITableViewDataSource,CNLiveBalanceNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
+@interface CNLivePayCenterController ()<UITableViewDelegate, UITableViewDataSource>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -115,17 +115,16 @@
     }
     return _data;
 }
-- (CNLiveBalanceNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveBalanceNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"支付中心";
-        _navigationBar.title.textColor = [UIColor blackColor];
-        UIImage *image = [self getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
-        [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-        _navigationBar.right = nil;
-
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
     }
     return _navigationBar;
 }
@@ -154,13 +153,4 @@
     }
 }
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
-
 @end
@@ -15,12 +15,12 @@
 #import "CNLiveBaseKit.h"
 #import "CNLiveServices.h"
 #import "CNLiveCategory.h"
+#import "CNLiveNavigationBar.h"
 #import "CNLiveBalanceRequest.h"
-#import "CNLiveBalanceNavigationBar.h"
-@interface CNLiveChangePayPasswordController ()<CNLiveBalanceNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
+@interface CNLiveChangePayPasswordController ()
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveChangePayPasswordView *changePayPasswordView;
 @property (nonatomic, assign) CNLiveChangePayPasswordType type;
@@ -60,16 +60,16 @@
 }
 #pragma mark - 懒加载
-- (CNLiveBalanceNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveBalanceNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.delegate = self;
-        _navigationBar.backgroundColor = [UIColor whiteColor];
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"修改支付密码";
-        _navigationBar.title.textColor = [UIColor blackColor];
-        UIImage *image = [self getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
-        [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-        _navigationBar.right = nil;
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
     }
     return _navigationBar;
 }
@@ -91,11 +91,4 @@
     }
 }
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }
-}
-
 @end
@@ -11,14 +11,14 @@
 #import "QMUIKit.h"
 #import "CNLiveCategory.h"
+#import "CNLiveNavigationBar.h"
-#import "CNLiveBalanceNavigationBar.h"
 #import "CNLiveBalanceModel.h"
 #import "CNLivePayCenterCell.h"
 #import "CNLiveChangePayPasswordController.h"
-@interface CNLivePayManagerController ()<UITableViewDelegate, UITableViewDataSource,CNLiveBalanceNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
+@interface CNLivePayManagerController ()<UITableViewDelegate, UITableViewDataSource>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -103,17 +103,17 @@
     }
     return _data;
 }
-- (CNLiveBalanceNavigationBar *)navigationBar {
+
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveBalanceNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"支付管理";
-        _navigationBar.title.textColor = [UIColor blackColor];
-        UIImage *image = [self getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
-        [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-        _navigationBar.right = nil;
-
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
     }
     return _navigationBar;
 }
@@ -141,13 +141,4 @@
     }
 }
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
-
 @end
@@ -18,18 +18,17 @@
 #import "CNLiveBaseKit.h"
 #import "CNLiveCategory.h"
 #import "CNLiveRefreshHeader.h"
-
 #import "CNLiveServices.h"
-#import "CNLiveBalanceRequest.h"
+#import "CNLiveNavigationBar.h"
-#import "CNLiveBalanceNavigationBar.h"
+#import "CNLiveBalanceRequest.h"
 #import "CNLiveMonthBillView.h"
 #import "CNLiveTradingRecordModel.h"
 #import "CNLiveTradingRecordCell.h"
 #import "CNLiveTradingRecordDetailController.h"
-@interface CNLiveMonthBillController ()<UITableViewDelegate, UITableViewDataSource,CNLiveBalanceNavigationBarDelegate,CNLiveMonthBillViewDelegate>
-@property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
+@interface CNLiveMonthBillController ()<UITableViewDelegate, UITableViewDataSource,CNLiveMonthBillViewDelegate>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveMonthBillView *monthBillView;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -176,17 +175,16 @@ static const CGFloat height = 60;
     }
     return _data;
 }
-- (CNLiveBalanceNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveBalanceNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"月账单";
-        _navigationBar.title.textColor = [UIColor blackColor];
-        UIImage *image = [self getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
-        [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-        _navigationBar.right = nil;
-
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
     }
     return _navigationBar;
 }
@@ -224,13 +222,4 @@ static const CGFloat height = 60;
     }
 }
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
-
 @end
@@ -19,17 +19,19 @@
 #import "CNLiveRefreshHeader.h"
 #import "CNLiveServices.h"
+#import "CNLiveNavigationBar.h"
+
+
 #import "CNLiveBalanceRequest.h"
-#import "CNLiveBalanceNavigationBar.h"
 #import "CNLiveTradingRecordView.h"
 #import "CNLiveMonthBillController.h" //月账单
 #import "CNLiveTradingRecordModel.h"
 #import "CNLiveTradingRecordCell.h"
 #import "CNLiveTradingRecordDetailController.h"
-@interface CNLiveTradingRecordController ()<UITableViewDelegate, UITableViewDataSource,CNLiveBalanceNavigationBarDelegate,CNLiveTradingRecordViewDelegate>
-@property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
+@interface CNLiveTradingRecordController ()<UITableViewDelegate, UITableViewDataSource,CNLiveTradingRecordViewDelegate>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) CNLiveTradingRecordView *tradingRecordView;
 @property (nonatomic, strong) UITableView *tableView;
@@ -197,17 +199,16 @@ static const CGFloat height = 80;
     }
     return _data;
 }
-- (CNLiveBalanceNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveBalanceNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"交易记录";
-        _navigationBar.title.textColor = [UIColor blackColor];
-        UIImage *image = [self getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
-        [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-        _navigationBar.right = nil;
-
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
     }
     return _navigationBar;
 }
@@ -247,13 +248,4 @@ static const CGFloat height = 80;
     }
 }
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
-
 @end
@@ -18,9 +18,9 @@
 #import "CNLiveCategory.h"
 #import "CNLiveServices.h"
-#import "CNLiveBalanceRequest.h"
+#import "CNLiveNavigationBar.h"
-#import "CNLiveBalanceNavigationBar.h"
+#import "CNLiveBalanceRequest.h"
 #import "CNLiveTradingRecordView.h"
 #import "CNLiveTradingRecordModel.h"
 #import "CNLiveTradingRecordDetailModel.h"
@@ -28,8 +28,8 @@
 #import "CNLiveTradingRecordDetailHeaderView.h"
 #import "CNLiveTradingRecordController.h"
-@interface CNLiveTradingRecordDetailController ()<UITableViewDelegate, UITableViewDataSource,CNLiveBalanceNavigationBarDelegate>
-@property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
+@interface CNLiveTradingRecordDetailController ()<UITableViewDelegate, UITableViewDataSource>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) CNLiveTradingRecordDetailHeaderView *headerView;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -153,20 +153,20 @@ static const CGFloat height = 80;
     return _data;
 }
-- (CNLiveBalanceNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveBalanceNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"交易记录";
-        _navigationBar.title.textColor = [UIColor blackColor];
-        UIImage *image = [self getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
-        [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-        _navigationBar.right = nil;
-
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf goBack];
+        };
     }
     return _navigationBar;
 }
+
 - (UITableView *)tableView{
     if(!_tableView){
         _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop) style:UITableViewStylePlain];
@@ -198,13 +198,4 @@ static const CGFloat height = 80;
     }
 }
-#pragma mark - CNLiveBalanceNavigationBarDelegate
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }else if ([actionEvents isEqualToString:@"2"]){
-        
-    }
-}
-
 @end
-//
-//  CNLiveBalanceNavigationBar.m
-//  CNLiveBalanceModule
-//
-//  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 CNLiveBalanceNavigationBar;
-
-@protocol CNLiveBalanceNavigationBarDelegate <NSObject>
-- (void)navigationBar:(CNLiveBalanceNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents;
-
-@end
-
-@interface CNLiveBalanceNavigationBar : UIView
-@property (nonatomic, weak) id<CNLiveBalanceNavigationBarDelegate> 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
-//
-//  CNLiveBalanceNavigationBar.m
-//  CNLiveBalanceModule
-//
-//  Created by 153993236@qq.com on 11/12/2019.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveBalanceNavigationBar.h"
-#import "QMUIKit.h"
-#import "CNLiveCategory.h"
-
-@interface CNLiveBalanceNavigationBar ()
-
-@end
-
-@implementation CNLiveBalanceNavigationBar
-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(@"CNLiveBalanceNavigationBar -- 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_white_b" bundleName:@"CNLiveBalanceModule" 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 whiteColor];
-        _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
@@ -333,6 +333,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCustomControl/CNLiveCustomControl.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveManager/CNLiveManager.framework",
@@ -356,6 +357,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomControl.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",