From ae3c41c14f8502d83a64a0fc22d5035bce76cc96 Mon Sep 17 00:00:00 2001
From: Super <986386695@qq.com>
Date: Sat, 15 May 2021 20:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../retrofitgo/cache/CacheSpUtils.java        | 32 ++++++++++---------
 .../internal/CommonNetBoundResource.java      |  7 +---
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/retrofitgo/src/main/java/io/microshow/retrofitgo/cache/CacheSpUtils.java b/retrofitgo/src/main/java/io/microshow/retrofitgo/cache/CacheSpUtils.java
index c35249f..f435a6d 100644
--- a/retrofitgo/src/main/java/io/microshow/retrofitgo/cache/CacheSpUtils.java
+++ b/retrofitgo/src/main/java/io/microshow/retrofitgo/cache/CacheSpUtils.java
@@ -6,8 +6,10 @@
 import android.util.Log;
 
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Type;
+import java.util.List;
 
 import io.microshow.retrofitgo.RetrofitClient;
 
@@ -39,21 +41,21 @@ public static <T> void saveCacheData(String cacheKey, T model) {
         }
     }
 
-    public static <T> T getCacheData(String cacheKey, Type typeOfT) {
-        try {
-            if (!TextUtils.isEmpty(cacheKey)) {
-                String data = getSharedPreferences().getString(cacheKey, null);
-                Log.e("CacheSpUtils","getCacheData cacheKey="+cacheKey+";json="+data);
-                return !TextUtils.isEmpty(data) ? new Gson().fromJson(data, typeOfT) : null;
-            } else {
-                return null;
-            }
-        } catch (Exception e) {
-            return null;
-        }
-    }
+//    public static <T> T getCacheData(String cacheKey, Type typeOfT) {
+//        try {
+//            if (!TextUtils.isEmpty(cacheKey)) {
+//                String data = getSharedPreferences().getString(cacheKey, null);
+//                Log.e("CacheSpUtils","getCacheData cacheKey="+cacheKey+";json="+data);
+//                return !TextUtils.isEmpty(data) ? new Gson().fromJson(data, typeOfT) : null;
+//            } else {
+//                return null;
+//            }
+//        } catch (Exception e) {
+//            return null;
+//        }
+//    }
 
-    public static <T> T getCacheData(String cacheKey, Type typeOfT, Type typeOfList) {
+    public static <T> T getCacheData(String cacheKey, Type typeOfT) {
         try {
             if (!TextUtils.isEmpty(cacheKey)) {
                 String data = getSharedPreferences().getString(cacheKey, null);
@@ -61,7 +63,7 @@ public static <T> T getCacheData(String cacheKey, Type typeOfT, Type typeOfList)
                 if (data != null && !TextUtils.isEmpty(data)) {
                     if (data.startsWith("[") && data.endsWith("]")) {//json数组
                         Log.e("CacheSpUtils","getCacheData json array");
-                        return new Gson().fromJson(data, typeOfList);
+                        return new Gson().fromJson(data, new TypeToken<T>(){}.getType());
                     } else {
                         Log.e("CacheSpUtils","getCacheData json obj");
                         return new Gson().fromJson(data, typeOfT);
diff --git a/retrofitgo/src/main/java/io/microshow/retrofitgo/internal/CommonNetBoundResource.java b/retrofitgo/src/main/java/io/microshow/retrofitgo/internal/CommonNetBoundResource.java
index a891ac2..f398d05 100644
--- a/retrofitgo/src/main/java/io/microshow/retrofitgo/internal/CommonNetBoundResource.java
+++ b/retrofitgo/src/main/java/io/microshow/retrofitgo/internal/CommonNetBoundResource.java
@@ -3,11 +3,6 @@
 import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
 
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.List;
-
 import io.microshow.retrofitgo.arch.Resource;
 import io.microshow.retrofitgo.cache.CachePolicyMode;
 import io.microshow.retrofitgo.cache.CacheSpUtils;
@@ -83,7 +78,7 @@ private void saveResult(T item) {
     }
 
     private <T> T getCacheResult(String cacheKey) {
-        return CacheSpUtils.getCacheData(cacheKey, ClassTypeReflect.getModelClazz(getClass()), new TypeToken<List<Object>>(){}.getType());
+        return CacheSpUtils.getCacheData(cacheKey, ClassTypeReflect.getModelClazz(getClass()));
     }
 
     //获取缓存的key