修正 sites 缓存

Author: GcsSloop

diycode-app/src/main/java/com/gcssloop/diycode/adapter/sites/SiteItem.java

@@ -22,7 +22,9 @@
 
 package com.gcssloop.diycode.adapter.sites;
 
-public class SiteItem {
+import java.io.Serializable;
+
+public class SiteItem implements Serializable{
     private String name;
     private String url;
     private String avatar_url;

diycode-app/src/main/java/com/gcssloop/diycode/adapter/sites/SitesItem.java

@@ -22,7 +22,9 @@
 
 package com.gcssloop.diycode.adapter.sites;
 
-public class SitesItem {
+import java.io.Serializable;
+
+public class SitesItem implements Serializable {
     private String name;
 
     public SitesItem(String name) {

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

@@ -42,11 +42,13 @@
 import com.gcssloop.diycode_sdk.api.Diycode;
 import com.gcssloop.diycode_sdk.api.sites.bean.Sites;
 import com.gcssloop.diycode_sdk.api.sites.event.GetSitesEvent;
+import com.gcssloop.diycode_sdk.log.Logger;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -122,11 +124,13 @@ public int getSpanSize(int position) {
 
     // 加载数据
     private void loadData() {
-        List<Object> sitesList = mDataCache.getSitesItems();
+        List<Serializable> sitesList = mDataCache.getSitesItems();
         if (sitesList != null) {
+            Logger.e("获取sites缓存成功");
             mAdapter.addDatas(sitesList);
             mFooter.setText(FOOTER_NORMAL);
         } else {
+            Logger.e("获取sites缓存失败");
             mDiycode.getSites();
             mFooter.setText(FOOTER_LOADING);
         }
@@ -135,7 +139,6 @@ private void loadData() {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onSitesList(GetSitesEvent event) {
-        //TODO 处理数据
         if (event.isOk()) {
             List<Sites> sitesList = event.getBean();
             convertData(sitesList);
@@ -150,7 +153,7 @@ public void onSitesList(GetSitesEvent event) {
 
     // 转换数据
     private void convertData(List<Sites> sitesList) {
-        List<Object> items = new ArrayList<>();
+        List<Serializable> items = new ArrayList<>();
         for (Sites sites : sitesList) {
 
             items.add(new SitesItem(sites.getName()));
@@ -164,7 +167,8 @@ private void convertData(List<Sites> sitesList) {
             }
         }
         mAdapter.addDatas(items);
-        mDataCache.saveSitesItems(mAdapter.getDatas());
+        Logger.e("缓存 sites");
+        mDataCache.saveSitesItems(items);
     }
 
     @Override

diycode-app/src/main/java/com/gcssloop/diycode/utils/DataCache.java

@@ -143,12 +143,11 @@ public List<Sites> getSites() {
         return getData("sites_");
     }
 
-    public void saveSitesItems(List<Object> sitesList) {
-        ArrayList<Object> data = new ArrayList<>(sitesList);
-        saveData("sites_item_", data);
+    public <T extends Serializable> void saveSitesItems(List<T> sitesList) {
+        saveListData("sites_item_", sitesList);
     }
 
-    public List<Object> getSitesItems() {
+    public <T extends Serializable> ArrayList<T> getSitesItems() {
         return getData("sites_item_");
     }
 }