fix bug

jdsjlzx · Sep 20, 2016 · 2ab0df0 · 2ab0df0
1 parent a658cb8
commit 2ab0df0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/LRecyclerview_library/src/main/java/com/github/jdsjlzx/recyclerview/LRecyclerView.java b/LRecyclerview_library/src/main/java/com/github/jdsjlzx/recyclerview/LRecyclerView.java
@@ -362,7 +362,10 @@ public void onScrolled(int dx, int dy) {
     public void onScrollStateChanged(int state) {
         super.onScrollStateChanged(state);
         currentScrollState = state;
-        mWrapAdapter.setScrollState(state);
+
+        if (mWrapAdapter != null) {
+            mWrapAdapter.setScrollState(state);
+        }
 
         if (mLScrollListener != null) {
             mLScrollListener.onScrollStateChanged(state);

diff --git a/LRecyclerview_library/src/main/java/com/github/jdsjlzx/recyclerview/LuRecyclerView.java b/LRecyclerview_library/src/main/java/com/github/jdsjlzx/recyclerview/LuRecyclerView.java
@@ -252,7 +252,10 @@ public void onScrolled(int dx, int dy) {
     public void onScrollStateChanged(int state) {
         super.onScrollStateChanged(state);
         currentScrollState = state;
-        mWrapAdapter.setScrollState(state);
+
+        if (mWrapAdapter != null) {
+            mWrapAdapter.setScrollState(state);
+        }
 
         if (mLScrollListener != null) {
             mLScrollListener.onScrollStateChanged(state);

diff --git a/app/src/main/java/com/lzx/demo/ui/EndlessLinearLayoutActivity.java b/app/src/main/java/com/lzx/demo/ui/EndlessLinearLayoutActivity.java
@@ -304,8 +304,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             finish();
         } else if (item.getItemId() == R.id.menu_refresh) {
-            //mRecyclerView.forceToRefresh();
-            mDataAdapter.remove(mLRecyclerViewAdapter.getAdapterPosition(false,3));
+            mRecyclerView.forceToRefresh();
+            //mDataAdapter.remove(mLRecyclerViewAdapter.getAdapterPosition(false,3));
         }
         return true;
     }

diff --git a/app/src/main/java/com/lzx/demo/ui/SwipeRefreshLayoutActivity.java b/app/src/main/java/com/lzx/demo/ui/SwipeRefreshLayoutActivity.java
@@ -154,7 +154,7 @@ public void onScrollStateChanged(int state) {
 
         });
 
-        onRefresh();
+        //onRefresh();
     }
 
     @Override