From 93adac02dd4d602cf300f68a5b63eb918024be39 Mon Sep 17 00:00:00 2001 From: songdehuai Date: Mon, 14 Aug 2017 10:13:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tkrefreshlayout/{Footer => footer}/BallPulseView.java | 0 .../lcodecore/tkrefreshlayout/{Footer => footer}/LoadingView.java | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename library/src/main/java/com/lcodecore/tkrefreshlayout/{Footer => footer}/BallPulseView.java (100%) rename library/src/main/java/com/lcodecore/tkrefreshlayout/{Footer => footer}/LoadingView.java (100%) diff --git a/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/BallPulseView.java b/library/src/main/java/com/lcodecore/tkrefreshlayout/footer/BallPulseView.java similarity index 100% rename from library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/BallPulseView.java rename to library/src/main/java/com/lcodecore/tkrefreshlayout/footer/BallPulseView.java diff --git a/library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/LoadingView.java b/library/src/main/java/com/lcodecore/tkrefreshlayout/footer/LoadingView.java similarity index 100% rename from library/src/main/java/com/lcodecore/tkrefreshlayout/Footer/LoadingView.java rename to library/src/main/java/com/lcodecore/tkrefreshlayout/footer/LoadingView.java From 7793c2875f8536e98bb9542893faee1dba6d267d Mon Sep 17 00:00:00 2001 From: songdehuai Date: Mon, 21 Aug 2017 15:17:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?```=201=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=B0=83=E7=94=A8=20fininshLoadMore();=20fin?= =?UTF-8?q?ishRefreshing();=20=E6=97=B6=E5=80=99=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B6=E9=83=A8=E4=BC=9A=E8=B7=B3=E5=8A=A8.=202=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=20finishAll();=20=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=9D=A5=E5=90=8C=E6=97=B6=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=92=8C=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?.=20```?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tkrefreshlayout/TwinklingRefreshLayout.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java b/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java index 455166f..2c30317 100644 --- a/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java +++ b/library/src/main/java/com/lcodecore/tkrefreshlayout/TwinklingRefreshLayout.java @@ -577,14 +577,26 @@ public void startLoadMore() { * 结束刷新 */ public void finishRefreshing() { - cp.finishRefreshing(); + if (cp.isRefreshing()) { + cp.finishRefreshing(); + } } /** * 结束加载更多 */ public void finishLoadmore() { - cp.finishLoadmore(); + if (cp.isLoadingMore()) { + cp.finishLoadmore(); + } + } + + /** + * 同时结束刷新和加载更多 + */ + public void finishAll(){ + finishRefreshing(); + finishLoadmore(); } /**