重构 sites

Author: GcsSloop

diycode-app/src/main/java/com/gcssloop/diycode/activity/MainActivity.java

@@ -44,9 +44,8 @@
 import com.gcssloop.diycode.base.app.BaseActivity;
 import com.gcssloop.diycode.base.app.ViewHolder;
 import com.gcssloop.diycode.fragment.NewsListFragment;
-import com.gcssloop.diycode.fragment.SitesListFragment;
+import com.gcssloop.diycode.fragment.SitesListFragment2;
 import com.gcssloop.diycode.fragment.TopicListFragment;
-import com.gcssloop.diycode.test.TestFragment;
 import com.gcssloop.diycode.test.TextFragment;
 import com.gcssloop.diycode.utils.Config;
 import com.gcssloop.diycode.utils.DataCache;
@@ -67,8 +66,7 @@ public class MainActivity extends BaseActivity
     private int mCurrentPosition = 0;
     private TopicListFragment mFragment1;
     private NewsListFragment mFragment2;
-    private SitesListFragment mFragment3;
-    private TestFragment mFragment4;
+    private SitesListFragment2 mFragment3;
 
     private boolean isToolbarFirstClick = true;
 
@@ -95,8 +93,7 @@ private void initViewPager(ViewHolder holder) {
 
         mFragment1 = TopicListFragment.newInstance();
         mFragment2 = NewsListFragment.newInstance();
-        mFragment3 = SitesListFragment.newInstance();
-        mFragment4 = TestFragment.newInstance();
+        mFragment3 = SitesListFragment2.newInstance();
 
         mViewPager.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) {
             String[] types = {"Topics", "News", "Sites", "Test"};
@@ -109,14 +106,12 @@ public Fragment getItem(int position) {
                     return mFragment2;
                 if (position == 2)
                     return mFragment3;
-                if (position == 3)
-                    return mFragment4;
                 return TextFragment.newInstance(types[position]);
             }
 
             @Override
             public int getCount() {
-                return 4;
+                return 3;
             }
 
             @Override

diycode-app/src/main/java/com/gcssloop/diycode/base/app/RefreshRecyclerFragment.java

@@ -88,7 +88,7 @@ protected void initViews(ViewHolder holder, View root) {
         mFooterProvider = new FooterProvider(getContext()) {
             @Override
             public void needLoadMore() {
-                if (isFirstAddFooter){
+                if (isFirstAddFooter) {
                     isFirstAddFooter = false;
                     return;
                 }
@@ -128,16 +128,12 @@ protected void refresh() {
     }
 
     protected void loadMore() {
-        try {
-            if (!loadMoreEnable) return;
-            String uuid = request(pageIndex * pageCount, pageCount);
-            mPostTypes.put(uuid, POST_LOAD_MORE);
-            pageIndex++;
-            mState = STATE_LOADING;
-            mFooterProvider.setFooterLoading();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        if (!loadMoreEnable) return;
+        String uuid = request(pageIndex * pageCount, pageCount);
+        mPostTypes.put(uuid, POST_LOAD_MORE);
+        pageIndex++;
+        mState = STATE_LOADING;
+        mFooterProvider.setFooterLoading();
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

diycode-app/src/main/java/com/gcssloop/diycode/fragment/SitesListFragment.java

@@ -24,6 +24,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -57,9 +59,10 @@ public static SitesListFragment2 newInstance() {
         if (sitesList != null) {
             Logger.e("sites : " + sitesList.size());
             mAdapter.addDatas(sitesList);
+            setRefreshEnable(false);
             setLoadMoreEnable(false);
         } else {
-            refresh();
+            loadMore();
         }
     }
 
@@ -75,7 +78,7 @@ protected void setRecyclerViewAdapter(Context context, RecyclerView recyclerView
         layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                return (mAdapter.getDatas().get(position) instanceof SitesItem) ? 2 : 1;
+                return (mAdapter.getFullDatas().get(position) instanceof SiteItem) ? 1 : 2;
             }
         });
         return layoutManager;
@@ -86,10 +89,12 @@ public int getSpanSize(int position) {
     }
 
     @Override protected void onRefresh(GetSitesEvent event, HeaderFooterAdapter adapter) {
+        toast("刷新成功");
         convertData(event.getBean());
     }
 
     @Override protected void onLoadMore(GetSitesEvent event, HeaderFooterAdapter adapter) {
+        toast("加载成功");
         convertData(event.getBean());
     }
 
@@ -98,23 +103,41 @@ public int getSpanSize(int position) {
     }
 
     // 转换数据
-    private void convertData(List<Sites> sitesList) {
-        List<Serializable> items = new ArrayList<>();
-        for (Sites sites : sitesList) {
-
-            items.add(new SitesItem(sites.getName()));
-
-            for (Sites.Site site : sites.getSites()) {
-                items.add(new SiteItem(site.getName(), site.getUrl(), site.getAvatar_url()));
+    private void convertData(final List<Sites> sitesList) {
+        final Handler handler = new Handler(new Handler.Callback() {
+            @Override public boolean handleMessage(Message msg) {
+                Bundle bundle = msg.getData();
+                ArrayList<Serializable> items = (ArrayList<Serializable>) bundle.get("Items");
+                mAdapter.clearDatas();
+                mAdapter.addDatas(items);
+                mDataCache.saveSitesItems(items);
+                return false;
             }
-
-            if (sites.getSites().size() % 2 == 1) {
-                items.add(new SiteItem("", "", ""));
+        });
+        new Thread(new Runnable() {
+            @Override public void run() {
+                ArrayList<Serializable> items = new ArrayList<>();
+                for (Sites sites : sitesList) {
+
+                    items.add(new SitesItem(sites.getName()));
+
+                    for (Sites.Site site : sites.getSites()) {
+                        items.add(new SiteItem(site.getName(), site.getUrl(), site.getAvatar_url()));
+                    }
+
+                    if (sites.getSites().size() % 2 == 1) {
+                        items.add(new SiteItem("", "", ""));
+                    }
+                }
+
+                Bundle bundle = new Bundle();
+                bundle.putSerializable("Items", items);
+                Message msg = new Message();
+                msg.obj = bundle;
+                handler.sendMessage(msg);
             }
-        }
-        mAdapter.clearDatas();
-        mAdapter.addDatas(items);
-        mDataCache.saveSitesItems(items);
+        });
         setLoadMoreEnable(false);
+        setRefreshEnable(false);
     }
 }