no message

zhangxiaowen
1 parent a28dcb4c
Showing 5 changed files with 16 additions and 149 deletions
CNLiveCollectionModule.podspec
CNLiveCollectionModule/Classes/Controller/CNLiveCollectionController.m
CNLiveCollectionModule/Classes/View/CNLiveCollectionNavigationBar.h
CNLiveCollectionModule/Classes/View/CNLiveCollectionNavigationBar.m
Example/CNLiveCollectionModule.xcodeproj/project.pbxproj
@@ -93,6 +93,9 @@ TODO: 网家家-我的模块.
   #
   s.dependency 'CNLiveCustomUI'
+  # 自定义控件
+  s.dependency 'CNLiveCustomControl'
+  
   s.dependency 'CNLiveCommonCategory'
   s.dependency 'CNLiveBaseKit'
@@ -15,14 +15,14 @@
 #import "CNLiveRefreshHeader.h"
 #import "CNLiveRefreshFooter.h"
-#import "CNLiveCollectionNavigationBar.h"
+#import "CNLiveNavigationBar.h"
 #import "CNLiveCollectionCell.h"
 #import "CNLiveCollectionModel.h"
 #import "CNLiveCollectionRequest.h"
-@interface CNLiveCollectionController ()<UITableViewDelegate, UITableViewDataSource,CNLiveCollectionNavigationBarDelegate,CNLiveCollectionCellDelegate>
-@property (nonatomic, strong) CNLiveCollectionNavigationBar *navigationBar;
+@interface CNLiveCollectionController ()<UITableViewDelegate, UITableViewDataSource, CNLiveCollectionCellDelegate>
+@property (nonatomic, strong) CNLiveNavigationBar *navigationBar;
 @property (nonatomic, strong) UITableView *tableView;
 @property (nonatomic, strong) NSMutableArray *data;
@@ -188,13 +188,6 @@ static const CGFloat timeValue = 1.5;
     }];
 }
-#pragma mark - CNLiveCollectionNavigationBarDelegate
-- (void)navigationBar:(CNLiveCollectionNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }
-}
-
 #pragma mark - 懒加载
 - (NSMutableArray *)data {
     if (!_data) {
@@ -232,11 +225,16 @@ static const CGFloat timeValue = 1.5;
     }
     return _tableView;
 }
-- (CNLiveCollectionNavigationBar *)navigationBar {
+- (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveCollectionNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
-        _navigationBar.delegate = self;
+        _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;
 }
-//
-//  CNLiveCollectionNavigationBar.m
-//  CNLiveCollectionModule
-//
-//  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 CNLiveCollectionNavigationBar;
-
-@protocol CNLiveCollectionNavigationBarDelegate <NSObject>
-- (void)navigationBar:(CNLiveCollectionNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents;
-
-@end
-
-@interface CNLiveCollectionNavigationBar : UIView
-@property (nonatomic, weak) id<CNLiveCollectionNavigationBarDelegate> 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
-//
-//  CNLiveCollectionNavigationBar.m
-//  CNLiveCollectionModule
-//
-//  Created by 153993236@qq.com on 11/12/2019.
-//  Copyright © 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveCollectionNavigationBar.h"
-#import "QMUIKit.h"
-#import "CNLiveCategory.h"
-
-@interface CNLiveCollectionNavigationBar ()
-
-@end
-
-@implementation CNLiveCollectionNavigationBar
-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 whiteColor];
-    }
-    return _navView;
-}
-
-- (UIButton *)left {
-    if (!_left) {
-        _left= [UIButton buttonWithType:UIButtonTypeCustom];
-        _left.adjustsImageWhenHighlighted = NO;
-        _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
-        UIImage *image = [self getImageWithImageName:@"collection_back_black_b" bundleName:@"CNLiveCollectionModule" 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"];
-    }
-}
-
-@end
@@ -356,6 +356,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveCollectionModule/CNLiveCollectionModule.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.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",
@@ -378,6 +379,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCollectionModule.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}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveManager.framework",