任务总积分网络请求修改

yanglingyu
1 parent 9b447d4c
Showing 4 changed files with 34 additions and 15 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteDetaiListlViewController.m
CNLiveCMineModule/Classes/inte/ViewModel/CNLiveCMineInteViewModel.h
CNLiveCMineModule/Classes/inte/ViewModel/CNLiveCMineInteViewModel.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.1.0'
+  s.version          = '0.1.1'
   s.summary          = '网家家C端个人中心'
  
 # This description is used to generate tags and improve search results.
@@ -42,17 +42,27 @@
     [self requestDataSourceWithPageNo:1 CurrentMonth:self.currentMonth CurrentType:self.currentType];
 }
  
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [self requestIntegralTask];
+}
+
+- (void)requestIntegralTask{
+    __weak typeof(self) weakSelf = self;
+    [CNLiveCMineInteViewModel requestIntegralTaskComperBlock:^(CNLiveCMineInteTaskListModel * _Nonnull listModel, NSError * _Nonnull error) {
+        weakSelf.currentInte = listModel.integral;
+        weakSelf.listModel.currentInte = listModel.integral;
+        weakSelf.detailVC.headerView.detailModel = weakSelf.listModel;
+    }];
+}
 -(void)requestDataSourceWithPageNo:(NSInteger)pageNo CurrentMonth:(NSString *)currentMonth CurrentType:(NSInteger)currentType
 {
     __weak typeof(self) weakSelf = self;
     self.pageNo = pageNo;
     self.currentType = currentType;
     self.currentMonth = currentMonth;
-    [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) {
+    [CNLiveCMineInteViewModel requestWithIntegraDetailWithCurrentMonth:currentMonth currentType:currentType pageNo:pageNo CompleterBlock:^(CNLiveCMineInteDetailModel * _Nonnull listModel, NSArray * _Nonnull dataArray, NSError * _Nonnull error) {
         [self addMainRefreshView];
         if (!error && listModel) {
             listModel.currentInte = weakSelf.currentInte;
@@ -41,14 +41,16 @@ typedef void(^ClickActionBlock)(CNLiveCMineInteScoreModel * scoreModel,
 /// @param completerBlock 请求结果返回
 +(void)requestWithIntegraTaskWithSignMedthodForCompleterBlock:(void(^)(NSMutableArray * dataArray, NSString * errorMessage))completerBlock;
  
+/// 请求总积分数借口
+/// @param comperBlock 结果返回
++(void)requestIntegralTaskComperBlock:(void(^)(CNLiveCMineInteTaskListModel *listModel,NSError *error))comperBlock;
  
 /// 获取积分明细(新)
 /// @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 integralBlock:(void(^)(CNLiveCMineInteTaskListModel *listModel,NSError *error)) integralBlock CompleterBlock:(void(^)(CNLiveCMineInteDetailModel * listModel,NSArray * dataArray,NSError *error))completerBlock;
++(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo  CompleterBlock:(void(^)(CNLiveCMineInteDetailModel * listModel,NSArray * dataArray,NSError *error))completerBlock;
  
 @end
  
@@ -176,11 +176,9 @@
 /// @param currentType 1-全部 2-获取 3-支出
 /// @param pageNo 页码(默认1)
 /// @param 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
++(void)requestWithIntegraDetailWithCurrentMonth:(NSString *)currentMonth currentType:(NSInteger)currentType pageNo:(NSInteger)pageNo CompleterBlock:(void(^)(CNLiveCMineInteDetailModel *, NSArray *,NSError *))completerBlock
 {
-    NSDictionary * param = @{
-        @"sid":[CNUserInfoManager manager].userInfoModel.uid
-    };
+    
     NSDictionary * paramDict = @{
         @"sid":[CNUserInfoManager manager].userInfoModel.uid,
         @"currentMonth":currentMonth,
@@ -196,15 +194,24 @@
         NSMutableArray * tempArray = listModel.integralList.mutableCopy;
         if (completerBlock) completerBlock(listModel,tempArray,error);
     }];
+}
+
+/// 请求总积分数借口
+/// @param comperBlock 结果返回
++(void)requestIntegralTaskComperBlock:(void(^)(CNLiveCMineInteTaskListModel *listModel,NSError *error))comperBlock{
+    NSDictionary * param = @{
+        @"sid":[CNUserInfoManager manager].userInfoModel.uid
+    };
+    [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);
+            if (comperBlock) {
+                comperBlock(listModel,error);
             }
         }
  
     }];
 }
-
 @end