diff --git a/Phoenix/src/main/java/com/yalantis/phoenix/PullToRefreshView.java b/Phoenix/src/main/java/com/yalantis/phoenix/PullToRefreshView.java index 5dd66f0..0c66f8d 100644 --- a/Phoenix/src/main/java/com/yalantis/phoenix/PullToRefreshView.java +++ b/Phoenix/src/main/java/com/yalantis/phoenix/PullToRefreshView.java @@ -326,10 +326,8 @@ private void animateOffsetToCorrectPosition() { if (mRefreshing) {//开始刷新 mBaseRefreshView.start(); - if (mNotify) { - if (mListener != null) { - mListener.onRefresh(); - } + if (mNotify && mListener != null) { + mListener.onRefresh(); } } else {//停止刷新 mBaseRefreshView.stop(); diff --git a/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/PullToRefreshLayoutTellH/PullToRefreshLayout.java b/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/PullToRefreshLayoutTellH/PullToRefreshLayout.java index 0e4f5f2..abb4b58 100644 --- a/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/PullToRefreshLayoutTellH/PullToRefreshLayout.java +++ b/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/PullToRefreshLayoutTellH/PullToRefreshLayout.java @@ -459,10 +459,8 @@ public void onAnimationStart(Animation animation) { @Override public void onAnimationEnd(Animation animation) { if (mRefreshing) {//开始刷新 - if (mNotify) { - if (mListener != null) { - mListener.onRefresh(); - } + if (mNotify && mListener != null) { + mListener.onRefresh(); } } else {//停止刷新 animateOffsetToStartPosition(); diff --git a/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/WaterDropListView/WaterDropListView.java b/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/WaterDropListView/WaterDropListView.java index 87df9da..3f92d24 100644 --- a/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/WaterDropListView/WaterDropListView.java +++ b/app/src/main/java/com/tellh/android_pulltorefreshlibrary_collection/WaterDropListView/WaterDropListView.java @@ -357,11 +357,9 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun } @Override public void notifyStateChanged(WaterDropListViewHeader.STATE oldState, WaterDropListViewHeader.STATE newState) { - if(newState == WaterDropListViewHeader.STATE.refreshing){ - if(mListViewListener != null){ - mIsRefreshing=true; - mListViewListener.onRefresh(); - } + if (newState == WaterDropListViewHeader.STATE.refreshing && mListViewListener != null) { + mIsRefreshing = true; + mListViewListener.onRefresh(); } } public void setWaterDropListViewListener(IWaterDropListViewListener l) { diff --git a/swipetorefreshlayoutgoogle/src/main/java/com/tellh/swipetorefreshlayoutgoogle/SwipeRefreshTestLayout.java b/swipetorefreshlayoutgoogle/src/main/java/com/tellh/swipetorefreshlayoutgoogle/SwipeRefreshTestLayout.java index 3b0f588..fa4ebe1 100644 --- a/swipetorefreshlayoutgoogle/src/main/java/com/tellh/swipetorefreshlayoutgoogle/SwipeRefreshTestLayout.java +++ b/swipetorefreshlayoutgoogle/src/main/java/com/tellh/swipetorefreshlayoutgoogle/SwipeRefreshTestLayout.java @@ -223,10 +223,8 @@ public void onAnimationEnd(Animation animation) { // Make sure the progress view is fully visible mProgress.setAlpha(MAX_ALPHA); mProgress.start(); - if (mNotify) { - if (mListener != null) { - mListener.onRefresh(); - } + if (mNotify && mListener != null) { + mListener.onRefresh(); } } else { mProgress.stop(); diff --git a/taurus_flyplane/src/main/java/com/yalantis/taurus/PullToRefreshView.java b/taurus_flyplane/src/main/java/com/yalantis/taurus/PullToRefreshView.java index 9230c3c..dee69f9 100644 --- a/taurus_flyplane/src/main/java/com/yalantis/taurus/PullToRefreshView.java +++ b/taurus_flyplane/src/main/java/com/yalantis/taurus/PullToRefreshView.java @@ -238,10 +238,8 @@ private void animateOffsetToCorrectPosition() { if (mRefreshing) { mRefreshView.start(); - if (mNotify) { - if (mListener != null) { - mListener.onRefresh(); - } + if (mNotify && mListener != null) { + mListener.onRefresh(); } } else { mRefreshView.stop();