增加对gridview的支持，修复bug

Author: HomHomLin

Library/Library.iml

@@ -87,9 +87,9 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
   </component>
 </module>

Library/build/intermediates/bundles/debug/classes.jar

@@ -1,12 +1,8 @@
 package com.lhh.ptrrv.library;
 
 import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.RectF;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
@@ -27,27 +23,21 @@ public class PullToRefreshRecyclerView extends SwipeRefreshLayout implements Prv
 
     private RecyclerView mRecyclerView;
 
-    private View mRootRelativeLayout;//主view,包含footer，header等
-
-//    private RelativeLayout mEmptyViewRelativeLayout;//内嵌view，包含recyclerview和emptyview等七七八八的东西
+//    private View mRootRelativeLayout;//主view,包含footer，header等
 
     private View mEmptyView;
 
-//    private View mHeaderView;
+    private int mLoadMoreCount = 10;//default = 10
 
     private boolean mIsSwipeEnable = false;
 
-//    private View mFooterView;
-
-//    private View mLoadMoreView;//加载更多的view
-
-//    private NestedScrollView mNestedScrollView;
-
     private Context mContext;
 
     private BaseFooter mLoadMoreFooter;
 
-    private LinearLayoutManager mLinearLayoutManager;
+//    private RecyclerView.LayoutManager mLayoutManger;
+
+//    private LinearLayoutManager mLinearLayoutManager;
 
     private LayoutParams mFullLayoutParams;//全屏型lp
 
@@ -99,23 +89,19 @@ private void setup(Context context){
 
     private void initView(){
         //初始化布局
-        mRootRelativeLayout = LayoutInflater.from(mContext).inflate(R.layout.ptrrv_root_view, null);
+        mRecyclerView = (RecyclerView)LayoutInflater.from(mContext).inflate(R.layout.ptrrv_root_view, null);
 
-        this.addView(mRootRelativeLayout, mFullLayoutParams);
+        this.addView(mRecyclerView, mFullLayoutParams);
 
         this.setColorSchemeResources(R.color.swap_holo_green_bright, R.color.swap_holo_bule_bright,
                 R.color.swap_holo_green_bright, R.color.swap_holo_bule_bright);
 
         //初始化loadmoreview
 
-//        mNestedScrollView = (NestedScrollView)mRootRelativeLayout.findViewById(R.id.nsv);
-//
-//        mEmptyViewRelativeLayout = (RelativeLayout)mRootRelativeLayout.findViewById(R.id.rlEmpty);
-
-        mRecyclerView = (RecyclerView)mRootRelativeLayout.findViewById(R.id.recycler_view);
+//        mRecyclerView = (RecyclerView)mRootRelativeLayout.findViewById(R.id.recycler_view);
 
-        mLinearLayoutManager = new LinearLayoutManager(mContext);
-        mRecyclerView.setLayoutManager(mLinearLayoutManager);
+//        mLinearLayoutManager = new LinearLayoutManager(mContext);
+//        mRecyclerView.setLayoutManager(mLinearLayoutManager);
         mRecyclerView.setHasFixedSize(true);
 
         if(!mIsSwipeEnable) {
@@ -161,14 +147,7 @@ public void setPagingableListener(PullToRefreshRecyclerView.PagingableListener p
 
     @Override
     public void setEmptyView(View emptyView) {
-//        if(mEmptyView != null) {
-//            //先把它移出去
-//            mEmptyViewRelativeLayout.removeView(mEmptyView);
-//        }
         mEmptyView = emptyView;
-//        if(mEmptyView != null) {
-//            mEmptyViewRelativeLayout.addView(mEmptyView, mFullLayoutParams);
-//        }
     }
 
     @Override
@@ -199,30 +178,63 @@ public void addOnScrollListener(PullToRefreshRecyclerView.OnScrollListener onScr
     }
 
     @Override
-    public LinearLayoutManager getLinearLayoutManager() {
-        return mLinearLayoutManager;
+    public RecyclerView.LayoutManager getLayoutManager() {
+        if(mRecyclerView != null) {
+            return mRecyclerView.getLayoutManager();
+        }
+        return null;
     }
 
     @Override
     public void onFinishLoading(boolean hasMoreItems, boolean needSetSelection) {
         //当一页数据太少的时候，不用显示loadingview
         //临时修改，当一页数据太少的时候，不用显示loadingview
-        if(mLinearLayoutManager == null){
+        if(getLayoutManager() == null){
             return;
         }
-        if (mLinearLayoutManager.getItemCount() < 10)
+        if (getLayoutManager().getItemCount() < mLoadMoreCount)
             hasMoreItems = false;
 
         setHasMoreItems(hasMoreItems);
 
         isLoading = false;
 
         if (needSetSelection) {
-            int first = mLinearLayoutManager.findFirstVisibleItemPosition();
+            int first = findFirstVisibleItemPosition();
             mRecyclerView.scrollToPosition(--first);
         }
     }
 
+    public int findFirstVisibleItemPosition(){
+        if(getLayoutManager() != null) {
+
+            if (getLayoutManager() instanceof LinearLayoutManager) {
+                return ((LinearLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();
+            }
+
+            if (getLayoutManager() instanceof GridLayoutManager) {
+                return ((GridLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();
+            }
+
+        }
+        return RecyclerView.NO_POSITION;
+    }
+
+    public int findLastVisibleItemPosition(){
+        if(getLayoutManager() != null) {
+
+            if (getLayoutManager() instanceof LinearLayoutManager) {
+                return ((LinearLayoutManager) getLayoutManager()).findLastVisibleItemPosition();
+            }
+
+            if (getLayoutManager() instanceof GridLayoutManager) {
+                return ((GridLayoutManager) getLayoutManager()).findLastVisibleItemPosition();
+            }
+
+        }
+        return RecyclerView.NO_POSITION;
+    }
+
     @Override
     public void setSwipeEnable(boolean enable) {
         //just like extra setEnable(boolean).这里和外部一样的，不过这里控制更方便super.setenable
@@ -240,6 +252,18 @@ public RecyclerView getRecyclerView() {
         return this.mRecyclerView;
     }
 
+    @Override
+    public void setLayoutManager(RecyclerView.LayoutManager layoutManager) {
+        if(mRecyclerView != null){
+            mRecyclerView.setLayoutManager(layoutManager);
+        }
+    }
+
+    @Override
+    public void setLoadMoreCount(int count) {
+        mLoadMoreCount = count;
+    }
+
     private void setHasMoreItems(boolean hasMoreItems) {
         this.hasMoreItems = hasMoreItems;
         if(mLoadMoreFooter == null){
@@ -270,25 +294,30 @@ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
         @Override
         public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
             super.onScrolled(recyclerView, dx, dy);
-            //在向下回调之前做处理
+            //在向下回调之前做处理,do before callback
+            if(getLayoutManager() == null){
+                //here layoutManager is null
+                return;
+            }
 
             int firstVisibleItem, visibleItemCount, totalItemCount, lastVisibleItem;
-            visibleItemCount = mLinearLayoutManager.getChildCount();
-            totalItemCount = mLinearLayoutManager.getItemCount();
-            firstVisibleItem = mLinearLayoutManager.findFirstVisibleItemPosition();
-            lastVisibleItem = mLinearLayoutManager.findLastVisibleItemPosition();//有可能最后一项实在太大了，没办法完全显示
+            visibleItemCount = getLayoutManager().getChildCount();
+            totalItemCount = getLayoutManager().getItemCount();
+            firstVisibleItem = findFirstVisibleItemPosition();
+            lastVisibleItem = findLastVisibleItemPosition();//有可能最后一项实在太大了，没办法完全显示
 //            lastVisibleItem = mLinearLayoutManager.findLastCompletelyVisibleItemPosition();
 
             if(mIsSwipeEnable) {
-                if (mLinearLayoutManager.findFirstCompletelyVisibleItemPosition() != 0) {
+                if (findFirstVisibleItemPosition() != 0) {
+                    //这里还有个bug，如果用findFirstCompletelyVisibleItemPosition会产生如果第一条太大，没办法完全显示则无法下啦刷新
                     //如果不是第一条可见就不让下拉，要不然会出现很严重的到处都能下拉的问题
                     PullToRefreshRecyclerView.this.setEnabled(false);
                 } else {
                     PullToRefreshRecyclerView.this.setEnabled(true);
                 }
             }
 
-            if(totalItemCount < 10){
+            if(totalItemCount < mLoadMoreCount){
                 setHasMoreItems(false);
                 isLoading = false;
             }else if (!isLoading && hasMoreItems && ((lastVisibleItem + 1) == totalItemCount)) {

Library/build/intermediates/bundles/release/classes.jar

@@ -18,10 +18,12 @@ public interface PrvInterface{
     public void setHeader(View view);
     public void setFooter(View view);
     public void addOnScrollListener(PullToRefreshRecyclerView.OnScrollListener onScrollLinstener);
-    public LinearLayoutManager getLinearLayoutManager();
+    public RecyclerView.LayoutManager getLayoutManager();
     public void onFinishLoading(boolean hasMoreItems, boolean needSetSelection);
     public void setSwipeEnable(boolean enable);//设置是否可以下拉
     public boolean isSwipeEnable();//返回当前组件是否可以下拉
     public RecyclerView getRecyclerView();
+    public void setLayoutManager(RecyclerView.LayoutManager layoutManager);
+    public void setLoadMoreCount(int count);//如果不达到count数量不让加载更多
     public void release();
 }

Library/build/outputs/aar/Library-debug.aar

@@ -90,9 +90,9 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
     <orderEntry type="module" module-name="Library" exported="" />
   </component>
 </module>

Library/build/outputs/aar/Library-release.aar

@@ -6,19 +6,22 @@
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
 import com.lhh.ptrrv.library.PullToRefreshRecyclerView;
-
+/**
+ * Created by linhonghong on 2015/11/13.
+ */
 public class MainActivity extends AppCompatActivity {
 
     private PullToRefreshRecyclerView mPtrrv;
     private PtrrvAdapter mAdapter;
-    private static final int DEFAULT_ITEM_SIZE = 20;
-    private static final int ITEM_SIZE_OFFSET = 20;
+    private static final int DEFAULT_ITEM_SIZE = 50;
+    private static final int ITEM_SIZE_OFFSET = 50;
 
     private static final int MSG_CODE_REFRESH = 0;
     private static final int MSG_CODE_LOADMORE = 1;
@@ -36,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
     private void findViews(){
         mPtrrv = (PullToRefreshRecyclerView) this.findViewById(R.id.ptrrv);
         mPtrrv.setSwipeEnable(true);//open swipe
+        mPtrrv.setLayoutManager(new LinearLayoutManager(this));
         mPtrrv.setPagingableListener(new PullToRefreshRecyclerView.PagingableListener() {
             @Override
             public void onLoadMoreItems() {

Library/src/com/lhh/ptrrv/library/PullToRefreshRecyclerView.java

@@ -5,7 +5,6 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity">
-
     <com.lhh.ptrrv.library.PullToRefreshRecyclerView
         android:id="@+id/ptrrv"
         android:layout_width="match_parent"