Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 341d991

Browse files
个人主页没有话题或者冒泡的时候,猴子的位置错乱
1 parent 38ec5ab commit 341d991

File tree

4 files changed

+26
-15
lines changed

4 files changed

+26
-15
lines changed

‎Coding_iOS/Controllers/MeDisplayViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ - (void)requestTopicsMore:(BOOL)loadMore{
133133
[weakSelf.myTableView reloadData];
134134
weakSelf.myTableView.showsInfiniteScrolling = hasMoreData;
135135
}
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] + 60reloadButtonBlock:^(id sender) {
137137
[weakSelf refresh];
138138
}];
139139

‎Coding_iOS/Controllers/UserOrProjectTweetsViewController.m‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#import "SVPullToRefresh.h"
1818
#import "WebViewController.h"
1919
#import "ProjectTweetSendViewController.h"
20+
#import "EaseUserHeaderView.h"
2021

2122
@interface UserOrProjectTweetsViewController ()
2223
@property (nonatomic, strong, readwrite) UITableView *myTableView;
@@ -151,7 +152,7 @@ - (void)deleteTweet:(Tweet *)curTweet outTweetsIndex:(NSInteger)outTweetsIndex{
151152
if (data) {
152153
[_self.curTweets.list removeObject:curTweet];
153154
[_self.myTableView reloadData];
154-
[_self.view configBlankPage:([[Login curLoginUser] isSameToUser:_self.curTweets.curUser]? EaseBlankPageTypeTweet: EaseBlankPageTypeTweetOther) hasData:(_self.curTweets.list.count > 0) hasError:NO reloadButtonBlock:^(id sender) {
155+
[_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) {
155156
ESStrongSelf;
156157
[_self sendRequest];
157158
}];
@@ -207,12 +208,19 @@ - (void)sendRequest{
207208
[weakSelf.myTableView reloadData];
208209
weakSelf.myTableView.showsInfiniteScrolling = weakSelf.curTweets.canLoadMore;
209210
}
210-
[weakSelf.view configBlankPage:([[Login curLoginUser] isSameToUser:self.curTweets.curUser]? EaseBlankPageTypeTweet: EaseBlankPageTypeTweetOther) hasData:(weakSelf.curTweets.list.count > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
211+
[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) {
211212
[weakSelf sendRequest];
212213
}];
213214
}];
214215
}
215216

217+
- (CGFloat)blankPageOffsetY{//MeDisplayViewController
218+
CGFloat offsetY = 0;
219+
if ([self isMemberOfClass:NSClassFromString(@"MeDisplayViewController")]) {
220+
offsetY = [(EaseUserHeaderView *)[self valueForKey:@"eaV"] originalHeight] + 60;
221+
}
222+
return offsetY;
223+
}
216224

217225
- (void)refreshCurUser{
218226
__weak typeof(self) weakSelf = self;
@@ -223,7 +231,7 @@ - (void)refreshCurUser{
223231
[weakSelf sendRequest];
224232
}else{
225233
[weakSelf.view endLoading];
226-
[weakSelf.view configBlankPage:([[Login curLoginUser] isSameToUser:self.curTweets.curUser]? EaseBlankPageTypeTweet: EaseBlankPageTypeTweetOther) hasData:(weakSelf.curTweets.list.count > 0) hasError:YES reloadButtonBlock:^(id sender) {
234+
[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) {
227235
[weakSelf sendRequest];
228236
}];
229237
}
@@ -328,7 +336,7 @@ - (void)goToDetailWithTweet:(Tweet *)curTweet{
328336
vc.deleteTweetBlock = ^(Tweet *toDeleteTweet){
329337
[weakSelf.curTweets.list removeObject:toDeleteTweet];
330338
[weakSelf.myTableView reloadData];
331-
[weakSelf.view configBlankPage:([[Login curLoginUser] isSameToUser:self.curTweets.curUser]? EaseBlankPageTypeTweet: EaseBlankPageTypeTweetOther) hasData:(weakSelf.curTweets.list.count > 0) hasError:NO reloadButtonBlock:^(id sender) {
339+
[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) {
332340
[weakSelf sendRequest];
333341
}];
334342
};

‎Coding_iOS/Util/OC_Category/UIView+Common.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ typedef NS_ENUM(NSInteger, BadgePositionType) {
107107
#pragma mark BlankPageView
108108
@property (strong, nonatomic) EaseBlankPageView *blankPageView;
109109
- (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError reloadButtonBlock:(void(^)(id sender))block;
110+
- (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError offsetY:(CGFloat)offsetY reloadButtonBlock:(void(^)(id sender))block;
110111
@end
111112

112113
@interface EaseLoadingView : UIView
@@ -124,6 +125,6 @@ typedef NS_ENUM(NSInteger, BadgePositionType) {
124125
@property (copy, nonatomic) void(^reloadButtonBlock)(id sender);
125126
@property (copy, nonatomic) void(^loadAndShowStatusBlock)();
126127
@property (copy, nonatomic) void(^clickButtonBlock)(EaseBlankPageType curType);
127-
- (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError reloadButtonBlock:(void(^)(id sender))block;
128+
- (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError offsetY:(CGFloat)offsetYreloadButtonBlock:(void(^)(id sender))block;
128129
@end
129130

‎Coding_iOS/Util/OC_Category/UIView+Common.m‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,10 @@ - (EaseBlankPageView *)blankPageView{
391391
}
392392

393393
- (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError reloadButtonBlock:(void (^)(id))block{
394+
[self configBlankPage:blankPageType hasData:hasData hasError:hasError offsetY:0 reloadButtonBlock:block];
395+
}
396+
397+
- (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError offsetY:(CGFloat)offsetY reloadButtonBlock:(void(^)(id sender))block{
394398
if (hasData) {
395399
if (self.blankPageView) {
396400
self.blankPageView.hidden = YES;
@@ -402,13 +406,7 @@ - (void)configBlankPage:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData h
402406
}
403407
self.blankPageView.hidden = NO;
404408
[self.blankPageContainer insertSubview:self.blankPageView atIndex:0];
405-
406-
// [self.blankPageContainer insertSubview:self.blankPageView atIndex:0];
407-
// [self.blankPageView mas_makeConstraints:^(MASConstraintMaker *make) {
408-
// make.size.equalTo(self);
409-
// make.top.left.equalTo(self.blankPageContainer);
410-
// }];
411-
[self.blankPageView configWithType:blankPageType hasData:hasData hasError:hasError reloadButtonBlock:block];
409+
[self.blankPageView configWithType:blankPageType hasData:hasData hasError:hasError offsetY:offsetY reloadButtonBlock:block];
412410
}
413411
}
414412

@@ -509,7 +507,7 @@ - (instancetype)initWithFrame:(CGRect)frame{
509507
return self;
510508
}
511509

512-
- (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError reloadButtonBlock:(void (^)(id))block{
510+
- (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData hasError:(BOOL)hasError offsetY:(CGFloat)offsetYreloadButtonBlock:(void (^)(id))block{
513511

514512
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
515513
if (_loadAndShowStatusBlock) {
@@ -542,7 +540,11 @@ - (void)configWithType:(EaseBlankPageType)blankPageType hasData:(BOOL)hasData ha
542540
// 布局
543541
[_monkeyView mas_makeConstraints:^(MASConstraintMaker *make) {
544542
make.centerX.equalTo(self);
545-
make.bottom.equalTo(self.mas_centerY);
543+
if (ABS(offsetY) > 1.0) {
544+
make.top.equalTo(self).offset(offsetY);
545+
}else{
546+
make.bottom.equalTo(self.mas_centerY);
547+
}
546548
}];
547549
[_tipLabel mas_makeConstraints:^(MASConstraintMaker *make) {
548550
make.left.right.centerX.equalTo(self);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /