增加在禁用上拉加载时，可选禁止界面被上拉的功能

huxq17 · Jun 24, 2016 · c1afb03 · c1afb03
1 parent 5d8d73d
commit c1afb03
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/app/src/main/java/com/andview/example/activity/BannerRecyclerViewActivity.java b/app/src/main/java/com/andview/example/activity/BannerRecyclerViewActivity.java
@@ -68,9 +68,9 @@ protected void onCreate(Bundle savedInstanceState) {
         xRefreshView.setMoveForHorizontal(true);
 //        adapter.setHeaderView(headerView, recyclerView);
         adapter.setCustomLoadMoreView(new XRefreshViewFooter(this));
-//        xRefreshView.setPullRefreshEnable(false);
+        xRefreshView.setPullRefreshEnable(false);
         //设置在下拉刷新被禁用的情况下，是否允许界面被下拉,默认是true
-//        xRefreshView.setMoveHeadWhenDisablePullRefresh(false);
+        xRefreshView.setMoveHeadWhenDisablePullRefresh(false);
 
 //		xRefreshView.setPullLoadEnable(false);
         //设置静默加载时提前加载的item个数

diff --git a/app/src/main/java/com/andview/example/activity/GridViewActivity.java b/app/src/main/java/com/andview/example/activity/GridViewActivity.java
@@ -33,12 +33,14 @@ public void onCreate(Bundle savedInstanceState) {
 		}
 		gv = (GridView) findViewById(R.id.gv);
 		outView = (XRefreshView) findViewById(R.id.custom_view);
-		outView.setPullLoadEnable(true);
+//		outView.setPullLoadEnable(true);
+		//设置在上拉加载被禁用的情况下，是否允许界面被上拉
+//		outView.setMoveFootWhenDisablePullLoadMore(false);
 		adapter = new ArrayAdapter<String>(this,
 				android.R.layout.simple_list_item_1, str_name);
 		gv.setAdapter(adapter);
 		outView.setPinnedTime(1000);
-		outView.setAutoLoadMore(true);
+//		outView.setAutoLoadMore(true);
 //		outView.setCustomHeaderView(new CustomHeader(this));
 //		outView.setCustomHeaderView(new XRefreshViewHeader(this));
 		outView.setMoveForHorizontal(true);

diff --git a/library/gradle.properties b/library/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=3.1.1
+VERSION_NAME=3.1.2
 GROUP=com.huxq17.xrefreshview
 POM_NAME=Android universal pull to refresh library
 POM_ARTIFACT_ID=xrefreshview

diff --git a/library/src/main/java/com/andview/refreshview/XRefreshView.java b/library/src/main/java/com/andview/refreshview/XRefreshView.java
@@ -73,7 +73,8 @@ public class XRefreshView extends LinearLayout {
     private Scroller mScroller;
     private boolean mMoveForHorizontal = false;
     private boolean isForHorizontalMove = false;
-    private boolean mCanMoveHeader = true;
+    private boolean mCanMoveHeaderWhenDisablePullRefresh = true;
+    private boolean mCanMoveFooterWhenDisablePullLoadMore = true;
 
     private boolean mIsIntercept = false;
     private IHeaderCallBack mHeaderCallBack;
@@ -546,7 +547,7 @@ private void updateHeaderHeight(int currentY, int deltaY, int... during) {
             if (mHolder.isOverHeader(deltaY)) {
                 deltaY = -mHolder.mOffsetY;
             }
-            if (mCanMoveHeader) {
+            if (mEnablePullRefresh || mCanMoveHeaderWhenDisablePullRefresh) {
                 moveView(deltaY);
             }
             if (mEnablePullRefresh && !mPullRefreshing) {
@@ -571,15 +572,26 @@ private void updateHeaderHeight(int currentY, int deltaY, int... during) {
      * @param moveHeadWhenDisablePullRefresh 默认是true
      */
     public void setMoveHeadWhenDisablePullRefresh(boolean moveHeadWhenDisablePullRefresh) {
-        mCanMoveHeader = moveHeadWhenDisablePullRefresh;
+        mCanMoveHeaderWhenDisablePullRefresh = moveHeadWhenDisablePullRefresh;
+    }
+
+    /**
+     * 设置在上拉加载被禁用的情况下，是否允许界面被上拉
+     *
+     * @param moveFootWhenDisablePullLoadMore 默认为true
+     */
+    public void setMoveFootWhenDisablePullLoadMore(boolean moveFootWhenDisablePullLoadMore) {
+        mCanMoveFooterWhenDisablePullLoadMore = moveFootWhenDisablePullLoadMore;
     }
 
     private void updateFooterHeight(int deltaY) {
         if (mState != XRefreshViewState.STATE_READY && mEnablePullLoad && !autoLoadMore) {
             mFooterCallBack.onStateReady();
             mState = XRefreshViewState.STATE_READY;
         }
-        moveView(deltaY);
+        if (mEnablePullLoad || mCanMoveFooterWhenDisablePullLoadMore) {
+            moveView(deltaY);
+        }
     }
 
     /**