no message

zhangxiaowen
1 parent 0b99cbcb
Showing 3 changed files with 16 additions and 14 deletions
CNLiveCollectionModule/Classes/Controller/CNLiveCollectionController.m
CNLiveCollectionModule/Classes/Model/CNLiveCollectionRequest.h
CNLiveCollectionModule/Classes/Model/CNLiveCollectionRequest.m
@@ -8,12 +8,11 @@
 #import "CNLiveCollectionController.h"
 #import "QMUIKit.h"
-#import "MJExtension.h"
+
 #import <Masonry/Masonry.h>
 #import <SDWebImage/SDWebImage.h>
 #import "CNLiveCategory.h"
-#import "CNLiveNetworking.h"
-#import "CNLiveEnvironment.h"
+
 #import "CNUserInfoManager.h"
 #import "CNLiveRefreshHeader.h"
@@ -31,6 +30,7 @@
 @property (nonatomic, strong) NSMutableArray *data;
 @property (nonatomic, assign) NSInteger pageNo;
+@property (nonatomic, assign) NSInteger pageSize;
 @property (nonatomic, assign) BOOL isRefreshing;
 @end
@@ -42,7 +42,8 @@ static const CGFloat timeValue = 1.5;
 - (void)loadData{
     [QMUITips showLoadingInView:self.view];
     __weak typeof(self) weakSelf = self;
-    [CNLiveCollectionRequest getCollectionList:CNUserShareModel.uid pageNo:[NSString stringWithFormat:@"%ld",_pageNo] block:^(BOOL isSuccess, NSArray * _Nonnull array, NSError * _Nonnull error) {
+
+    [CNLiveCollectionRequest getCollectionList:[NSString stringWithFormat:@"%ld",_pageNo] pageSize:[NSString stringWithFormat:@"%ld",_pageSize] block:^(BOOL isSuccess, NSArray * _Nonnull array, NSError * _Nonnull error) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
         if(!strongSelf) return ;
         [QMUITips hideAllTipsInView:strongSelf.view];
@@ -69,7 +70,7 @@ static const CGFloat timeValue = 1.5;
             strongSelf.isRefreshing = NO;
             strongSelf.pageNo++;
             [strongSelf.data addObjectsFromArray:array];
-            if (array.count < 10) {
+            if (array.count < strongSelf.pageSize) {
                 [strongSelf.tableView.mj_footer endRefreshingWithNoMoreData];
             } else {
@@ -85,13 +86,13 @@ static const CGFloat timeValue = 1.5;
         }
         strongSelf.tableView.mj_footer.hidden = self.data.count == 0;
         [strongSelf.tableView reloadData];
+        
     }];
 }
 - (void)loadMoreData{
     if(!_isRefreshing){
-        _isRefreshing = YES;
         [self loadData];
     }
 }
@@ -109,8 +110,9 @@ static const CGFloat timeValue = 1.5;
     else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
-    _pageNo = 1;
     _isRefreshing = NO;
+    _pageNo = 1;
+    _pageSize = 10;
     [self loadData];
     [self createSubViews];    
 }
@@ -211,7 +213,7 @@ static const CGFloat timeValue = 1.5;
         _tableView.estimatedSectionFooterHeight = 0;
         [_tableView registerClass:[CNLiveCollectionCell class] forCellReuseIdentifier:kCNLiveCollectionCell];
         _tableView.mj_header = [CNLiveRefreshHeader headerWithRefreshingBlock:^{
-            _pageNo = 1;
+            self.pageNo = 1;
             [self loadData];
         }];
@@ -8,14 +8,14 @@
 #import <Foundation/Foundation.h>
-NS_ASSUME_NONNULL_BEGIN
-
 typedef void(^CollectionListBlock)(BOOL isSuccess, NSArray *array, NSError *error);
 typedef void(^CancelCollectionBlock)(BOOL isSuccess, NSError *error);
+NS_ASSUME_NONNULL_BEGIN
+
 @interface CNLiveCollectionRequest : NSObject
-+ (void)getCollectionList:(NSString *)ID pageNo:(NSString *)pageNo block:(CollectionListBlock)block;
++ (void)getCollectionList:(NSString *)pageNo pageSize:(NSString *)pageSize block:(CollectionListBlock)block;
 + (void)cancelCollection:(NSString *)ID block:(CancelCollectionBlock)block;
@@ -17,13 +17,13 @@
 @implementation CNLiveCollectionRequest
-+ (void)getCollectionList:(NSString *)ID pageNo:(NSString *)pageNo block:(CollectionListBlock)block{
++ (void)getCollectionList:(NSString *)pageNo pageSize:(NSString *)pageSize block:(CollectionListBlock)block{
     NSDictionary *params = @{
-                             @"pageSize":@"10",
+                             @"pageSize":pageSize,
                              @"pageNo":pageNo,
                              @"appId":AppId,
                              @"plat":@"i",
-                             @"sid":ID};
+                             @"sid":CNUserShareModel.uid};
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNDarenCollectListDataSourceUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (responseObject&&[responseObject isKindOfClass:[NSDictionary class]]) {