加载更多~

cjddny · cjddny · commit 24a2b239a612 · 2015-11-16T16:02:08.000+08:00
diff --git a/Coding_iOS/Controllers/ProjectSquareViewController.m b/Coding_iOS/Controllers/ProjectSquareViewController.m
@@ -31,6 +31,7 @@ - (void)viewDidLoad {
     [listView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(self.view);
     }];
+    
 }
 
 - (void)didReceiveMemoryWarning {
diff --git a/Coding_iOS/Views/Cell/ProjectPublicListCell.m b/Coding_iOS/Views/Cell/ProjectPublicListCell.m
@@ -189,11 +189,7 @@ - (void)setProject:(Project *)project hasSWButtons:(BOOL)hasSWButtons hasBadgeTi
     NSString *titleStr=[NSString stringWithFormat:@"%@ &#26368;&#21518;&#26356;&#26032;&#20110; %@",_project.owner_user_name,[_project.updated_at stringDisplay_HHmm]];
     NSMutableAttributedString *titleColorStr=[[NSMutableAttributedString alloc] initWithString:titleStr];
     [titleColorStr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHexString:@"0x3bbd79"] range:[titleStr rangeOfString:_project.owner_user_name]];
-//
-//    [titleColorStr addAttribute:NSForegroundColorAttributeName value:ZZBThemeOrangeColor range:[titleStr rangeOfString:aPerson.text]];
-//    _nameLabel.text = [NSString stringWithFormat:@"%@&#65288;%ld&#65289;", _folder.name, (long)(_folder.count.integerValue)];
-//    _infoLabel.text = [NSString stringWithFormat:@"%@ &#21019;&#24314;&#20110; %@", _folder.owner_name, ];
-
+    
     _ownerTitleLabel.attributedText = titleColorStr;
 
     
diff --git a/Coding_iOS/Views/TableListView/ProjectListView.m b/Coding_iOS/Views/TableListView/ProjectListView.m
@@ -16,6 +16,7 @@
 #import "ProjectAboutMeListCell.h"
 #import "ProjectAboutOthersListCell.h"
 #import "ProjectPublicListCell.h"
+#import "SVPullToRefresh.h"
 
 @interface ProjectListView ()<UISearchBarDelegate, SWTableViewCellDelegate>
 @property (nonatomic, strong) Projects *myProjects;
@@ -90,7 +91,12 @@ - (id)initWithFrame:(CGRect)frame projects:(Projects *)projects block:(ProjectLi
 
         _myRefreshControl = [[ODRefreshControl alloc] initInScrollView:self.myTableView];
         [_myRefreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];
+        __weak typeof(self) weakSelf = self;
         
+        [_myTableView addInfiniteScrollingWithActionHandler:^{
+            [weakSelf refreshMore];
+        }];
+
         if (_myProjects.list.count > 0) {
             [_myTableView reloadData];
         }else{
@@ -167,14 +173,26 @@ - (void)refreshFirst{
     }
 }
 
+- (void)refreshMore{
+    if (_myProjects.isLoading || !_myProjects.canLoadMore) {
+        [_myTableView.infiniteScrollingView stopAnimating];
+        return;
+    }
+    _myProjects.willLoadMore = YES;
+    [self sendRequest];
+}
+
+
 - (void)sendRequest{
     if (_myProjects.list.count <= 0) {
         [self beginLoading];
     }
     __weak typeof(self) weakSelf = self;
     [[Coding_NetAPIManager sharedManager] request_Projects_WithObj:_myProjects andBlock:^(Projects *data, NSError *error) {
         [weakSelf.myRefreshControl endRefreshing];
-        [self endLoading];
+        [weakSelf endLoading];
+        [weakSelf.myTableView.infiniteScrollingView stopAnimating];
+        
         if (data) {
             [weakSelf.myProjects configWithProjects:data];
             [weakSelf setupDataList];

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ - (void)viewDidLoad {`
`31`	`31`	`[listView mas_makeConstraints:^(MASConstraintMaker *make) {`
`32`	`32`	`make.edges.equalTo(self.view);`
`33`	`33`	`}];`
	`34`	`+`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`- (void)didReceiveMemoryWarning {`
-Original file line number
+Diff line change
     NSString *titleStr=[NSString stringWithFormat:@"%@ 最后更新于 %@",_project.owner_user_name,[_project.updated_at stringDisplay_HHmm]];
     NSMutableAttributedString *titleColorStr=[[NSMutableAttributedString alloc] initWithString:titleStr];
     [titleColorStr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHexString:@"0x3bbd79"] range:[titleStr rangeOfString:_project.owner_user_name]];
 -//
 -//    [titleColorStr addAttribute:NSForegroundColorAttributeName value:ZZBThemeOrangeColor range:[titleStr rangeOfString:aPerson.text]];
 -//    _nameLabel.text = [NSString stringWithFormat:@"%@（%ld）", _folder.name, (long)(_folder.count.integerValue)];
 -//    _infoLabel.text = [NSString stringWithFormat:@"%@ 创建于 %@", _folder.owner_name, ];
+-
++
     _ownerTitleLabel.attributedText = titleColorStr;