no message

zhangxiaowen
1 parent 25066c26
Showing 6 changed files with 101 additions and 60 deletions
CNLiveIntegralModule/Classes/Controller/CNLiveTaskListController.m
CNLiveIntegralModule/Classes/Module/CNLiveIntegralService.m
CNLiveIntegralModule/Classes/View/CNLiveTaskListHeadView.h → CNLiveIntegralModule/Classes/View/CNLiveTaskListHeaderView.h
CNLiveIntegralModule/Classes/View/CNLiveTaskListHeadView.m → CNLiveIntegralModule/Classes/View/CNLiveTaskListHeaderView.m
CNLiveIntegralModule/Classes/View/CNLiveTaskListSectionHeaderView.h
CNLiveIntegralModule/Classes/View/CNLiveTaskListSectionHeaderView.m
@@ -15,8 +15,8 @@
 #import "CNLiveServices.h"
-//#import "CNLiveMineNavigationBar.h"
 #import "CNLiveTaskListTableViewCell.h"
+#import "CNLiveTaskListSectionHeaderView.h"
 #import "CNLiveTaskListModel.h"
 #import "CNLiveGoldWhereaboutsView.h"//金币下落
 #import "CNLiveAddScoreView.h"
@@ -35,16 +35,16 @@
 //#import "CNFirendNewListViewController.h"//生活圈
 //#import "CNReportAndComplaintWebController.h"//帮助与反馈
 //#import "CNGifFaceListHeaderView.h"
-#import "CNLiveTaskListHeadView.h"
+#import "CNLiveTaskListHeaderView.h"
 #import "CNLiveIntegralDetailsController.h"//积分明细
 #import "CNLiveAddScoreManager.h"
 //#import "CNTouristsLoginTipsView.h"
 //#import "CNWebRedirectHandle.h"
 //@interface CNLiveTaskListController ()<UITableViewDelegate,UITableViewDataSource,CNTaskListTableViewCellDelegate,CNLiveTaskListHeadViewDelegate,TouristsLoginTipsViewDelegate>
-@interface CNLiveTaskListController ()<UITableViewDelegate,UITableViewDataSource,CNLiveTaskListTableViewCellDelegate,CNLiveTaskListHeadViewDelegate>
+@interface CNLiveTaskListController ()<UITableViewDelegate,UITableViewDataSource,CNLiveTaskListTableViewCellDelegate,CNLiveTaskListHeaderViewDelegate>
 @property (nonatomic, strong) UITableView *tableView;
-@property (nonatomic, strong) CNLiveTaskListHeadView *headView;
+@property (nonatomic, strong) CNLiveTaskListHeaderView *headView;
 @property (nonatomic, strong) NSMutableArray *data;
 @property (nonatomic, strong) UIButton *backButton;
@@ -364,24 +364,23 @@
 }
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
     NSArray *arr = @[@"每日任务",@"首次任务"];
-    UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 45)];
-    view.backgroundColor = [UIColor whiteColor];
-    UILabel *title = [[UILabel alloc]initWithFrame:CGRectMake(15, 0, SCREEN_WIDTH-30, 45)];
-    title.text = arr[section];
-    title.textColor = [UIColor blackColor];
-    title.font = [UIFont systemFontOfSize:16.0];
-    [view addSubview:title];
-    return view;
+    CNLiveTaskListSectionHeaderView *header = [tableView  dequeueReusableHeaderFooterViewWithIdentifier:kCNLiveTaskListSectionHeaderView];
+    header.text = arr[section];
+    return header;
 }
+- (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
+    return nil;
+}
+
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
-    return 0.000001;  // 注意要设置为0.1，不能设置为0
+    return 0.1;  // 注意要设置为0.1，不能设置为0
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
     return 45.0;  // 注意要设置为0.1，不能设置为0
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 40+30;
+    return 70;
 }
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -390,33 +389,11 @@
 }
 #pragma mark - CNLiveTaskListHeadViewDelegate
-- (void)clickedDetailButton:(CNLiveTaskListHeadView *)view{
+- (void)clickedDetailButton:(CNLiveTaskListHeaderView *)view{
     CNLiveIntegralDetailsController *vc = [[CNLiveIntegralDetailsController alloc] init];
     [self.navigationController pushViewController:vc animated:YES];
 }
-#pragma mark - TouristsLoginTipsViewDelegate
-//- (void)touristsLoginTipsView:(CNTouristsLoginTipsView *)view isClassify:(NSString *)isClassify{
-//    if([isClassify isEqualToString:@"close"]){
-//        //隐藏TouristsLoginTipsView
-//        [self.fuzzyView removeFromSuperview];
-//
-//    }else if([isClassify isEqualToString:@"jump"]){
-//        //进入频道管理页面
-//        [self.fuzzyView removeFromSuperview];
-//        CNTabBarViewController *tabbarController = (CNTabBarViewController *)[AppDelegate sharedAppDelegate].window.rootViewController;
-//        tabbarController.selectedIndex = 1;
-//        //分类
-//        CNNavigationController *nav = tabbarController.childViewControllers[1];
-//        CNClassifySegmentController *vc = nav.childViewControllers[0];
-//
-//        if([vc isKindOfClass:[CNClassifySegmentController class]]){
-//            [vc customAction:nil];
-//
-//        }
-//
-//    }
-//
-//}
+
 /*
  #pragma mark - Navigation
@@ -470,6 +447,8 @@
         _tableView.showsHorizontalScrollIndicator = NO;
         _tableView.bounces = NO;
         [_tableView registerClass:[CNLiveTaskListTableViewCell class] forCellReuseIdentifier:kCNLiveTaskListTableViewCell];
+        [_tableView registerClass:[CNLiveTaskListSectionHeaderView class] forHeaderFooterViewReuseIdentifier:kCNLiveTaskListSectionHeaderView];
+        
     }
     return _tableView;
 }
@@ -481,9 +460,9 @@
     return _data;
 }
-- (CNLiveTaskListHeadView *)headView{
+- (CNLiveTaskListHeaderView *)headView{
     if (!_headView) {
-        _headView = [[CNLiveTaskListHeadView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop+SCREEN_WIDTH*100/375.0)];
+        _headView = [[CNLiveTaskListHeaderView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop+SCREEN_WIDTH*100/375.0)];
         UIImage *image = [self xw_getImageName:@"integrate_list_bg" bundleName:@"CNLiveIntegralModule" targetClass:[CNLiveTaskListController class]];
         _headView.image = image;
         _headView.delegate = self;
@@ -491,16 +470,6 @@
     return _headView;
 }
-//- (CNTouristsLoginTipsView *)fuzzyView{
-//    if (!_fuzzyView) {
-//        _fuzzyView = [[CNTouristsLoginTipsView alloc] initWithFrame:[UIApplication sharedApplication].keyWindow.bounds];
-//        _fuzzyView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.6];
-//        _fuzzyView.delegate = self;
-//    }
-//    return _fuzzyView;
-//
-//}
-
 - (UIImage *)navigationBarBackgroundImage{
     return [UIImage imageWithColor:[UIColor clearColor]];
 }
@@ -7,6 +7,9 @@
 //
 #import "CNLiveIntegralService.h"
+
+#import "MJExtension.h"
+
 #import "CNLiveServices.h"
 // 任务列表
 //
-//  CNLiveTaskListHeadView.h
+//  CNLiveTaskListHeaderView.h
 //  CNLiveIntegralModule
 //
 //  Created by CNLive-zxw on 2019/2/28.
@@ -9,13 +9,13 @@
 #import <UIKit/UIKit.h>
 NS_ASSUME_NONNULL_BEGIN
-@class CNLiveTaskListHeadView;
-@protocol CNLiveTaskListHeadViewDelegate <NSObject>
-- (void)clickedDetailButton:(CNLiveTaskListHeadView *)view;
+@class CNLiveTaskListHeaderView;
+@protocol CNLiveTaskListHeaderViewDelegate <NSObject>
+- (void)clickedDetailButton:(CNLiveTaskListHeaderView *)view;
 @end
-@interface CNLiveTaskListHeadView : UIImageView
-@property (nonatomic, weak) id<CNLiveTaskListHeadViewDelegate> delegate;
+@interface CNLiveTaskListHeaderView : UIImageView
+@property (nonatomic, weak) id<CNLiveTaskListHeaderViewDelegate> delegate;
 @property (nonatomic, copy) NSString *score;
 @end
 //
-//  CNLiveTaskListHeadView.m
+//  CNLiveTaskListHeaderView.m
 //  CNLiveIntegralModule
 //
 //  Created by CNLive-zxw on 2019/2/28.
 //  Copyright © 2019年 cnlive. All rights reserved.
 //
-#import "CNLiveTaskListHeadView.h"
+#import "CNLiveTaskListHeaderView.h"
 #import "QMUIKit.h"
 #import <Masonry/Masonry.h>
 #import <SDWebImage/SDWebImage.h>
 #import "CNUserInfoManager.h"
-@interface CNLiveTaskListHeadView()
+@interface CNLiveTaskListHeaderView()
 @property (nonatomic, strong) UIImageView *headView;
 @property (nonatomic, strong) UILabel *currentScore;
 @property (nonatomic, strong) UILabel *getScore;
@@ -21,7 +21,7 @@
 @end
-@implementation CNLiveTaskListHeadView
+@implementation CNLiveTaskListHeaderView
 static const NSInteger margin = 15;
 #pragma mark - Init
 - (instancetype)initWithFrame:(CGRect)frame {
+//
+//  CNLiveTaskListSectionHeaderView.h
+//  CNLiveIntegralModule
+//
+//  Created by CNLive-zxw on 2019/11/19.
+//
+
+#import <UIKit/UIKit.h>
+
+#define kCNLiveTaskListSectionHeaderView @"CNLiveTaskListSectionHeaderView"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveTaskListSectionHeaderView : UITableViewHeaderFooterView
+@property (nonatomic, copy) NSString *text;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveTaskListSectionHeaderView.m
+//  CNLiveIntegralModule
+//
+//  Created by CNLive-zxw on 2019/2/20.
+//  Copyright © 2019年 cnlive. All rights reserved.
+//
+
+#import "CNLiveTaskListSectionHeaderView.h"
+#import "QMUIKit.h"
+
+@interface CNLiveTaskListSectionHeaderView()
+/** 内部的label */
+@property (nonatomic, weak) UILabel *label;
+
+@end
+
+@implementation CNLiveTaskListSectionHeaderView
+static const NSInteger margin = 15;
+
+- (instancetype)initWithReuseIdentifier:(NSString *)reuseIdentifier{
+    if (self = [super initWithReuseIdentifier:reuseIdentifier]) {
+        self.contentView.backgroundColor = [UIColor whiteColor];
+        
+        UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(margin, 0, 200, 45)];
+        label.textColor = [UIColor blackColor];
+        label.font = UIFontMake(16);
+        label.backgroundColor = [UIColor whiteColor];
+        [self.contentView addSubview:label];
+        self.label = label;
+        
+    }
+    return self;
+}
+
+
+- (void)setText:(NSString *)text{
+    self.label.text = text;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+