个人主页没有话题或者冒泡的时候，猴子的位置错乱

wanghengheng · wanghengheng · commit 341d991624cd · 2016-11-01T15:55:43.000+08:00
diff --git a/Coding_iOS/Controllers/MeDisplayViewController.m b/Coding_iOS/Controllers/MeDisplayViewController.m
@@ -133,7 +133,7 @@ - (void)requestTopicsMore:(BOOL)loadMore{
             [weakSelf.myTableView reloadData];
             weakSelf.myTableView.showsInfiniteScrolling = hasMoreData;
         }
-        [weakSelf.view configBlankPage:EaseBlankPageTypeMyJoinedTopic hasData:weakSelf.dataList.count > 0 hasError:error != nil reloadButtonBlock:^(id sender) {
+        [weakSelf.view configBlankPage:EaseBlankPageTypeMyJoinedTopic hasData:weakSelf.dataList.count > 0 hasError:error != nil offsetY:[_eaV originalHeight] + 60 reloadButtonBlock:^(id sender) {
             [weakSelf refresh];
         }];
 
diff --git a/Coding_iOS/Controllers/UserOrProjectTweetsViewController.m b/Coding_iOS/Controllers/UserOrProjectTweetsViewController.m
@@ -17,6 +17,7 @@
 #import "SVPullToRefresh.h"
 #import "WebViewController.h"
 #import "ProjectTweetSendViewController.h"
+#import "EaseUserHeaderView.h"
 
 @interface UserOrProjectTweetsViewController ()
 @property (nonatomic, strong, readwrite) UITableView *myTableView;
@@ -151,7 +152,7 @@ - (void)deleteTweet:(Tweet *)curTweet outTweetsIndex:(NSInteger)outTweetsIndex{
         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 reloadButtonBlock:^(id sender) {
+            [_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) {
                 ESStrongSelf;
                 [_self sendRequest];
             }];
@@ -207,12 +208,19 @@ - (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) reloadButtonBlock:^(id sender) {
+        [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 sendRequest];
         }];
     }];
 }
 
+- (CGFloat)blankPageOffsetY{//MeDisplayViewController
+    CGFloat offsetY = 0;
+    if ([self isMemberOfClass:NSClassFromString(@"MeDisplayViewController")]) {
+        offsetY = [(EaseUserHeaderView *)[self valueForKey:@"eaV"] originalHeight] + 60;
+    }
+    return offsetY;
+}
 
 - (void)refreshCurUser{
     __weak typeof(self) weakSelf = self;
@@ -223,7 +231,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 reloadButtonBlock:^(id sender) {
+            [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 sendRequest];
             }];
         }
@@ -328,7 +336,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 reloadButtonBlock:^(id sender) {
+        [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 sendRequest];
         }];
     };
diff --git a/Coding_iOS/Util/OC_Category/UIView+Common.h b/Coding_iOS/Util/OC_Category/UIView+Common.h
@@ -107,6 +107,7 @@ typedef NS_ENUM(NSInteger, BadgePositionType) {
 #pragma mark BlankPageView
 @property (strong, nonatomic) EaseBlankPageView *blankPageView;
 - (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError reloadButtonBlock:(void(^)(id sender))block;
+- (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError offsetY:(CGFloat)offsetY reloadButtonBlock:(void(^)(id sender))block;
 @end
 
 @interface EaseLoadingView : UIView
@@ -124,6 +125,6 @@ typedef NS_ENUM(NSInteger, BadgePositionType) {
 @property (copy, nonatomic) void(^reloadButtonBlock)(id sender);
 @property (copy, nonatomic) void(^loadAndShowStatusBlock)();
 @property (copy, nonatomic) void(^clickButtonBlock)(EaseBlankPageType curType);
-- (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError reloadButtonBlock:(void(^)(id sender))block;
+- (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError offsetY:(CGFloat)offsetY reloadButtonBlock:(void(^)(id sender))block;
 @end
 
diff --git a/Coding_iOS/Util/OC_Category/UIView+Common.m b/Coding_iOS/Util/OC_Category/UIView+Common.m
@@ -391,6 +391,10 @@ - (EaseBlankPageView *)blankPageView{
 }
 
 - (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError reloadButtonBlock:(void (^)(id))block{
+    [self configBlankPage:blankPageType hasData:hasData hasError:hasError offsetY:0 reloadButtonBlock:block];
+}
+
+- (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError offsetY:(CGFloat)offsetY reloadButtonBlock:(void(^)(id sender))block{
     if (hasData) {
         if (self.blankPageView) {
             self.blankPageView.hidden = YES;
@@ -402,13 +406,7 @@ - (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData h
         }
         self.blankPageView.hidden = NO;
         [self.blankPageContainer insertSubview:self.blankPageView atIndex:0];
-
-//        [self.blankPageContainer insertSubview:self.blankPageView atIndex:0];
-//        [self.blankPageView mas_makeConstraints:^(MASConstraintMaker *make) {
-//            make.size.equalTo(self);
-//            make.top.left.equalTo(self.blankPageContainer);
-//        }];
-        [self.blankPageView configWithType:blankPageType hasData:hasData hasError:hasError reloadButtonBlock:block];
+        [self.blankPageView configWithType:blankPageType hasData:hasData hasError:hasError offsetY:offsetY reloadButtonBlock:block];
     }
 }
 
@@ -509,7 +507,7 @@ - (instancetype)initWithFrame:(CGRect)frame{
     return self;
 }
 
-- (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError reloadButtonBlock:(void (^)(id))block{
+- (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError offsetY:(CGFloat)offsetY reloadButtonBlock:(void (^)(id))block{
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         if (_loadAndShowStatusBlock) {
@@ -542,7 +540,11 @@ - (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData ha
     //    &#24067;&#23616;
     [_monkeyView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.equalTo(self);
-        make.bottom.equalTo(self.mas_centerY);
+        if (ABS(offsetY) > 1.0) {
+            make.top.equalTo(self).offset(offsetY);
+        }else{
+            make.bottom.equalTo(self.mas_centerY);
+        }
     }];
     [_tipLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.centerX.equalTo(self);

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ - (void)requestTopicsMore:(BOOL)loadMore{`
`133`	`133`	`[weakSelf.myTableView reloadData];`
`134`	`134`	`weakSelf.myTableView.showsInfiniteScrolling = hasMoreData;`
`135`	`135`	`}`
`136`		`- [weakSelf.view configBlankPage:EaseBlankPageTypeMyJoinedTopic hasData:weakSelf.dataList.count > 0 hasError:error != nil reloadButtonBlock:^(id sender) {`
	`136`	`+ [weakSelf.view configBlankPage:EaseBlankPageTypeMyJoinedTopic hasData:weakSelf.dataList.count > 0 hasError:error != nil offsetY:[_eaV originalHeight] + 60 reloadButtonBlock:^(id sender) {`
`137`	`137`	`[weakSelf refresh];`
`138`	`138`	`}];`
`139`	`139`