我的话题分页

porcellio · porcellio · commit 591460ad78eb · 2015-07-31T01:12:45.000+08:00
diff --git a/Coding_iOS/Controllers/Topic/CSTopiclistView.m b/Coding_iOS/Controllers/Topic/CSTopiclistView.m
@@ -10,6 +10,7 @@
 #import "ProjectListTaCell.h"
 #import "ODRefreshControl.h"
 #import "Coding_NetAPIManager.h"
+#import "SVPullToRefresh.h"
 
 #import "Login.h"
 
@@ -29,6 +30,8 @@ @interface CSTopiclistView()<SWTableViewCellDelegate>
 @property (nonatomic,assign)CSMyTopicsType type;
 
 @property (nonatomic,assign)BOOL isLodding;
+@property (nonatomic, assign) BOOL hasMore;
+@property (nonatomic, assign) NSInteger curPage;
 
 @end
 
@@ -38,6 +41,8 @@ - (id)initWithFrame:(CGRect)frame type:(CSMyTopicsType )type block:(TopicListVie
     self = [super initWithFrame:frame];
     if (self) {
         // Initialization code
+        _dataList = [[NSMutableArray alloc] init];
+        _type = type;
         _block = block;
         _myTableView = ({
             UITableView *tableView = [[UITableView alloc] init];
@@ -46,6 +51,12 @@ - (id)initWithFrame:(CGRect)frame type:(CSMyTopicsType )type block:(TopicListVie
             tableView.dataSource = self;
             [tableView registerClass:[CSTopicCell class] forCellReuseIdentifier:kCellIdentifier_TopicCell];
             tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+            {
+                __weak typeof(self) weakSelf = self;
+                [tableView addInfiniteScrollingWithActionHandler:^{
+                    [weakSelf loadMore];
+                }];
+            }
             [self addSubview:tableView];
             [tableView mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.edges.equalTo(self);
@@ -58,8 +69,11 @@ - (id)initWithFrame:(CGRect)frame type:(CSMyTopicsType )type block:(TopicListVie
             tableView;
         });
         
-        _myRefreshControl = [[ODRefreshControl alloc] initInScrollView:self.myTableView];
-        [_myRefreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];
+//        _myRefreshControl = [[ODRefreshControl alloc] initInScrollView:self.myTableView];
+//        [_myRefreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];
+        
+        self.hasMore = YES;
+        self.curPage = 1;
         
         if (_myTopic.count > 0) {
             [_myTableView reloadData];
@@ -107,28 +121,44 @@ - (void)refresh{
     [self sendRequest];
 }
 
+- (void)loadMore {
+
+    if(self.isLodding) {
+        return;
+    }
+    
+    ++self.curPage;
+    [self sendRequest];
+}
+
 - (void)sendRequest{
     if (_dataList.count <= 0) {
         [self beginLoading];
     }
     __weak typeof(self) weakSelf = self;
     
-    if (_type == CSMyTopicsTypeJoined) {
-        [[Coding_NetAPIManager sharedManager] request_WatchedTopicsWithUserGK:[Login curLoginUser].global_key block:^(id data, NSError *error) {
+    if (_type == CSMyTopicsTypeWatched) {
+        [[Coding_NetAPIManager sharedManager] request_WatchedTopicsWithUserGK:[Login curLoginUser].global_key page:self.curPage block:^(id data, BOOL hasMoreData, NSError *error) {
+            weakSelf.hasMore = hasMoreData;
             [weakSelf doAfterGotResultWithData:data error:error];
         }];
     }else{
-        [[Coding_NetAPIManager sharedManager] request_JoinedTopicsWithUserGK:[Login curLoginUser].global_key block:^(id data, NSError *error) {
-             [weakSelf doAfterGotResultWithData:data error:error];
+        [[Coding_NetAPIManager sharedManager] request_JoinedTopicsWithUserGK:[Login curLoginUser].global_key page:self.curPage block:^(id data, BOOL hasMoreData, NSError *error) {
+            weakSelf.hasMore = hasMoreData;
+            [weakSelf doAfterGotResultWithData:data error:error];
         }];
     }
 }
 
-- (void)doAfterGotResultWithData:(id) data error:(NSError*)error{
+- (void)doAfterGotResultWithData:(id) data error:(NSError*)error {
+    
+    [self.myTableView.infiniteScrollingView stopAnimating];
     [self.myRefreshControl endRefreshing];
     [self endLoading];
     if (data) {
-        _dataList = data[@"list"];
+        
+        [_dataList addObjectsFromArray:[data[@"list"] copy]];
+        self.myTableView.showsInfiniteScrolling = self.hasMore;
         [self.myTableView reloadData];
     }
 //    EaseBlankPageType blankPageType;
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.h b/Coding_iOS/Util/Manager/Coding_NetAPIManager.h
@@ -218,8 +218,8 @@ typedef NS_ENUM(NSUInteger, VerifyType){
 
 - (void)request_TopicDetailsWithTopicID:(int)topicID block:(void (^)(id data, NSError *error))block;
 
-- (void)request_JoinedTopicsWithUserGK:(NSString *)userGK block:(void (^)(id data, NSError *error))block;
-- (void)request_WatchedTopicsWithUserGK:(NSString *)userGK block:(void (^)(id data, NSError *error))block;
+- (void)request_JoinedTopicsWithUserGK:(NSString *)userGK page:(NSInteger)page block:(void (^)(id data, BOOL hasMoreData, NSError *error))block;
+- (void)request_WatchedTopicsWithUserGK:(NSString *)userGK page:(NSInteger)page block:(void (^)(id data, BOOL hasMoreData, NSError *error))block;
 
 - (void)request_Topic_DoWatch_WithUrl:(NSString *)url andBlock:(void (^)(id data, NSError *error))block;
 
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -2046,29 +2046,31 @@ - (void)request_TopicDetailsWithTopicID:(int)topicID block:(void (^)(id data, NS
 }
 
 
-- (void)request_JoinedTopicsWithUserGK:(NSString *)userGK block:(void (^)(id data, NSError *error))block {
-    NSString *path = [NSString stringWithFormat:@"api/user/%@/tweet_topic/joined",userGK];
+- (void)request_JoinedTopicsWithUserGK:(NSString *)userGK page:(NSInteger)page block:(void (^)(id data, BOOL hasMoreData, NSError *error))block {
+    NSString *path = [[NSString stringWithFormat:@"api/user/%@/tweet_topic/joined",userGK] stringByAppendingString:[NSString stringWithFormat:@"?page=%d", (int)page]];
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
         if(data) {
             id resultData = data[@"data"];
-            block(resultData, nil);
+            BOOL hasMoreData = [resultData[@"totalPage"] intValue] - [resultData[@"page"] intValue];
+            block(resultData, hasMoreData, nil);
 //            NSArray *list = data[@"data"][@"list"];
 //            NSArray *resultA = [NSObject arrayFromJSON:resultData ofObjects:@"ProjectActivity"];
 //            block(resultA, nil);
         }else {
-            block(nil, error);
+            block(nil, NO, error);
         }
     }];
 }
 
-- (void)request_WatchedTopicsWithUserGK:(NSString *)userGK block:(void (^)(id data, NSError *error))block {
-    NSString *path = [NSString stringWithFormat:@"/api/user/%@/tweet_topic/watched",userGK];
+- (void)request_WatchedTopicsWithUserGK:(NSString *)userGK page:(NSInteger)page block:(void (^)(id data, BOOL hasMoreData, NSError *error))block {
+    NSString *path = [[NSString stringWithFormat:@"/api/user/%@/tweet_topic/watched",userGK] stringByAppendingString:[NSString stringWithFormat:@"?page=%d", (int)page]];
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
         if(data) {
             id resultData = data[@"data"];
-            block(resultData, nil);
+            BOOL hasMoreData = [resultData[@"totalPage"] intValue] - [resultData[@"page"] intValue];
+            block(resultData, hasMoreData, nil);
         }else {
-            block(nil, error);
+            block(nil, NO, error);
         }
     }];
 }
