Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MJRefreshHeader's resetInset bug for section header pinned & device r… #1444

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

MJRefreshHeader's resetInset bug for section header pinned & device r… #1444

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
812aace
MJRefreshHeader's resetInset bug for section header pinned & device r…
Jun 11, 2020
78c445b
adapter case of isCollectionViewAnimationBug = YES
Jun 13, 2020
bf2d044
recover unmeaning changed code
Jun 13, 2020
fe0e485
fixed device orientation bug
Jun 15, 2020
de26bb9
Merge branch 'master' into clx
wolfcon Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 19 additions & 13 deletions MJRefresh/Base/MJRefreshHeader.m
View file
Open in desktop
Expand Up @@ -58,28 +58,31 @@ - (void)resetInset {
}

// sectionheader停留解决
CGFloat insetT = - self.scrollView.mj_offsetY > _scrollViewOriginalInset.top ? - self.scrollView.mj_offsetY : _scrollViewOriginalInset.top;
insetT = insetT > self.mj_h + _scrollViewOriginalInset.top ? self.mj_h + _scrollViewOriginalInset.top : insetT;
self.insetTDelta = _scrollViewOriginalInset.top - insetT;
// 避免 CollectionView 在使用根据 Autolayout 和 内容自动伸缩 Cell, 刷新时导致的 Layout 异常渲染问题
if (self.scrollView.mj_insetT != insetT) {
self.scrollView.mj_insetT = insetT;
if (self.scrollView.isUserInteractionEnabled && (self.scrollView.isTracking || self.scrollView.isDecelerating)) {
CGFloat systemTop = self.scrollView.mj_insetT - self.insetTDelta;
CGFloat delta = -systemTop - self.scrollView.mj_offsetY;
delta = delta < 0.f ? 0 : MIN(delta, self.mj_h);
if (delta >= 0 && delta != self.insetTDelta) {
CGFloat adjust = delta - self.insetTDelta;
self.insetTDelta = delta;
self.scrollView.mj_insetT += adjust;
}
}
}

- (void)scrollViewContentOffsetDidChange:(NSDictionary *)change
{
[super scrollViewContentOffsetDidChange:change];

// 跳转到下一个控制器时，contentInset可能会变
_scrollViewOriginalInset = self.scrollView.mj_inset;

// 在刷新的refreshing状态
if (self.state == MJRefreshStateRefreshing) {
[self resetInset];
return;
}

// 跳转到下一个控制器时，contentInset可能会变
_scrollViewOriginalInset = self.scrollView.mj_inset;

// 当前的contentOffset
CGFloat offsetY = self.scrollView.mj_offsetY;
// 头部控件刚好出现的offsetY
Expand Down Expand Up @@ -133,8 +136,8 @@ - (void)headerEndingAction {
if (!self.isCollectionViewAnimationBug) {
// 恢复inset和offset
[UIView animateWithDuration:self.slowAnimationDuration animations:^{
self.scrollView.mj_insetT += self.insetTDelta;

self.scrollView.mj_insetT -= self.insetTDelta;
self.insetTDelta = 0.f;
if (self.endRefreshingAnimationBeginAction) {
self.endRefreshingAnimationBeginAction();
}
Expand Down Expand Up @@ -163,13 +166,13 @@ - (void)headerEndingAction {
// 由于修改 Inset 会导致 self.pullingPercent 联动设置 self.alpha, 故提前获取 alpha 值, 后续用于还原 alpha 动画
CGFloat viewAlpha = self.alpha;

self.scrollView.mj_insetT += self.insetTDelta;
self.scrollView.mj_insetT -= self.insetTDelta;
// 禁用交互, 如果不禁用可能会引起渲染问题.
self.scrollView.userInteractionEnabled = NO;

//CAAnimation keyPath 不支持 contentInset 用Bounds的动画代替
CABasicAnimation *boundsAnimation = [CABasicAnimation animationWithKeyPath:@"bounds"];
boundsAnimation.fromValue = [NSValue valueWithCGRect:CGRectOffset(self.scrollView.bounds, 0, self.insetTDelta)];
boundsAnimation.fromValue = [NSValue valueWithCGRect:CGRectOffset(self.scrollView.bounds, 0, -self.insetTDelta)];
boundsAnimation.duration = self.slowAnimationDuration;
//在delegate里移除
boundsAnimation.removedOnCompletion = NO;
Expand Down Expand Up @@ -206,6 +209,7 @@ - (void)headerRefreshingAction {
CGFloat top = self.scrollViewOriginalInset.top + self.mj_h;
// 增加滚动区域top
self.scrollView.mj_insetT = top;
self.insetTDelta = self.mj_h;
// 设置滚动位置
CGPoint offset = self.scrollView.contentOffset;
offset.y = -top;
Expand Down Expand Up @@ -254,6 +258,7 @@ - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag {
NSString *identity = [anim valueForKey:@"identity"];
if ([identity isEqualToString:MJRefreshHeaderRefreshing2IdleBoundsKey]) {
self.pullingPercent = 0.0;
self.insetTDelta = 0.f;
self.scrollView.userInteractionEnabled = YES;
if (self.endRefreshingCompletionBlock) {
self.endRefreshingCompletionBlock();
Expand All @@ -262,6 +267,7 @@ - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag {
// 避免出现 end 先于 Refreshing 状态
if (self.state != MJRefreshStateIdle) {
CGFloat top = self.scrollViewOriginalInset.top + self.mj_h;
self.insetTDelta = self.mj_h;
self.scrollView.mj_insetT = top;
// 设置最终滚动位置
CGPoint offset = self.scrollView.contentOffset;
Expand Down