|
@@ -132,17 +132,27 @@ CGFloat const JLRefreshFooterHeight = 30;
|
|
|
|
|
|
|
|
[super scrollViewContentOffsetDidChange:change];
|
|
[super scrollViewContentOffsetDidChange:change];
|
|
|
|
|
|
|
|
|
|
+ CGFloat offsetY = self.scrollView.jl_offsetY + self.scrollView.jl_height;
|
|
|
|
|
+ CGFloat startY = self.scrollView.jl_insetBottom + self.scrollView.jl_ContentHeight - self.jl_height;
|
|
|
|
|
+ CGFloat idle2WillRefresh = startY + self.jl_height * 1.5;
|
|
|
|
|
+
|
|
|
if (self.offsetBlock) {
|
|
if (self.offsetBlock) {
|
|
|
self.offsetBlock(self.scrollView.jl_ContentHeight - self.scrollView.jl_offsetY - self.scrollView.jl_height);
|
|
self.offsetBlock(self.scrollView.jl_ContentHeight - self.scrollView.jl_offsetY - self.scrollView.jl_height);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (self.scrollView.jl_ContentHeight >= self.scrollView.jl_height) {
|
|
|
|
|
+
|
|
|
|
|
+ if (self.state != JLRefreshStateRefreshing && self.jl_y >= self.scrollView.jl_height && offsetY > self.jl_y) {
|
|
|
|
|
+ // 触底就加载
|
|
|
|
|
+ self.state = JLRefreshStateRefreshing;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (self.state == JLRefreshStateRefreshing) {
|
|
if (self.state == JLRefreshStateRefreshing) {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- CGFloat offsetY = self.scrollView.jl_offsetY + self.scrollView.jl_height;
|
|
|
|
|
- CGFloat startY = self.scrollView.jl_insetBottom + self.scrollView.jl_ContentHeight - self.jl_height;
|
|
|
|
|
- CGFloat idle2WillRefresh = startY + self.jl_height * 1.5;
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
if ([self contentSizeIsOutOfScrollViewBounds]) {
|
|
if ([self contentSizeIsOutOfScrollViewBounds]) {
|
|
|
|
|
|