see 05/27 log

Author: Blankj

README-CN.md

@@ -64,7 +64,8 @@ getBitmap      : 缓存中读取bitmap
 getDrawable    : 缓存中读取drawable
 getParcelable  : 缓存中读取Parcelable
 getSerializable: 缓存中读取Serializable
-getCacheFile   : 获取缓存文件
+getCacheSize   : 获取缓存大小
+getCacheCount  : 获取缓存个数
 remove         : 移除某个key
 clear          : 清除所有缓存
 ```
@@ -647,7 +648,7 @@ getEntries        : 获取压缩文件中的文件对象
 
 Gradle:
 ``` groovy
-compile 'com.blankj:utilcode:1.6.1'
+compile 'com.blankj:utilcode:1.6.2'
 ```
 
 
@@ -669,7 +670,7 @@ Utils.init(context);
 
 
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.6.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.6.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-15+-brightgreen.svg

README.md

@@ -64,7 +64,8 @@ getBitmap
 getDrawable
 getParcelable
 getSerializable
-getCacheFile
+getCacheSize
+getCacheCount
 remove
 clear
 ```
@@ -647,7 +648,7 @@ getEntries
 
 Gradle:
 ``` groovy
-compile 'com.blankj:utilcode:1.6.1'
+compile 'com.blankj:utilcode:1.6.2'
 ```
 
 
@@ -669,7 +670,7 @@ Utils.init(context);
 
 
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.6.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.6.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-15+-brightgreen.svg

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.blankj.androidutilcode"
         minSdkVersion 15
         targetSdkVersion 16
-        versionCode 33
-        versionName "1.6.1"
+        versionCode 34
+        versionName "1.6.2"
     }
 
     if (signPropertiesFile.exists()) {

app/src/main/AndroidManifest.xml

@@ -77,6 +77,7 @@
         <activity android:name=".activity.SnackbarActivity"/>
         <activity android:name=".activity.SpannableActivity"/>
         <activity android:name=".activity.ToastActivity"/>
+        <activity android:name=".activity.CacheActivity"/>
 
         <service android:name=".service.LocationService"/>
 

update_log.md

@@ -1,4 +1,5 @@
-* 17/05/26 完善CacheUtil，发布1.6.0和1.6.1
+* 17/05/27 完善CacheUtils，发布1.6.2
+* 17/05/26 完善CacheUtils，发布1.6.0和1.6.1
 * 17/05/25 完善FileIOUtils和CacheUtils
 * 17/05/23 新增读取文件到字符数组中两种方式
 * 17/05/19 LogUtils新增文件过滤和控制台开关

utilcode/build.gradle

@@ -26,8 +26,8 @@ android {
 
     defaultConfig {
         minSdkVersion 15
-        versionCode 33
-        versionName "1.6.1"
+        versionCode 34
+        versionName "1.6.2"
     }
 
     buildTypes {

utilcode/src/main/java/com/blankj/utilcode/util/CacheUtils.java

@@ -43,8 +43,8 @@
  */
 public class CacheUtils {
 
-    private static final int DEFAULT_MAX_SIZE  = 104857600; // 100Mb
-    private static final int DEFAULT_MAX_COUNT = Integer.MAX_VALUE;
+    private static final long DEFAULT_MAX_SIZE  = Long.MAX_VALUE;
+    private static final int  DEFAULT_MAX_COUNT = Integer.MAX_VALUE;
 
     private static Map<String, CacheUtils> sCacheMap = new HashMap<>();
     private CacheManager mCacheManager;
@@ -164,8 +164,9 @@ public void put(@NonNull String key, @NonNull byte[] value) {
     public void put(@NonNull String key, @NonNull byte[] value, int saveTime) {
         if (value.length <= 0) return;
         if (saveTime >= 0) value = CacheHelper.newByteArrayWithTime(saveTime, value);
-        File file = mCacheManager.getFileByKey(key);
+        File file = mCacheManager.getFileBeforePut(key);
         CacheHelper.writeFileFromBytes(file, value);
+        mCacheManager.updateModify(file);
         mCacheManager.put(file);
 
     }
@@ -441,13 +442,22 @@ public Object getSerializable(@NonNull String key) {
     }
 
     /**
-     * 获取缓存文件
+     * 获取缓存大小
+     * <p>单位：字节</p>
      *
-     * @param key 键
-     * @return 缓存文件
+     * @return 缓存大小
      */
-    public File getCacheFile(@NonNull String key) {
-        return mCacheManager.getFileIfExists(key);
+    public long getCacheSize() {
+        return mCacheManager.getCacheSize();
+    }
+
+    /**
+     * 获取缓存个数
+     *
+     * @return 缓存个数
+     */
+    public int getCacheCount() {
+        return mCacheManager.getCacheCount();
     }
 
     /**
@@ -467,7 +477,6 @@ public void clear() {
         mCacheManager.clear();
     }
 
-
     private class CacheManager {
         private final AtomicLong    cacheSize;
         private final AtomicInteger cacheCount;
@@ -508,8 +517,21 @@ public void run() {
             }).start();
         }
 
-        private File getFileByKey(String key) {
-            return new File(cacheDir, String.valueOf(key.hashCode()));
+        private long getCacheSize() {
+            return cacheSize.get();
+        }
+
+        private int getCacheCount() {
+            return cacheCount.get();
+        }
+
+        private File getFileBeforePut(String key) {
+            File file = new File(cacheDir, String.valueOf(key.hashCode()));
+            if (file.exists()) {
+                cacheCount.addAndGet(-1);
+                cacheSize.addAndGet(-file.length());
+            }
+            return file;
         }
 
         private File getFileIfExists(String key) {
@@ -525,7 +547,6 @@ private void put(File file) {
                 cacheSize.addAndGet(-removeOldest());
                 cacheCount.addAndGet(-1);
             }
-            updateModify(file);
         }
 
         private void updateModify(File file) {
@@ -547,15 +568,21 @@ private boolean removeByKey(String key) {
         private void clear() {
             File[] files = cacheDir.listFiles();
             if (files == null) return;
+            boolean flag = true;
             for (File file : files) {
-                if (!file.delete()) continue;
-                cacheSize.addAndGet(file.length());
+                if (!file.delete()) {
+                    flag = false;
+                    continue;
+                }
+                cacheSize.addAndGet(-file.length());
                 cacheCount.addAndGet(-1);
                 lastUsageDates.remove(file);
             }
-            lastUsageDates.clear();
-            cacheSize.set(0);
-            cacheCount.set(0);
+            if (flag) {
+                lastUsageDates.clear();
+                cacheSize.set(0);
+                cacheCount.set(0);
+            }
         }
 
         /**
@@ -825,4 +852,4 @@ private static boolean isSpace(String s) {
         }
         return true;
     }
-}
+}