[1/2] incubator-weex git commit: 下拉刷新组件在刷新时，快速上滑导致下拉刷新结束后不会隐藏的bug

[misakuo]

Repository: incubator-weex
Updated Branches:
  refs/heads/0.16-dev 6c281c86c -> 11f0db346


下拉刷新组件在刷新时，快速上滑导致下拉刷新结束后不会隐藏的bug


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/74181e44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/74181e44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/74181e44

Branch: refs/heads/0.16-dev
Commit: 74181e440b53fb1c593bf00f738a02809407ea8a
Parents: 6c281c8
Author: 小明 <xiaoming@xiaomingdeMacBook-Pro.local>
Authored: Fri Aug 18 16:12:10 2017 +0800
Committer: 小明 <xiaoming@xiaomingdeMacBook-Pro.local>
Committed: Fri Aug 18 16:12:10 2017 +0800

----------------------------------------------------------------------
 .../java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/74181e44/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
----------------------------------------------------------------------
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
index 0b5de59..8674f22 100644
--- 
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
+++ 
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
@@ -248,7 +248,8 @@ public class WXSwipeLayout extends FrameLayout implements 
NestedScrollingParent
       if (dy < 0 && !canChildScrollUp()) {
         mCurrentAction = PULL_REFRESH;
         isConfirm = true;
-      } else if (dy > 0 && !canChildScrollDown()) {
+      } else if (dy > 0 && !canChildScrollDown() && (!mRefreshing)) {
+        //当前正在刷新时不响应"上拉加载更多"
         mCurrentAction = LOAD_MORE;
         isConfirm = true;
       }