Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveCMineModule

liushiyu
2 parents a9d39e4d 5204c626
Showing 6 changed files with 79 additions and 26 deletions
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteDetaiListlViewController.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteCollectionViewCell.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderSignView.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderView.m
CNLiveCMineModule/Classes/inte/ViewModel/CNLiveCMineInteViewModel.h
CNLiveCMineModule/Classes/inte/ViewModel/CNLiveCMineInteViewModel.m
@@ -48,7 +48,11 @@
     self.pageNo = pageNo;
     self.currentType = currentType;
     self.currentMonth = currentMonth;
-    [CNLiveCMineInteViewModel requestWithIntegraDetailWithCurrentMonth:currentMonth currentType:currentType pageNo:pageNo CompleterBlock:^(CNLiveCMineInteDetailModel * _Nonnull listModel, NSArray * _Nonnull dataArray, NSError * _Nonnull error) {
+    [CNLiveCMineInteViewModel requestWithIntegraDetailWithCurrentMonth:currentMonth currentType:currentType pageNo:pageNo integralBlock:^(CNLiveCMineInteTaskListModel * _Nonnull listModel, NSError * _Nonnull error) {
+        weakSelf.currentInte = listModel.integral;
+        weakSelf.listModel.currentInte = listModel.integral;
+        weakSelf.detailVC.headerView.detailModel = weakSelf.listModel;
+    } CompleterBlock:^(CNLiveCMineInteDetailModel * _Nonnull listModel, NSArray * _Nonnull dataArray, NSError * _Nonnull error) {
         [self addMainRefreshView];
         if (!error && listModel) {
             listModel.currentInte = weakSelf.currentInte;
@@ -61,7 +61,7 @@
     if ([taskModel.isEmpty isEqualToString:@"1"]) {
         self.imageView.image = [CNLiveCMineService imageWithMineName:@"c_mine_content_item_task"];
     }else{
-        [self.imageView sd_setImageWithURL:[NSURL URLWithString:taskModel.poster] placeholderImage:nil];
+        [self.imageView sd_setImageWithURL:[NSURL URLWithString:taskModel.poster] placeholderImage:nil options:SDWebImageRefreshCached];
     }
     self.nameLabel.text = taskModel.title;
     self.descLabel.text = taskModel.subTitle;
@@ -306,7 +306,7 @@
 {
     _taskModel = taskModel;
  
-    [self.leftImage sd_setImageWithURL:[NSURL URLWithString:taskModel.icon] completed:nil];
+    [self.leftImage sd_setImageWithURL:[NSURL URLWithString:taskModel.icon] placeholderImage:nil options:SDWebImageRefreshCached];
     self.titleLabel.text = taskModel.title;
     self.pointLabel.text = [NSString stringWithFormat:@"积分值+%@",taskModel.score];
  
@@ -23,7 +23,6 @@
 @property (nonatomic, strong) UIImageView * moreView;
 @property (nonatomic, strong) UIButton * clearButton;
  
-@property (nonatomic, strong) UILabel * titleLabel;
 @property (nonatomic, strong) NSMutableArray * coinsViews;
 @property (nonatomic, strong) NSMutableArray * numberViews;
 @end
@@ -38,7 +37,6 @@
         self.numberViews = [[NSMutableArray alloc] init];
         [self addSubview:self.bottemView];
         [self addSubview:self.topView];
-        [self addSubview:self.titleLabel];
         [self.topView addSubview:self.nameLabel];
  
         [self.bottemView addSubview:self.annouLabel];
@@ -105,10 +103,6 @@
         make.left.right.mas_equalTo(weakSelf);
         make.bottom.mas_equalTo(weakSelf);
     }];
-    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(weakSelf.bottemView.mas_bottom).offset(10);
-        make.left.mas_equalTo(weakSelf.mas_left);
-    }];
     [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.mas_equalTo(weakSelf).offset(15);
     }];
@@ -163,7 +157,6 @@
     }else{
         self.nameLabel.text = @"已连续签到 0天";
     }
-    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;
@@ -179,27 +172,21 @@
             [tempString_none appendFormat:@"%@    ",subModel.title];
         }
         self.annouLabel.text = !CNLiveStringIsEmpty(tempString_roof) ? tempString_roof : tempString_none;
+        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;
+        _topMaskLayer = maskLayer;
     }
  
-    if (announModel == nil) self.titleLabel.top = CGRectGetMaxY(self.topView.frame) + 10;
+//    if (announModel == nil) self.titleLabel.top = CGRectGetMaxY(self.topView.frame) + 10;
 }
 -(void)pushAnnouMedthod:(UIButton *)button
 {
     if (self.clickActionBlock) self.clickActionBlock(self.scoreModel, self.taskModel, self.announModel,CNLiveCMineInteHeaderClickAnnotation);
 }
 #pragma mark =
--(UILabel *)titleLabel
-{
-    if (!_titleLabel) {
-        _titleLabel = [[UILabel alloc] init];
-        _titleLabel.textColor = [UIColor blackColor];
-        _titleLabel.font = UIFontCNMake(15);
-        _titleLabel.font = UIFontBoldCNMake(15);
-        _titleLabel.text = @"积分乐园";
-        _titleLabel.hidden = YES;
-    }
-    return _titleLabel;
-}
+
 -(UILabel *)nameLabel
 {
     if (!_nameLabel) {
@@ -268,7 +255,7 @@
         [_topView.layer addSublayer:topGradientLayer];
         _topGradientLayer = topGradientLayer;
  
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_WIDTH - 20, 130) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12, 12)];
+        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, SCREEN_WIDTH - 20, 130) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight | UIRectCornerBottomLeft | UIRectCornerBottomRight cornerRadii:CGSizeMake(12, 12)];
         CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
         maskLayer.path = maskPath.CGPath;
         _topView.layer.mask = maskLayer;
@@ -13,6 +13,7 @@
 @property (nonatomic, strong) UILabel * inteLabel;
 @property (nonatomic, strong) UIButton * pushMallBtn;
 @property (nonatomic, strong) CNLiveCMineInteHeaderSignView * signView;
+@property (nonatomic, strong) UILabel * titleLabel;
  
 @property (nonatomic, strong) CNLiveCMineInteScoreModel * scoreModel;  //签到数据
 @property (nonatomic, strong) CNLiveCMineInteTaskListModel * taskModel;//任务列表及积分数据
@@ -30,6 +31,7 @@
         [self addSubview:self.inteLabel];
         [self addSubview:self.pushMallBtn];
         [self addSubview:self.signView];
+        [self addSubview:self.titleLabel];
     }
     return self;
 }
@@ -57,6 +59,10 @@
         make.top.mas_equalTo(weakSelf.inteLabel.mas_bottom).offset(15);
         make.height.mas_equalTo(180);
     }];
+    [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(weakSelf.mas_bottom).offset(-10);
+        make.left.mas_equalTo(weakSelf.signView.mas_left);
+    }];
 }
 -(void)pushMallAction:(UIButton *)btn
 {
@@ -85,6 +91,7 @@
     [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)];
     self.inteLabel.attributedText = coin_string;
+    self.titleLabel.hidden = activModel == nil;
 }
 #pragma mark =
 -(CNLiveCMineInteHeaderSignView *)signView
@@ -134,4 +141,16 @@
     }
     return _inteLabel;
 }
+-(UILabel *)titleLabel
+{
+    if (!_titleLabel) {
+        _titleLabel = [[UILabel alloc] init];
+        _titleLabel.textColor = [UIColor blackColor];
+        _titleLabel.font = UIFontCNMake(15);
+        _titleLabel.font = UIFontBoldCNMake(15);
+        _titleLabel.text = @"积分乐园";
+        _titleLabel.hidden = YES;
+    }
+    return _titleLabel;
+}
 @end
@@ -46,8 +46,9 @@ typedef void(^ClickActionBlock)(CNLiveCMineInteScoreModel * scoreModel,
 /// @param currentMonth 时间格式 2021-12
 /// @param currentType 1-全部 2-获取 3-支出
 /// @param pageNo 页码(默认1)
+/// @param integralBlock返回总积分请求结果
 /// @param completerBlock 结果返回
-+(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel * listModel,NSArray * dataArray,NSError *error))completerBlock;
++(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo integralBlock:(void(^)(CNLiveCMineInteTaskListModel *listModel,NSError *error)) integralBlock CompleterBlock:(void(^)(CNLiveCMineInteDetailModel * listModel,NSArray * dataArray,NSError *error))completerBlock;
  
 @end
  
@@ -11,6 +11,32 @@
  
 +(void)requestWithIntegraTaskWithSignMedthodForCompleterBlock:(void (^)(NSMutableArray * , NSString *))completerBlock
 {
+    if (![CNLiveNetworking isNetworking]) {
+        NSMutableArray * tempArray01 = [[NSMutableArray alloc] initWithArray:@[@"",@"",@"",@""]];
+        CNLiveCMineInteTaskListModel * listModel = (CNLiveCMineInteTaskListModel *)[CNLiveRespCacheManager objectCacheWithFileName:NSStringFromClass(CNLiveCMineInteTaskListModel.class)];
+        if (listModel) {
+            [tempArray01 replaceObjectAtIndex:1 withObject:listModel];
+        }
+        CNLiveCMineInteListModel * spListModel = (CNLiveCMineInteListModel *)[CNLiveRespCacheManager objectCacheWithFileName:NSStringFromClass(CNLiveCMineInteListModel.class)];
+        if (!spListModel) {
+            spListModel = [[CNLiveCMineInteListModel alloc] init];
+            NSMutableArray * tempArray = [[NSMutableArray alloc] init];
+            CNLiveCMineInteListSubModel * subModel = [[CNLiveCMineInteListSubModel alloc] init];
+            subModel.contentId = @"21";
+            subModel.poster = @"c_mine_content_item_task";
+            subModel.title = @"做任务";
+            subModel.subTitle = @"赚取更多积分";
+            subModel.isEmpty = @"1";
+            [tempArray addObject:subModel];
+            spListModel.list = tempArray;
+        }
+        if (spListModel) {
+            [tempArray01 replaceObjectAtIndex:3 withObject:spListModel];
+        }
+        completerBlock(tempArray01,@"请求失败");
+        [QMUITips showWithText:@"无法连接网络" inView:AppKeyWindow hideAfterDelay:1.5];
+        return;
+    }
     [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainUMengStatisticaMedthod];
     NSDictionary * param = @{
         @"sid":[CNUserInfoManager manager].userInfoModel.uid
@@ -87,6 +113,7 @@
                         [tempArray01 replaceObjectAtIndex:1 withObject:listModel];
                         [CNLiveRespCacheManager cachePathWithObject:listModel FileName:NSStringFromClass(CNLiveCMineInteTaskListModel.class)];
                     }else{
+                        [QMUITips showWithText:@"接口请求错误" inView:AppKeyWindow hideAfterDelay:1.5];
                         CNLiveCMineInteTaskListModel * listModel = (CNLiveCMineInteTaskListModel *)[CNLiveRespCacheManager objectCacheWithFileName:NSStringFromClass(CNLiveCMineInteTaskListModel.class)];
                         if (listModel) {
                             [tempArray01 replaceObjectAtIndex:1 withObject:listModel];
@@ -139,6 +166,7 @@
         } @catch (NSException *exception) {
             NSLog(@"异常了");
             if (completerBlock) completerBlock(nil,@"获取失败");
+            
         }
     }];
 }
@@ -148,8 +176,11 @@
 /// @param currentType 1-全部 2-获取 3-支出
 /// @param pageNo 页码(默认1)
 /// @param completerBlock 结果返回
-+(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel *, NSArray *,NSError *))completerBlock
++(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo integralBlock:(nonnull void (^)(CNLiveCMineInteTaskListModel * _Nonnull, NSError * _Nonnull))integralBlock CompleterBlock:(void(^)(CNLiveCMineInteDetailModel *, NSArray *,NSError *))completerBlock
 {
+    NSDictionary * param = @{
+        @"sid":[CNUserInfoManager manager].userInfoModel.uid
+    };
     NSDictionary * paramDict = @{
         @"sid":[CNUserInfoManager manager].userInfoModel.uid,
         @"currentMonth":currentMonth,
@@ -165,6 +196,17 @@
         NSMutableArray * tempArray = listModel.integralList.mutableCopy;
         if (completerBlock) completerBlock(listModel,tempArray,error);
     }];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Host(@"/Daren/integral/getTasks.action") Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if (!error) {
+            CNLiveCMineInteTaskListModel * listModel = [CNLiveCMineInteTaskListModel mj_objectWithKeyValues:responseObject];
+            if (integralBlock) {
+                integralBlock(listModel,error);
+            }
+        }
+        
+    }];
 }
  
 @end