空白页面 - 改版

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -240,7 +240,7 @@ - (void)sendRequestRootFolders{
         }else{
             [weakSelf.refreshControl endRefreshing];
             [weakSelf.view endLoading];
-            [weakSelf.view configBlankPage:EaseBlankPageTypeView hasData:([weakSelf totalDataRow] > 0) hasError:YES reloadButtonBlock:^(id sender) {
+            [weakSelf.view configBlankPage:EaseBlankPageTypeFile hasData:([weakSelf totalDataRow] > 0) hasError:YES reloadButtonBlock:^(id sender) {
                 [weakSelf refreshRootFolders];
             }];
         }
@@ -271,7 +271,7 @@ - (void)sendRequestFileList{
 
             [weakSelf.myTableView reloadData];
         }
-        [weakSelf.view configBlankPage:EaseBlankPageTypeView hasData:([weakSelf totalDataRow] > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
+        [weakSelf.view configBlankPage:EaseBlankPageTypeFile hasData:([weakSelf totalDataRow] > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
             [weakSelf refreshRootFolders];
         }];
     }];
@@ -321,7 +321,7 @@ - (void)creatFolderBtnClicked{
                     [weakSelf.rootFolders.list insertObject:data atIndex:1];
                 }
                 [weakSelf.myTableView reloadData];
-                [weakSelf.view configBlankPage:EaseBlankPageTypeView hasData:([weakSelf totalDataRow] > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
+                [weakSelf.view configBlankPage:EaseBlankPageTypeFile hasData:([weakSelf totalDataRow] > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
                     [weakSelf refreshRootFolders];
                 }];
                 [NSObject showHudTipStr:@"创建文件夹成功"];
@@ -432,7 +432,7 @@ - (void)qb_imagePickerController:(QBImagePickerController *)imagePickerControlle
     for (NSString *fileName in needToUploads) {
         [self uploadFileWithFileName:fileName];
     }
-    [self.view configBlankPage:EaseBlankPageTypeView hasData:([self totalDataRow] > 0) hasError:NO reloadButtonBlock:^(id sender) {
+    [self.view configBlankPage:EaseBlankPageTypeFile hasData:([self totalDataRow] > 0) hasError:NO reloadButtonBlock:^(id sender) {
         [self refreshRootFolders];
     }];
 
@@ -475,7 +475,7 @@ - (void)completionUploadWithResult:(id)responseObject error:(NSError *)error{
     [self.myFiles.list insertObject:curFile atIndex:0];
     self.curFolder.count = @(self.curFolder.count.integerValue +1);
     [self configuploadFiles];
-    [self.view configBlankPage:EaseBlankPageTypeView hasData:([self totalDataRow] > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
+    [self.view configBlankPage:EaseBlankPageTypeFile hasData:([self totalDataRow] > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
         [self refreshRootFolders];
     }];
     if (self.navigationItem.rightBarButtonItem == nil) {
@@ -644,7 +644,7 @@ - (void)deleteFolder:(ProjectFolder *)folder{
             [weakSelf.curFolder.sub_folders removeObject:originalFolder];
             weakSelf.curFolder.count = [NSNumber numberWithInt:weakSelf.curFolder.count.intValue-1];
             [weakSelf.myTableView reloadData];
-            [weakSelf.view configBlankPage:EaseBlankPageTypeView hasData:([weakSelf totalDataRow] > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
+            [weakSelf.view configBlankPage:EaseBlankPageTypeFile hasData:([weakSelf totalDataRow] > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
                 [weakSelf refreshRootFolders];
             }];
         }

Coding_iOS/.DS_Store

@@ -148,7 +148,7 @@ - (void)requestTopicsMore:(BOOL)loadMore{
             weakSelf.myTableView.showsInfiniteScrolling = hasMoreData;
         }
 
-        CGFloat offsetY = _userInfoCell.frame.size.height + [UserActiveGraphCell cellHeight] + 100;
+        CGFloat offsetY = _userInfoCell.frame.size.height + [UserActiveGraphCell cellHeight] + 80;
         [weakSelf.view configBlankPage:EaseBlankPageTypeMyJoinedTopic hasData:weakSelf.dataList.count > 0 hasError:error != nil offsetY:offsetY reloadButtonBlock:^(id sender) {
             [weakSelf refresh];
         }];
@@ -211,8 +211,13 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
     if (section < 2) {
         return 20;
+    }else{
+        if (_dataIndex == 0) {
+            return 0;
+        }else{
+            return _dataList.count == 0? self.view.height - self.sectionHeaderView.height: 0;
+        }
     }
-    return 0;
 }
 
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{

Coding_iOS/Controllers/FileListViewController.m

@@ -100,7 +100,7 @@ - (void)refresh{
     [[Coding_NetAPIManager sharedManager] request_ProjectDetail_WithObj:_myProject andBlock:^(id data, NSError *error) {
         if (data) {
             weakSelf.myProject = data;
-            weakSelf.navigationItem.rightBarButtonItem = weakSelf.myProject.is_public.boolValue? nil: [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"tweetsBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(tweetsBtnClicked)];
+            weakSelf.navigationItem.rightBarButtonItem = weakSelf.myProject.is_public.boolValue? nil: [UIBarButtonItem itemWithBtnTitle:@"公告" target:self action:@selector(tweetsBtnClicked)];
             [self refreshGitButtonsView];
             [weakSelf.myTableView reloadData];
         }

Coding_iOS/Controllers/MeDisplayViewController.m

@@ -122,6 +122,9 @@ - (void)refresh{
         if (data) {
             weakSelf.notificationDict = [NSMutableDictionary dictionaryWithDictionary:data];
             [weakSelf.myTableView reloadData];
+            [weakSelf.myTableView configBlankPage:EaseBlankPageTypeMessageList hasData:(weakSelf.myPriMsgs.list.count > 0) hasError:(error != nil) offsetY:(3 * [ToMessageCell cellHeight]) reloadButtonBlock:^(id sender) {
+                [weakSelf refresh];
+            }];
         }
     }];
     [[UnReadManager shareManager] updateUnRead];
@@ -150,6 +153,9 @@ - (void)sendRequest_PrivateMessages{
             [weakSelf.myPriMsgs configWithObj:data];
             [weakSelf.myTableView reloadData];
             weakSelf.myTableView.showsInfiniteScrolling = weakSelf.myPriMsgs.canLoadMore;
+            [weakSelf.myTableView configBlankPage:EaseBlankPageTypeMessageList hasData:(weakSelf.myPriMsgs.list.count > 0) hasError:(error != nil) offsetY:(3 * [ToMessageCell cellHeight]) reloadButtonBlock:^(id sender) {
+                [weakSelf refresh];
+            }];
         }
     }];
 }
@@ -244,6 +250,9 @@ - (void)removeConversation:(PrivateMessage *)curMsg inTableView:(UITableView *)t
         if (data) {
             [weakSelf.myPriMsgs.list removeObject:data];
             [weakSelf.myTableView reloadData];
+            [weakSelf.myTableView configBlankPage:EaseBlankPageTypeMessageList hasData:(weakSelf.myPriMsgs.list.count > 0) hasError:(error != nil) offsetY:(3 * [ToMessageCell cellHeight]) reloadButtonBlock:^(id sender) {
+                [weakSelf refresh];
+            }];
         }
     }];
 }

Coding_iOS/Controllers/NProjectViewController/NProjectViewController.m

@@ -54,7 +54,7 @@ - (void)refresh{
             weakSelf.teamList = data;
             [weakSelf.myTableView reloadData];
         }
-        [weakSelf.myTableView configBlankPage:EaseBlankPageTypeView hasData:(weakSelf.teamList.count > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
+        [weakSelf.myTableView configBlankPage:EaseBlankPageTypeTeam hasData:(weakSelf.teamList.count > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
             [weakSelf refresh];
         }];
     }];

Coding_iOS/Controllers/RootControllers/Message_RootViewController.m

@@ -147,14 +147,22 @@ - (void)messageInputView:(UIMessageInputView *)inputView heightToBottomChenged:(
 
 
 #pragma mark M
+- (EaseBlankPageType)blankType{
+    EaseBlankPageType blankType = ([[Login curLoginUser] isSameToUser:self.curTweets.curUser]? EaseBlankPageTypeTweet:
+                                   _curTweets.tweetType == TweetTypeProject? EaseBlankPageTypeTweetProject:
+                                   EaseBlankPageTypeTweetOther);
+    return blankType;
+}
+
 - (void)deleteTweet:(Tweet *)curTweet outTweetsIndex:(NSInteger)outTweetsIndex{
     ESWeakSelf;
     [[Coding_NetAPIManager sharedManager] request_Tweet_Delete_WithObj:curTweet andBlock:^(id data, NSError *error) {
         ESStrongSelf;
         if (data) {
             [_self.curTweets.list removeObject:curTweet];
             [_self.myTableView reloadData];
-            [_self.view configBlankPage:([[Login curLoginUser] isSameToUser:_self.curTweets.curUser]? EaseBlankPageTypeTweet: EaseBlankPageTypeTweetOther)  hasData:(_self.curTweets.list.count > 0) hasError:NO offsetY:[_self blankPageOffsetY] reloadButtonBlock:^(id sender) {
+            
+            [_self.view configBlankPage:[_self blankType] hasData:(_self.curTweets.list.count > 0) hasError:NO offsetY:[_self blankPageOffsetY] reloadButtonBlock:^(id sender) {
                 ESStrongSelf;
                 [_self sendRequest];
             }];
@@ -206,7 +214,7 @@ - (void)sendRequest{
             [weakSelf.myTableView reloadData];
             weakSelf.myTableView.showsInfiniteScrolling = weakSelf.curTweets.canLoadMore;
         }
-        [weakSelf.view configBlankPage:([[Login curLoginUser] isSameToUser:self.curTweets.curUser]? EaseBlankPageTypeTweet: EaseBlankPageTypeTweetOther) hasData:(weakSelf.curTweets.list.count > 0) hasError:(error != nil) offsetY:[weakSelf blankPageOffsetY] reloadButtonBlock:^(id sender) {
+        [weakSelf.view configBlankPage:[weakSelf blankType] hasData:(weakSelf.curTweets.list.count > 0) hasError:(error != nil) offsetY:[weakSelf blankPageOffsetY] reloadButtonBlock:^(id sender) {
             [weakSelf sendRequest];
         }];
     }];
@@ -215,7 +223,7 @@ - (void)sendRequest{
 - (CGFloat)blankPageOffsetY{//MeDisplayViewController
     CGFloat offsetY = 0;
     if ([self isMemberOfClass:NSClassFromString(@"MeDisplayViewController")]) {
-        offsetY = ((UITableViewCell *)[self valueForKey:@"userInfoCell"]).frame.size.height + [UserActiveGraphCell cellHeight] + 100;
+        offsetY = ((UITableViewCell *)[self valueForKey:@"userInfoCell"]).frame.size.height + [UserActiveGraphCell cellHeight] + 80;
     }
     return offsetY;
 }
@@ -229,7 +237,7 @@ - (void)refreshCurUser{
             [weakSelf sendRequest];
         }else{
             [weakSelf.view endLoading];
-            [weakSelf.view configBlankPage:([[Login curLoginUser] isSameToUser:self.curTweets.curUser]? EaseBlankPageTypeTweet: EaseBlankPageTypeTweetOther) hasData:(weakSelf.curTweets.list.count > 0) hasError:YES offsetY:[weakSelf blankPageOffsetY] reloadButtonBlock:^(id sender) {
+            [weakSelf.view configBlankPage:[weakSelf blankType] hasData:(weakSelf.curTweets.list.count > 0) hasError:YES offsetY:[weakSelf blankPageOffsetY] reloadButtonBlock:^(id sender) {
                 [weakSelf sendRequest];
             }];
         }
@@ -336,7 +344,7 @@ - (void)goToDetailWithTweet:(Tweet *)curTweet{
     vc.deleteTweetBlock = ^(Tweet *toDeleteTweet){
         [weakSelf.curTweets.list removeObject:toDeleteTweet];
         [weakSelf.myTableView reloadData];
-        [weakSelf.view configBlankPage:([[Login curLoginUser] isSameToUser:self.curTweets.curUser]? EaseBlankPageTypeTweet: EaseBlankPageTypeTweetOther) hasData:(weakSelf.curTweets.list.count > 0) hasError:NO offsetY:[weakSelf blankPageOffsetY] reloadButtonBlock:^(id sender) {
+        [weakSelf.view configBlankPage:[weakSelf blankType] hasData:(weakSelf.curTweets.list.count > 0) hasError:NO offsetY:[weakSelf blankPageOffsetY] reloadButtonBlock:^(id sender) {
             [weakSelf sendRequest];
         }];
     };

Coding_iOS/Controllers/TeamListViewController.m

@@ -22,6 +22,7 @@ typedef NS_ENUM(NSInteger, EaseBlankPageType)
     EaseBlankPageTypeTopic,
     EaseBlankPageTypeTweet,
     EaseBlankPageTypeTweetOther,
+    EaseBlankPageTypeTweetProject,
     EaseBlankPageTypeProject,
     EaseBlankPageTypeProjectOther,
     EaseBlankPageTypeFileDleted,
@@ -44,6 +45,9 @@ typedef NS_ENUM(NSInteger, EaseBlankPageType)
     EaseBlankPageTypeProject_WATCHED,
     EaseBlankPageTypeProject_STARED,
     EaseBlankPageTypeProject_SEARCH,
+    EaseBlankPageTypeTeam,
+    EaseBlankPageTypeFile,
+    EaseBlankPageTypeMessageList,
 };
 
 typedef NS_ENUM(NSInteger, BadgePositionType) {
@@ -119,8 +123,8 @@ typedef NS_ENUM(NSInteger, BadgePositionType) {
 
 @interface EaseBlankPageView : UIView
 @property (strong, nonatomic) UIImageView *monkeyView;
-@property (strong, nonatomic) UILabel *tipLabel;
-@property (strong, nonatomic) UIButton *reloadButton;
+@property (strong, nonatomic) UILabel *tipLabel, *titleLabel;
+@property (strong, nonatomic) UIButton *reloadButton, *actionButton;
 @property (assign, nonatomic) EaseBlankPageType curType;
 @property (copy, nonatomic) void(^reloadButtonBlock)(id sender);
 @property (copy, nonatomic) void(^loadAndShowStatusBlock)();