修复部分机型上收藏夹依旧崩溃，及无法刷新的问题

SplashCodes · May 9, 2017 · fa2adc1 · fa2adc1
1 parent afc8992
commit fa2adc1
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 10 deletions.
diff --git a/app/src/main/java/io/github/javiewer/fragment/ActressesFragment.java b/app/src/main/java/io/github/javiewer/fragment/ActressesFragment.java
@@ -12,9 +12,9 @@
 import io.github.javiewer.JAViewer;
 import io.github.javiewer.adapter.ActressAdapter;
 import io.github.javiewer.adapter.item.Actress;
-import io.github.javiewer.listener.EndlessOnScrollListener;
 import io.github.javiewer.network.provider.AVMOProvider;
 import io.github.javiewer.view.decoration.ActressItemDecoration;
+import io.github.javiewer.view.listener.EndlessOnScrollListener;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 
@@ -59,6 +59,11 @@ public SwipeRefreshLayout getRefreshLayout() {
                 return ActressesFragment.this.mRefreshLayout;
             }
 
+            @Override
+            public RecyclerView.Adapter getAdapter() {
+                return ActressesFragment.this.getAdapter();
+            }
+
             @Override
             public List<Actress> getItems() {
                 return ActressesFragment.this.getItems();

diff --git a/app/src/main/java/io/github/javiewer/fragment/DownloadFragment.java b/app/src/main/java/io/github/javiewer/fragment/DownloadFragment.java
@@ -15,9 +15,9 @@
 import io.github.javiewer.JAViewer;
 import io.github.javiewer.adapter.DownloadLinkAdapter;
 import io.github.javiewer.adapter.item.DownloadLink;
-import io.github.javiewer.listener.BasicOnScrollListener;
 import io.github.javiewer.network.provider.DownloadLinkProvider;
 import io.github.javiewer.view.decoration.DownloadItemDecoration;
+import io.github.javiewer.view.listener.BasicOnScrollListener;
 import jp.wasabeef.recyclerview.adapters.ScaleInAnimationAdapter;
 import jp.wasabeef.recyclerview.animators.SlideInUpAnimator;
 import okhttp3.ResponseBody;
@@ -82,6 +82,11 @@ public SwipeRefreshLayout getRefreshLayout() {
                 return DownloadFragment.this.mRefreshLayout;
             }
 
+            @Override
+            public RecyclerView.Adapter getAdapter() {
+                return DownloadFragment.this.getAdapter();
+            }
+
             @Override
             public List<DownloadLink> getItems() {
                 return DownloadFragment.this.getItems();

diff --git a/app/src/main/java/io/github/javiewer/fragment/MovieFragment.java b/app/src/main/java/io/github/javiewer/fragment/MovieFragment.java
@@ -11,9 +11,9 @@
 
 import io.github.javiewer.adapter.MovieAdapter;
 import io.github.javiewer.adapter.item.Movie;
-import io.github.javiewer.listener.EndlessOnScrollListener;
 import io.github.javiewer.network.provider.AVMOProvider;
 import io.github.javiewer.view.decoration.MovieItemDecoration;
+import io.github.javiewer.view.listener.EndlessOnScrollListener;
 import jp.wasabeef.recyclerview.adapters.SlideInBottomAnimationAdapter;
 import jp.wasabeef.recyclerview.animators.SlideInUpAnimator;
 import okhttp3.ResponseBody;
@@ -62,6 +62,11 @@ public List<Movie> getItems() {
                 return MovieFragment.this.getItems();
             }
 
+            @Override
+            public RecyclerView.Adapter getAdapter() {
+                return MovieFragment.this.getAdapter();
+            }
+
             @Override
             public void onResult(ResponseBody response) throws Exception {
                 super.onResult(response);

diff --git a/app/src/main/java/io/github/javiewer/fragment/RecyclerFragment.java b/app/src/main/java/io/github/javiewer/fragment/RecyclerFragment.java
@@ -17,8 +17,8 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import io.github.javiewer.R;
-import io.github.javiewer.listener.BasicOnScrollListener;
 import io.github.javiewer.view.ViewUtil;
+import io.github.javiewer.view.listener.BasicOnScrollListener;
 
 /**
  * Project: JAViewer
@@ -66,6 +66,9 @@ public void setAdapter(RecyclerView.Adapter mAdapter) {
     }
 
     public RecyclerView.Adapter getAdapter() {
+        if (this.mRecyclerView == null) {
+            return null;
+        }
         return this.mRecyclerView.getAdapter();
     }
 
@@ -77,11 +80,11 @@ public void setItems(ArrayList<I> items) {
         int size = getItems().size();
         if (size > 0) {
             getItems().clear();
-            getAdapter().notifyItemRangeRemoved(0, size);
+            getAdapter().notifyDataSetChanged();
         }
 
         getItems().addAll(items);
-        getAdapter().notifyItemRangeInserted(0, items.size());
+        getAdapter().notifyDataSetChanged();
     }
 
     @Override

diff --git a/...iewer/listener/BasicOnScrollListener.java → .../view/listener/BasicOnScrollListener.java b/...iewer/listener/BasicOnScrollListener.java → .../view/listener/BasicOnScrollListener.java
@@ -1,4 +1,4 @@
-package io.github.javiewer.listener;
+package io.github.javiewer.view.listener;
 
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -33,7 +33,11 @@ public void reset() {
         loading = false;
         loadThreshold = 5;
         currentPage = 0;
-        getItems().clear();
+        int oldSize = getItems().size();
+        if (oldSize > 0) {
+            getItems().clear();
+            getAdapter().notifyItemRangeRemoved(0, oldSize);
+        }
     }
 
     public Bundle saveState() {
@@ -52,12 +56,13 @@ public void restoreState(Bundle bundle) {
 
     public abstract List<I> getItems();
 
+    public abstract RecyclerView.Adapter getAdapter();
+
     public abstract Call<ResponseBody> newCall(int page);
 
     public void refresh() {
         setLoading(true);
         reset();
-        getItems().clear();
         onLoad(token = System.currentTimeMillis());
     }
 

diff --git a/...wer/listener/EndlessOnScrollListener.java → ...iew/listener/EndlessOnScrollListener.java b/...wer/listener/EndlessOnScrollListener.java → ...iew/listener/EndlessOnScrollListener.java
@@ -1,4 +1,4 @@
-package io.github.javiewer.listener;
+package io.github.javiewer.view.listener;
 
 /**
  * Project: JAViewer

diff --git a/app/src/main/res/layout/content_movie_actresses.xml b/app/src/main/res/layout/content_movie_actresses.xml
@@ -36,6 +36,7 @@
             android:paddingRight="16dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
+
             <include layout="@layout/layout_divider_margin" />
         </LinearLayout>
     </LinearLayout>

diff --git a/app/src/main/res/layout/content_movie_headers.xml b/app/src/main/res/layout/content_movie_headers.xml
@@ -35,6 +35,7 @@
             android:paddingLeft="72dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
+
             <include layout="@layout/layout_divider_margin" />
         </LinearLayout>