From 78751d2913085afc931207fab6c4e8a683f744ec Mon Sep 17 00:00:00 2001
From: qinhehu <qinhehu@gmail.com>
Date: Wed, 26 Jul 2017 15:10:40 +0800
Subject: [PATCH] fix loadmore and autorefresh bug

---
 library/src/main/java/com/cjj/MaterialHeaderView.java    | 3 +++
 library/src/main/java/com/cjj/MaterialRefreshLayout.java | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/cjj/MaterialHeaderView.java b/library/src/main/java/com/cjj/MaterialHeaderView.java
index e58ccf3..5a57219 100644
--- a/library/src/main/java/com/cjj/MaterialHeaderView.java
+++ b/library/src/main/java/com/cjj/MaterialHeaderView.java
@@ -192,6 +192,9 @@ public void onRefreshing(MaterialRefreshLayout materialRefreshLayout) {
             materialWaveView.onRefreshing(materialRefreshLayout);
         }
         if (circleProgressBar != null) {
+            ViewCompat.setScaleX(circleProgressBar, 1f);
+            ViewCompat.setScaleY(circleProgressBar, 1f);
+            ViewCompat.setAlpha(circleProgressBar, 1f);
             circleProgressBar.onRefreshing(materialRefreshLayout);
         }
     }
diff --git a/library/src/main/java/com/cjj/MaterialRefreshLayout.java b/library/src/main/java/com/cjj/MaterialRefreshLayout.java
index 78b5d69..40efaf0 100644
--- a/library/src/main/java/com/cjj/MaterialRefreshLayout.java
+++ b/library/src/main/java/com/cjj/MaterialRefreshLayout.java
@@ -206,11 +206,16 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
                     return true;
                 } else if (dy < 0 && !canChildScrollDown() && isLoadMore) {
                     if (mMaterialFooterView != null && !isLoadMoreing) {
-                        soveLoadMoreLogic();
+                        isLoadMoreing = true;
                     }
                     return super.onInterceptTouchEvent(ev);
                 }
                 break;
+            case MotionEvent.ACTION_UP:
+                if (isLoadMoreing) {
+                    soveLoadMoreLogic();
+                }
+                break;
         }
         return super.onInterceptTouchEvent(ev);
     }