no message

zhangxiaowen
1 parent 50cab8fa
Showing 6 changed files with 46 additions and 191 deletions
CNLiveIntegralModule.podspec
CNLiveIntegralModule/Classes/Controller/CNLiveIntegralDetailsController.m
CNLiveIntegralModule/Classes/Controller/CNLiveTaskListController.m
CNLiveIntegralModule/Classes/View/CNLiveIntegralNavigationBar.h
CNLiveIntegralModule/Classes/View/CNLiveIntegralNavigationBar.m
Example/CNLiveIntegralModule.xcodeproj/project.pbxproj
@@ -103,5 +103,8 @@ TODO: 网家家-积分模块.
   # 
   s.dependency 'CNLiveCustomUI'
+  
+  # 自定义控件
+  s.dependency 'CNLiveCustomControl'
 end
@@ -22,14 +22,14 @@
 #import "CNLiveRefreshFooter.h"
 #import "CNLiveCategory.h"
 #import "CNLiveBaseKit.h"
+#import "CNLiveNavigationBar.h"
 #import "CNLiveIntegralDetailsTableViewCell.h"
 #import "CNLiveScoreModel.h"
-#import "CNLiveIntegralNavigationBar.h"
-@interface CNLiveIntegralDetailsController ()<UITableViewDelegate,UITableViewDataSource,CNLiveIntegralNavigationBarDelegate>
+@interface CNLiveIntegralDetailsController ()<UITableViewDelegate,UITableViewDataSource>
-@property (nonatomic, strong) CNLiveIntegralNavigationBar *navigationBar;
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -128,7 +128,6 @@
 - (void)createUI {
     [self.view addSubview:self.navigationBar];
     [self.view addSubview:self.tableView];
-    
 }
 /*
@@ -171,26 +170,24 @@
  }
  */
-#pragma mark - CNLiveIntegralNavigationBarDelegate
-- (void)navigationBar:(CNLiveIntegralNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if([actionEvents isEqualToString:@"1"]){
-        [self.navigationController popViewControllerAnimated:YES];
-    }else if([actionEvents isEqualToString:@"2"]){
-        [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementIntegralRules];
-    }
-}
-
 #pragma mark - Lazy loading
-- (CNLiveIntegralNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveIntegralNavigationBar alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.backgroundColor = [UIColor whiteColor];
-        _navigationBar.delegate = self;
+        _navigationBar = [CNLiveNavigationBar navigationBar];
         _navigationBar.title.text = @"积分明细";
-        [_navigationBar.right setTitle:@"积分规则" forState:UIControlStateNormal];
+        _navigationBar.rightTitle = @"积分规则";
         [_navigationBar.right setTitleColor:[UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0] forState:UIControlStateNormal];
         _navigationBar.right.titleLabel.font = [UIFont systemFontOfSize:16.0];
         _navigationBar.right.frame = CGRectMake(SCREEN_WIDTH-80-15, StatusBarHeight, 80, NavigationBarHeight);
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf.navigationController popViewControllerAnimated:YES];
+        };
+        _navigationBar.onClickRightButton = ^{
+            [CNLiveUserAgreementManager jumpToAgreementH5WithType:CNLiveUserAgreementIntegralRules];
+        };
     }
     return _navigationBar;
 }
@@ -35,18 +35,18 @@
 //#import "CNFirendNewListViewController.h"//生活圈
 //#import "CNReportAndComplaintWebController.h"//帮助与反馈
 //#import "CNGifFaceListHeaderView.h"
+#import "CNLiveNavigationBar.h"
+
 #import "CNLiveTaskListHeaderView.h"
 #import "CNLiveIntegralDetailsController.h"//积分明细
 #import "CNLiveAddScoreManager.h"
 @interface CNLiveTaskListController ()<UITableViewDelegate,UITableViewDataSource,CNLiveTaskListTableViewCellDelegate,CNLiveTaskListHeaderViewDelegate>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) CNLiveTaskListHeaderView *headView;
 @property (nonatomic, strong) NSMutableArray *data;
-@property (nonatomic, strong) UIButton *backButton;
-@property (nonatomic, strong) UILabel *titleLabel;
-
 @end
 @implementation CNLiveTaskListController
@@ -217,9 +217,8 @@
 #pragma mark - UI
 - (void)createUI {
-    [self.headView addSubview:self.backButton];
-    [self.headView addSubview:self.titleLabel];
     [self.view addSubview:self.headView];
+    [self.view addSubview:self.navigationBar];
     [self.view addSubview:self.tableView];
 }
@@ -321,37 +320,8 @@
  */
 #pragma mark - Action
-- (void)backDidClicked:(UIButton *)btn{
-    [self.navigationController popViewControllerAnimated:YES];
-
-}
 #pragma mark - Lazy loading
-- (UIButton *)backButton {
-    if (!_backButton) {
-        _backButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        _backButton.adjustsImageWhenHighlighted = NO;
-        _backButton.frame = CGRectMake(15, StatusBarHeight, 44, 44);
-        [_backButton setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
-        UIImage *image = [self getImageWithImageName:@"mine_back_white_b" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
-        [_backButton setImage:image forState:UIControlStateNormal];
-        [_backButton addTarget:self action:@selector(backDidClicked:) forControlEvents:UIControlEventTouchUpInside];
-    }
-    return _backButton;
-}
-
-- (UILabel *)titleLabel{
-    if (!_titleLabel) {
-        _titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, StatusBarHeight, 120, 44)];
-        _titleLabel.centerX = self.view.centerX;
-        _titleLabel.text = @"任务列表";
-        _titleLabel.font = [UIFont systemFontOfSize:18.0];
-        _titleLabel.textColor = [UIColor whiteColor];
-        _titleLabel.textAlignment = NSTextAlignmentCenter;
-    }
-    return _titleLabel;
-}
-
 - (UITableView *)tableView {
     if (!_tableView) {
         _tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
@@ -386,9 +356,30 @@
     return _headView;
 }
+- (CNLiveNavigationBar *)navigationBar {
+    if (!_navigationBar) {
+        _navigationBar = [CNLiveNavigationBar navigationBar];
+        _navigationBar.backgroundColor = [UIColor clearColor];
+        UIImage *image = [self getImageWithImageName:@"cnlive_back_white_b" bundleName:@"CNLiveCustomControl" targetClass:[CNLiveNavigationBar class]];
+        _navigationBar.leftImage = image;
+
+        _navigationBar.title.text = @"任务列表";
+        _navigationBar.title.textColor = [UIColor whiteColor];
+        _navigationBar.lineHidden = YES;
+                
+        __weak typeof(self) weakSelf = self;
+        _navigationBar.onClickLeftButton = ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+             if(!strongSelf) return ;
+            [strongSelf.navigationController popViewControllerAnimated:YES];
+        };
+
+    }
+    return _navigationBar;
+}
+
 - (UIStatusBarStyle)preferredStatusBarStyle{
     return UIStatusBarStyleLightContent;
 }
-
 @end
-//
-//  CNLiveIntegralNavigationBar.h
-//  CNLiveIntegralModule
-//
-//  Created by 153993236@qq.com on 11/12/2019.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class CNLiveIntegralNavigationBar;
-
-@protocol CNLiveIntegralNavigationBarDelegate <NSObject>
-- (void)navigationBar:(CNLiveIntegralNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents;
-
-@end
-
-@interface CNLiveIntegralNavigationBar : UIView
-@property (nonatomic, weak) id<CNLiveIntegralNavigationBarDelegate> 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
-//
-//  CNLiveIntegralNavigationBar.m
-//  CNLiveIntegralModule
-//
-//  Created by 153993236@qq.com on 11/12/2019.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveIntegralNavigationBar.h"
-#import "QMUIKit.h"
-#import "CNLiveCategory.h"
-
-@interface CNLiveIntegralNavigationBar ()
-
-@end
-
-@implementation CNLiveIntegralNavigationBar
-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(@"CNLiveIntegralNavigationBar -- 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, SCREEN_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:@"code_back_black_b" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
-        [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
-        [_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-50-margin, StatusBarHeight, 50, 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
-
@@ -332,6 +332,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}/CNLiveIntegralModule/CNLiveIntegralModule.framework",
@@ -354,6 +355,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}/CNLiveIntegralModule.framework",