0.0.4

liushiyu
1 parent 429d3f5f
Showing 18 changed files with 167 additions and 68 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteAnnouListViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteDetaiListlViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteTaskListViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteTaskViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteViewController.m
CNLiveCMineModule/Classes/inte/Model/CNLiveCMineInteModel.h
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteCollectionViewCell.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteDetailHeaderView.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderCustomView.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderSignView.h
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderSignView.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderView.h
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderView.m
CNLiveCMineModule/Classes/inte/ViewModel/CNLiveCMineInteViewModel.h
CNLiveCMineModule/Classes/inte/ViewModel/CNLiveCMineInteViewModel.m
Example/CNLiveCMineModule/CNLIVEViewController.m
Example/CNLiveCMineModule/CNLiveCMineViewModuleImpl.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.0.3'
+  s.version          = '0.0.4'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -87,9 +87,11 @@
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     CNLiveCMineInteListSubModel * annouModel = self.annouModel.list[indexPath.row];
-    BOOL isCont = [annouModel.shareUrl cn_containsString:@"?"];
-    NSString * shreUrl = [NSString stringWithFormat:@"%@%@contentId=%@",annouModel.shareUrl,isCont?@"&":@"?",annouModel.contentId];
-    [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:shreUrl statue:CNLiveCMineIntePushWebViewStatueAnnotationDetail];
+    if ([annouModel.model isEqualToString:@"3"] || [annouModel.model isEqualToString:@"3_roof"]) {
+        BOOL isCont = [annouModel.shareUrl cn_containsString:@"?"];
+        NSString * shreUrl = [NSString stringWithFormat:@"%@%@contentId=%@",annouModel.shareUrl,isCont?@"&":@"?",annouModel.contentId];
+        [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:shreUrl statue:CNLiveCMineIntePushWebViewStatueAnnotationDetail];
+    }
 }
 #pragma mark = getter
 - (CNLiveNavigationBar *)navigationBar {
@@ -37,8 +37,6 @@
     // Do any additional setup after loading the view.
     self.view.backgroundColor = kWhiteColor;
-    [self addMainRefreshView];
-    
     [self requestDataSourceWithPageNo:1 CurrentMonth:self.currentMonth CurrentType:self.currentType];
 }
@@ -48,15 +46,23 @@
     self.pageNo = pageNo;
     self.currentType = currentType;
     self.currentMonth = currentMonth;
-    [CNLiveCMineInteViewModel requestWithIntegraDetailWithCurrentMonth:currentMonth currentType:currentType pageNo:pageNo CompleterBlock:^(CNLiveCMineInteDetailModel * _Nonnull listModel) {
-        listModel.currentInte = weakSelf.currentInte;
-        weakSelf.listModel = listModel;
-        weakSelf.detailVC.headerView.detailModel = listModel;
-        [weakSelf.tableView reloadData];
-        [weakSelf.tableView.mj_footer endRefreshing];
-        [weakSelf.detailVC.pagingView.mainTableView.mj_header endRefreshing];
-        if (!listModel.hasNext) [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
-        weakSelf.tableView.mj_footer = listModel.integralList.count == 0 ? nil : weakSelf.footerView;
+    [CNLiveCMineInteViewModel requestWithIntegraDetailWithCurrentMonth:currentMonth currentType:currentType pageNo:pageNo CompleterBlock:^(CNLiveCMineInteDetailModel * _Nonnull listModel, NSError * _Nonnull error) {
+        [self addMainRefreshView];
+        if (!error && listModel) {
+            listModel.currentInte = weakSelf.currentInte;
+            weakSelf.listModel = listModel;
+            weakSelf.detailVC.headerView.detailModel = listModel;
+            [weakSelf.tableView reloadData];
+            [weakSelf.tableView.mj_footer endRefreshing];
+            [weakSelf.detailVC.pagingView.mainTableView.mj_header endRefreshing];
+            if (!listModel.hasNext) [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
+            weakSelf.tableView.mj_footer = listModel.integralList.count == 0 ? nil : weakSelf.footerView;
+        }else{
+            [weakSelf.detailVC.pagingView.mainTableView.mj_header endRefreshing];
+            [weakSelf.tableView.mj_footer endRefreshing];
+            weakSelf.tableView.mj_footer = nil;
+            [weakSelf.tableView reloadData];
+        }
     }];
 }
@@ -88,6 +94,7 @@
     self.tableView.emptyDataSetDelegate = self;
     self.tableView.showsVerticalScrollIndicator = NO;
     self.tableView.showsHorizontalScrollIndicator = NO;
+    self.tableView.backgroundColor = [UIColor whiteColor];
     self.tableView.tableFooterView = [[UIView alloc] init];
     self.tableView.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
 }
@@ -112,7 +119,7 @@
 - (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
 {
-    return 0;
+    return -65;
 }
 - (BOOL)emptyDataSetShouldDisplay:(UIScrollView *)scrollView
@@ -122,12 +129,12 @@
 - (BOOL)emptyDataSetShouldAllowTouch:(UIScrollView *)scrollView
 {
-    return NO;
+    return YES;
 }
 - (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
 {
-    return YES;
+    return NO;
 }
 #pragma mark =
@@ -8,7 +8,7 @@
 #import "CNLiveCMineInteTaskListViewController.h"
 #import "CNLiveCMineInteCollectionViewCell.h"
-@interface CNLiveCMineInteTaskListViewController ()
+@interface CNLiveCMineInteTaskListViewController ()<DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 @property (nonatomic, weak) CNLiveCMineInteTaskViewController * taskVC;
 @property (nonatomic, strong) NSArray * taskArray;//数据源
@@ -58,6 +58,8 @@
     [super initTableView];
     self.tableView.dataSource = self;
     self.tableView.delegate = self;
+    self.tableView.emptyDataSetSource = self;
+    self.tableView.emptyDataSetDelegate = self;
     self.tableView.backgroundColor = UIColorHex(0xf5f5f5);
     self.tableView.showsVerticalScrollIndicator = NO;
     self.tableView.showsHorizontalScrollIndicator = NO;
@@ -69,6 +71,39 @@
     [super layoutTableView];
     self.tableView.height = kScreenHeight - kNavigationBarHeight - 184;
 }
+#pragma mark - DZNEmptyDataSetSource Methods
+- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [[NSAttributedString alloc] initWithString:@"现在没有相关任务哦" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16]}];
+}
+-(UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [CNLiveCMineService imageWithMineName:@"c_mine_content_empty"];
+}
+- (UIColor *)backgroundColorForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return [UIColor whiteColor];
+}
+
+- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
+{
+    return 0;
+}
+
+- (BOOL)emptyDataSetShouldDisplay:(UIScrollView *)scrollView
+{
+    return YES;
+}
+
+- (BOOL)emptyDataSetShouldAllowTouch:(UIScrollView *)scrollView
+{
+    return YES;
+}
+
+- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
+{
+    return NO;
+}
 #pragma mark =
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -90,7 +90,11 @@ static NSInteger const kCNLiveSectionHeaderHeight = 140;//头视图高度
 -(UIStatusBarStyle)preferredStatusBarStyle
 {
-    return UIStatusBarStyleDefault;
+    if (@available(iOS 13.0, *)) {
+        return UIStatusBarStyleDarkContent;
+    } else {
+        return UIStatusBarStyleDefault;
+    }
 }
 #pragma mark =
 -(NSMutableArray<CNLiveCMineInteTaskListViewController *> *)viewControllers
@@ -74,7 +74,15 @@
     NSInteger addScore = [note.userInfo[@"score"] integerValue];
     NSInteger scored = [self.taskModel.integral integerValue];
     self.taskModel.integral = [NSString stringWithFormat:@"%ld",scored + addScore];
-    [self.headerView setupWithScoreModel:self.scoreModel taskModel:self.taskModel announModel:self.announModel];
+    [self.headerView setupWithScoreModel:self.scoreModel taskModel:self.taskModel announModel:self.announModel activModel:self.activModel];
+}
+-(UIStatusBarStyle)preferredStatusBarStyle
+{
+    if (@available(iOS 13.0, *)) {
+        return UIStatusBarStyleDarkContent;
+    } else {
+        return UIStatusBarStyleDefault;
+    }
 }
 #pragma mark - UICollectionViewDelegate,UICollectionViewDataSource
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
@@ -98,18 +106,18 @@
 }
 -(CGSize)collectionView:(UICollectionView*)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
 {
-    return CGSizeMake(kScreenWidth, 270);
+    return CGSizeMake(kScreenWidth, self.announModel ? 310 : 260);
 }
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString*)kind atIndexPath:(NSIndexPath*)indexPath {
     // 判断返回表头类型 还是表尾类型
     if([kind isEqualToString:UICollectionElementKindSectionHeader]) {
         CNLiveCMineInteHeaderView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:NSStringFromClass(CNLiveCMineInteHeaderView.class) forIndexPath:indexPath];
         headerView.backgroundColor= [UIColor clearColor];
-        [headerView setupWithScoreModel:self.scoreModel taskModel:self.taskModel announModel:self.announModel];
+        [headerView setupWithScoreModel:self.scoreModel taskModel:self.taskModel announModel:self.announModel activModel:self.activModel];
         __weak typeof(self) weakSelf = self;
         [headerView setClickActionBlock:^(CNLiveCMineInteScoreModel * _Nonnull scoreModel, CNLiveCMineInteTaskListModel * _Nonnull taskModel, CNLiveCMineInteListModel * _Nonnull announModel, CNLiveCMineInteHeaderClick headerClick) {
             if (headerClick == CNLiveCMineInteHeaderClickDetail) {
-                CNLiveCMineInteDetailViewController * inteView = [[CNLiveCMineInteDetailViewController alloc] initWithInte:taskModel.integral];
+                CNLiveCMineInteDetailViewController * inteView = [[CNLiveCMineInteDetailViewController alloc] initWithInte:!CNLiveStringIsEmpty(taskModel.integral)?taskModel.integral:@"0"];
                 [weakSelf.navigationController pushViewController:inteView animated:YES];
             } else if (headerClick == CNLiveCMineInteHeaderClickAnnotation) {
                 CNLiveCMineInteAnnouListViewController * annouView = [[CNLiveCMineInteAnnouListViewController alloc] initWithAnnouModel:announModel];
@@ -151,7 +159,7 @@
         _mainCollectionView.delegate = self;
         _mainCollectionView.dataSource = self;
         _mainCollectionView.backgroundColor = [UIColor clearColor];
-        _mainCollectionView.showsVerticalScrollIndicator = NO;
+        _mainCollectionView.showsVerticalScrollIndicator = YES;
         _mainCollectionView.showsHorizontalScrollIndicator = NO;
         [_mainCollectionView registerClass:[CNLiveCMineInteCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass(CNLiveCMineInteCollectionViewCell.class)];
         [_mainCollectionView registerClass:[CNLiveCMineInteHeaderView class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:NSStringFromClass(CNLiveCMineInteHeaderView.class)];
@@ -171,10 +171,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**是否有下一页*/
 @property (nonatomic, assign) BOOL hasNext;
 /**获取积分*/
-@property (nonatomic, assign) NSInteger obtainIntegral;
+@property (nonatomic, copy) NSString *obtainIntegral;
+
 @property (nonatomic, strong) NSArray<CNLiveCMineInteDetailListModel *> *integralList;
 /**支出积分*/
-@property (nonatomic, assign) NSInteger payIntegral;
+@property (nonatomic, copy) NSString *payIntegral;
 /**当前展示的日期 自定义的*/
 @property (nonatomic, copy) NSString *date_string;
 /**当前的总积分 自定义的*/
@@ -428,6 +428,7 @@
         _completeBtn.titleLabel.font = [UIFont systemFontOfSize:12];
         _completeBtn.titleLabel.font = [UIFont boldSystemFontOfSize:12];
         _completeBtn.spacingBetweenImageAndTitle = 0;
+        _completeBtn.userInteractionEnabled = NO;
         _completeBtn.backgroundColor = UIColorMakeWithRGBA(245, 166, 35, 0.1);
         _completeBtn.imagePosition = QMUIButtonImagePositionRight;
         [_completeBtn addTarget:self action:@selector(clickCompleteBtn:) forControlEvents:UIControlEventTouchUpInside];
@@ -31,23 +31,19 @@
 {
     _detailModel = detailModel;
-    NSMutableAttributedString * coin_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@积分",detailModel.currentInte]];
+    NSMutableAttributedString * coin_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@积分",[detailModel.currentInte isNotBlank]?detailModel.currentInte:@"0"]];
     [coin_string addAttribute:NSFontAttributeName value:UIFontCNMake(12) range:[coin_string.string rangeOfString:@"积分"]];
     [coin_string addAttribute:NSFontAttributeName value:UIFontBoldCNMake(35) range:NSMakeRange(0, [coin_string.string rangeOfString:@"积分"].location)];
     self.inteLabel.attributedText = coin_string;
-    NSMutableAttributedString * spend_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"获取 %ld",(long)detailModel.payIntegral]];
-    [spend_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:11] range:[spend_string.string rangeOfString:@"获取"]];
-    [spend_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, [spend_string.string rangeOfString:@"获取"].location)];
-    [spend_string addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:[spend_string.string rangeOfString:@"获取"]];
-    [spend_string addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0, [spend_string.string rangeOfString:@"获取"].location)];
+    NSMutableAttributedString * spend_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"获取:%@",[detailModel.payIntegral isNotBlank]?detailModel.payIntegral:@"0"]];
+    [spend_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:11] range:[spend_string.string rangeOfString:@"获取:"]];
+    [spend_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, [spend_string.string rangeOfString:@"获取:"].location)];
     self.spendLabel.attributedText = spend_string;
-    NSMutableAttributedString * obta_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"支出%ld",(long)detailModel.obtainIntegral]];
-    [obta_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:11] range:[obta_string.string rangeOfString:@"支出"]];
-    [obta_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, [obta_string.string rangeOfString:@"支出"].location)];
-    [obta_string addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:[obta_string.string rangeOfString:@"支出"]];
-    [obta_string addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0, [obta_string.string rangeOfString:@"支出"].location)];
+    NSMutableAttributedString * obta_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"支出:%@",[detailModel.obtainIntegral isNotBlank]?detailModel.obtainIntegral:@"0"]];
+    [obta_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:11] range:[obta_string.string rangeOfString:@"支出:"]];
+    [obta_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, [obta_string.string rangeOfString:@"支出:"].location)];
     self.obtaLabel.attributedText = obta_string;
     NSArray * array = [detailModel.date_string componentsSeparatedByString:@"-"];
@@ -84,6 +80,11 @@
         _inteLabel = [[UILabel alloc] init];
         _inteLabel.backgroundColor = [UIColor clearColor];
         _inteLabel.textColor = UIColorHex(#FFFFFF);
+        
+        NSMutableAttributedString * coin_string = [[NSMutableAttributedString alloc] initWithString:@"0积分"];
+        [coin_string addAttribute:NSFontAttributeName value:UIFontCNMake(12) range:[coin_string.string rangeOfString:@"积分"]];
+        [coin_string addAttribute:NSFontAttributeName value:UIFontBoldCNMake(35) range:NSMakeRange(0, [coin_string.string rangeOfString:@"积分"].location)];
+        _inteLabel.attributedText = coin_string;
     }
     return _inteLabel;
 }
@@ -93,6 +94,11 @@
         _spendLabel = [[UILabel alloc] init];
         _spendLabel.backgroundColor = [UIColor clearColor];
         _spendLabel.textColor = UIColorHex(#FFFFFF);
+        
+        NSMutableAttributedString * spend_string = [[NSMutableAttributedString alloc] initWithString:@"获取:0"];
+        [spend_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:11] range:[spend_string.string rangeOfString:@"获取:"]];
+        [spend_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, [spend_string.string rangeOfString:@"获取:"].location)];
+        _spendLabel.attributedText = spend_string;
     }
     return _spendLabel;
 }
@@ -102,6 +108,11 @@
         _obtaLabel = [[UILabel alloc] init];
         _obtaLabel.backgroundColor = [UIColor clearColor];
         _obtaLabel.textColor = UIColorHex(#FFFFFF);
+        
+        NSMutableAttributedString * obta_string = [[NSMutableAttributedString alloc] initWithString:@"支出:0"];
+        [obta_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:11] range:[obta_string.string rangeOfString:@"支出:"]];
+        [obta_string addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:12] range:NSMakeRange(0, [obta_string.string rangeOfString:@"支出:"].location)];
+        _obtaLabel.attributedText = obta_string;
     }
     return _obtaLabel;
 }
@@ -118,6 +129,12 @@
         _dateButton.imageEdgeInsets = UIEdgeInsetsMake(0, 2.5, 0, 2.5);
         _dateButton.imagePosition = QMUIButtonImagePositionLeft;
         [_dateButton addTarget:self action:@selector(pushDateSelectAction:) forControlEvents:UIControlEventTouchUpInside];
+        
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyy-MM"];
+        NSArray * dateArray = [[dateFormatter stringFromDate:[NSDate date]] componentsSeparatedByString:@"-"];
+        NSString * s = [NSString stringWithFormat:@"%@年%@月",dateArray.firstObject,dateArray.lastObject];
+        [_dateButton setTitle:s forState:UIControlStateNormal];
     }
     return _dateButton;
 }
@@ -105,14 +105,13 @@
         make.size.mas_equalTo(20);
         make.right.mas_equalTo(titleButton02.mas_left).offset(-5);
     }];
+
-    [UIView animateWithDuration:.5 animations:^{
+    [UIView animateWithDuration:.25 animations:^{
         headerView.height = 50;
     } completion:^(BOOL finished) {
-        if (finished) {
-            [headerView addSubview:tapView01];
-            [headerView addSubview:tapView02];
-        }
+        [headerView addSubview:tapView01];
+        [headerView addSubview:tapView02];
     }];
 }
@@ -16,9 +16,11 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param scoreModel 签到数据
 /// @param taskModel 任务数据
 /// @param announModel 公告数据
+/// @param announModel 任务数据
 -(void)setupWithScoreModel:(CNLiveCMineInteScoreModel *)scoreModel
                  taskModel:(CNLiveCMineInteTaskListModel *)taskModel
-               announModel:(CNLiveCMineInteListModel *)announModel;
+               announModel:(CNLiveCMineInteListModel *)announModel
+                activModel:(CNLiveCMineInteListModel *)activModel;
 /// 对点击结果进行响应
 @property (nonatomic, copy) ClickActionBlock clickActionBlock;
@@ -51,37 +51,39 @@
 }
 -(void)setupWithCoinsVeiw
 {
-    UIView * coinsView = [[UIView alloc] initWithFrame:CGRectMake(5, 40, SCREEN_WIDTH - 30, 70)];
+    UIView * coinsView = [[UIView alloc] initWithFrame:CGRectMake(5, 40, SCREEN_WIDTH - 30, 90)];
     coinsView.backgroundColor = [UIColor clearColor];
     [self.topView addSubview:coinsView];
     CGFloat item_w = (SCREEN_WIDTH - 60)/7;
+    CGFloat item_h = item_w * 1.33;
     for (int i = 0; i < 7; i++) {
-        UIView * temp_v = [[UIView alloc] initWithFrame:CGRectMake(i * (item_w + 5), 0, item_w, 70)];
+        UIView * temp_v = [[UIView alloc] initWithFrame:CGRectMake(i * (item_w + 5), 0, item_w, 90)];
         temp_v.backgroundColor = [UIColor clearColor];
         [coinsView addSubview:temp_v];
-        UIImageView * coinsV = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, item_w, 50)];
+        UIImageView * coinsV = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, item_w, item_h)];
         coinsV.image = [UIImage imageWithColor:[UIColor colorWithWhite:0 alpha:0.3]];
         coinsV.layer.masksToBounds = YES;
         coinsV.layer.cornerRadius = 5;
         [temp_v addSubview:coinsV];
         [self.coinsViews addObject:coinsV];
-        UIImageView * coins = [[UIImageView alloc] initWithFrame:CGRectMake((item_w - 30)/2, 5, 30, 30)];
+        UIImageView * coins = [[UIImageView alloc] initWithFrame:CGRectMake((item_w - 30)/2, 10, 30, 30)];
         coins.image = [CNLiveCMineService imageWithMineName:@"c_mine_content_gold_coins"];
         coins.backgroundColor = [UIColor clearColor];
         [coinsV addSubview:coins];
-        UILabel * numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 30, item_w, 20)];
+        UILabel * numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 40, item_w, 20)];
         numberLabel.backgroundColor = [UIColor clearColor];
         numberLabel.textColor = [UIColor whiteColor];
         numberLabel.textAlignment = NSTextAlignmentCenter;
         numberLabel.font = [UIFont systemFontOfSize:10];
+        numberLabel.text = [NSString stringWithFormat:@"+%d",(i + 1) * 1000];
         [coinsV addSubview:numberLabel];
         [self.numberViews addObject:numberLabel];
-        UILabel * dayLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 50, item_w, 20)];
+        UILabel * dayLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, item_h + 5, item_w, 20)];
         dayLabel.backgroundColor = [UIColor clearColor];
         dayLabel.textColor = [UIColor whiteColor];
         dayLabel.textAlignment = NSTextAlignmentCenter;
@@ -137,21 +139,28 @@
 -(void)setupWithScoreModel:(CNLiveCMineInteScoreModel *)scoreModel
                  taskModel:(CNLiveCMineInteTaskListModel *)taskModel
                announModel:(CNLiveCMineInteListModel *)announModel
+                activModel:(CNLiveCMineInteListModel *)activModel
 {
     _scoreModel = scoreModel;
     _taskModel = taskModel;
     _announModel = announModel;
+    _activModel = activModel;
     NSArray * array = [scoreModel.scores.firstObject componentsSeparatedByString:@","];
+    if (array.count == 0) array = @[@"1000",@"2000",@"3000",@"4000",@"5000",@"6000",@"7000"];
     NSInteger index = [array indexOfObject:scoreModel.score];
-    for (int i = 0; i < self.numberViews.count; i++) {
-        UILabel * numberLabel = self.numberViews[i];
-        UIImageView * coinsV = self.coinsViews[i];
-        numberLabel.text = [NSString stringWithFormat:@"+%@",array.count >= self.numberViews.count ? array[i] : @""];
-        numberLabel.textColor = index >= i ? [UIColor blackColor] : [UIColor whiteColor];
-        coinsV.image = index >= i ? [CNLiveCMineService imageWithMineName:@"c_mine_content_gold_select"] : [UIImage imageWithColor:[UIColor colorWithWhite:0 alpha:0.3]];
+    if (scoreModel) {
+        for (int i = 0; i < self.numberViews.count; i++) {
+            UILabel * numberLabel = self.numberViews[i];
+            UIImageView * coinsV = self.coinsViews[i];
+            numberLabel.text = [NSString stringWithFormat:@"+%@",array.count >= self.numberViews.count ? array[i] : @""];
+            numberLabel.textColor = index >= i ? [UIColor blackColor] : [UIColor whiteColor];
+            coinsV.image = index >= i ? [CNLiveCMineService imageWithMineName:@"c_mine_content_gold_select"] : [UIImage imageWithColor:[UIColor colorWithWhite:0 alpha:0.3]];
+        }
+        self.nameLabel.text = [NSString stringWithFormat:@"已连续签到 %ld天",index + 1];
+    }else{
+        self.nameLabel.text = @"已连续签到 0天";
     }
-    self.nameLabel.text = [NSString stringWithFormat:@"已连续签到 %ld天",index + 1];
-    
+    self.titleLabel.hidden = activModel == nil;
     self.bottemView.hidden = announModel.list.count == 0;
     self.iconView.hidden = announModel.list.count == 0;
     self.moreView.hidden = announModel.list.count == 0;
@@ -165,6 +174,9 @@
         }
         self.annouLabel.text = tempString;
     }
+    
+    if (announModel == nil) self.titleLabel.top = CGRectGetMaxY(self.topView.frame) + 10;
+    
 }
 -(void)pushAnnouMedthod:(UIButton *)button
 {
@@ -179,6 +191,7 @@
         _titleLabel.font = UIFontCNMake(15);
         _titleLabel.font = UIFontBoldCNMake(15);
         _titleLabel.text = @"积分乐园";
+        _titleLabel.hidden = YES;
     }
     return _titleLabel;
 }
@@ -250,7 +263,7 @@
         [_topView.layer addSublayer:topGradientLayer];
         _topGradientLayer = topGradientLayer;
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_WIDTH - 20, 110) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_WIDTH - 20, 130) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
         CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
         maskLayer.path = maskPath.CGPath;
         _topView.layer.mask = maskLayer;
@@ -16,9 +16,11 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param scoreModel 签到数据
 /// @param taskModel 任务数据
 /// @param announModel 公告数据
+/// @param activModel 任务数据
 -(void)setupWithScoreModel:(CNLiveCMineInteScoreModel *)scoreModel
                  taskModel:(CNLiveCMineInteTaskListModel *)taskModel
-               announModel:(CNLiveCMineInteListModel *)announModel;
+               announModel:(CNLiveCMineInteListModel *)announModel
+                activModel:(CNLiveCMineInteListModel *)activModel;
 /// 对点击结果进行响应
 @property (nonatomic, copy) ClickActionBlock clickActionBlock;
@@ -55,7 +55,7 @@
         make.left.mas_equalTo(weakSelf).offset(10);
         make.right.mas_equalTo(weakSelf).offset(-10);
         make.top.mas_equalTo(weakSelf.inteLabel.mas_bottom).offset(15);
-        make.height.mas_equalTo(150);
+        make.height.mas_equalTo(180);
     }];
 }
 -(void)pushMallAction:(UIButton *)btn
@@ -74,11 +74,13 @@
 -(void)setupWithScoreModel:(CNLiveCMineInteScoreModel *)scoreModel
                  taskModel:(CNLiveCMineInteTaskListModel *)taskModel
                announModel:(CNLiveCMineInteListModel *)announModel
+                activModel:(CNLiveCMineInteListModel *)activModel
 {
     _scoreModel = scoreModel;
     _taskModel = taskModel;
     _announModel = announModel;
-    [self.signView setupWithScoreModel:scoreModel taskModel:taskModel announModel:announModel];
+    _activModel = activModel;
+    [self.signView setupWithScoreModel:scoreModel taskModel:taskModel announModel:announModel activModel:activModel];
     NSMutableAttributedString * coin_string = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@积分",[taskModel.integral isNotBlank]?taskModel.integral:@"0"]];
     [coin_string addAttribute:NSFontAttributeName value:UIFontCNMake(12) range:[coin_string.string rangeOfString:@"积分"]];
     [coin_string addAttribute:NSFontAttributeName value:UIFontBoldCNMake(30) range:NSMakeRange(0, [coin_string.string rangeOfString:@"积分"].location)];
@@ -45,7 +45,7 @@ typedef void(^ClickActionBlock)(CNLiveCMineInteScoreModel * scoreModel,
 /// @param currentType 1-全部 2-获取 3-支出
 /// @param pageNo 页码(默认1)
 /// @param completerBlock 结果返回
-+(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel * listModel))completerBlock;
++(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel * listModel,NSError *error))completerBlock;
 @end
@@ -117,7 +117,7 @@
                     }else{
                         CNLiveCMineInteListModel * spListModel = (CNLiveCMineInteListModel *)[CNLiveRespCacheManager objectCacheWithFileName:NSStringFromClass(CNLiveCMineInteListModel.class)];
                         if (!spListModel) {
-                            CNLiveCMineInteListModel * spListModel = [[CNLiveCMineInteListModel alloc] init];
+                            spListModel = [[CNLiveCMineInteListModel alloc] init];
                             NSMutableArray * tempArray = [[NSMutableArray alloc] init];
                             CNLiveCMineInteListSubModel * subModel = [[CNLiveCMineInteListSubModel alloc] init];
                             subModel.contentId = @"21";
@@ -125,6 +125,7 @@
                             subModel.title = @"做任务";
                             subModel.subTitle = @"赚取更多积分";
                             subModel.isEmpty = @"1";
+                            [tempArray addObject:subModel];
                             spListModel.list = tempArray;
                         }
                         if (spListModel) {
@@ -133,8 +134,8 @@
                     }
                 }
             }
-            if (completerBlock) completerBlock(tempArray01,nil);
+            if (completerBlock) completerBlock(tempArray01,nil);
         } @catch (NSException *exception) {
             NSLog(@"异常了");
             if (completerBlock) completerBlock(nil,@"获取失败");
@@ -147,7 +148,7 @@
 /// @param currentType 1-全部 2-获取 3-支出
 /// @param pageNo 页码(默认1)
 /// @param completerBlock 结果返回
-+(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel *))completerBlock
++(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel *, NSError *))completerBlock
 {
     NSDictionary * paramDict = @{
         @"sid":[CNUserInfoManager manager].userInfoModel.uid,
@@ -161,7 +162,7 @@
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:cn_API_Host(@"/Daren/integral/integralRecordNew.action") Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         CNLiveCMineInteDetailModel * listModel = [CNLiveCMineInteDetailModel mj_objectWithKeyValues:responseObject];
         listModel.date_string = currentMonth;
-        if (!error && listModel && completerBlock) completerBlock(listModel);
+        if (completerBlock) completerBlock(listModel,error);
     }];
 }
@@ -17,7 +17,7 @@
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    [CNLiveCMineModule pushVCWithInteView];
+    [CNLiveCMineModule pushVCWithInteViewToFrom:@"" Feedback:NO];
 }
 - (void)viewDidLoad
@@ -28,6 +28,11 @@
 }
+- (void)pushCMineInteContentForCMainCustomFunctionVCParam:(nonnull NSDictionary *)param CurrentVC:(nonnull UIViewController *)currentVC {
+    
+}
+
+
 /// 积分任务跳转到不同界面去完成
 /// @param param 参数
 -(void)pushCMineInteContentForCMainCustomFunctionVCParam:(NSDictionary *)param