see 05/30 log

Author: Blankj

README-CN.md

@@ -121,8 +121,7 @@ sp2px, px2sp                            : sp与px互转
 
 * ### 崩溃相关→[CrashUtils.java][crash.java]
 ```
-getInstance: 获取单例
-init       : 初始化
+init: 初始化
 ```
 
 * ### 设备相关→[DeviceUtils.java][device.java]→[Demo][device.demo]
@@ -648,7 +647,7 @@ getEntries        : 获取压缩文件中的文件对象
 
 Gradle:
 ``` groovy
-compile 'com.blankj:utilcode:1.6.3'
+compile 'com.blankj:utilcode:1.6.4'
 ```
 
 
@@ -670,7 +669,7 @@ Utils.init(context);
 
 
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.6.3-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.6.4-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-15+-brightgreen.svg

README.md

@@ -121,7 +121,6 @@ sp2px, px2sp
 
 * ### About Crash→[CrashUtils.java][crash.java]
 ```
-getInstance
 init
 ```
 
@@ -648,7 +647,7 @@ getEntries
 
 Gradle:
 ``` groovy
-compile 'com.blankj:utilcode:1.6.3'
+compile 'com.blankj:utilcode:1.6.4'
 ```
 
 
@@ -670,7 +669,7 @@ Utils.init(context);
 
 
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.6.3-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.6.4-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 35
-        versionName "1.6.3"
+        versionCode 36
+        versionName "1.6.4"
     }
 
     if (signPropertiesFile.exists()) {

app/src/main/assets/test_install.apk renamed to app/src/main/assets/test_install

@@ -53,13 +53,13 @@ public static void initLog() {
     }
 
     private void initCrash() {
-        CrashUtils.getInstance().init();
+        CrashUtils.init();
     }
 
     private void initAssets() {
         if (!FileUtils.isFileExists(Config.getTestApkPath())) {
             try {
-                FileIOUtils.writeFileFromIS(Config.getTestApkPath(), getAssets().open("test_install.apk"), false);
+                FileIOUtils.writeFileFromIS(Config.getTestApkPath(), getAssets().open("test_install"), false);
             } catch (IOException e) {
                 e.printStackTrace();
             }

app/src/main/java/com/blankj/androidutilcode/UtilsApp.java

@@ -1,4 +1,6 @@
-* 17/05/27 完善CacheUtils，发布1.6.2
+* 17/05/30 完善CrashUtils，发布1.6.4
+* 17/05/28 修复CacheUtils的bug，发布1.6.3
+* 17/05/27 修复CacheUtils的bug，发布1.6.2
 * 17/05/26 完善CacheUtils，发布1.6.0和1.6.1
 * 17/05/25 完善FileIOUtils和CacheUtils
 * 17/05/23 新增读取文件到字符数组中两种方式

update_log.md

@@ -26,8 +26,8 @@ android {
 
     defaultConfig {
         minSdkVersion 15
-        versionCode 35
-        versionName "1.6.3"
+        versionCode 36
+        versionName "1.6.4"
     }
 
     buildTypes {

utilcode/build.gradle

@@ -720,7 +720,7 @@ private long removeOldest() {
 
     private static class CacheHelper {
 
-        static final int timeInfoLen = 17;
+        static final int timeInfoLen = 14;
 
         private static byte[] newByteArrayWithTime(int second, byte[] data) {
             byte[] time = createDueTime(second).getBytes();
@@ -737,7 +737,7 @@ private static byte[] newByteArrayWithTime(int second, byte[] data) {
          * @return _$millis$_
          */
         private static String createDueTime(int second) {
-            return String.format(Locale.getDefault(), "_$%013d$_", System.currentTimeMillis() + second * 1000);
+            return String.format(Locale.getDefault(), "_$%010d$_", System.currentTimeMillis() / 1000 + second);
         }
 
         private static boolean isDue(byte[] data) {
@@ -747,9 +747,9 @@ private static boolean isDue(byte[] data) {
 
         private static long getDueTime(byte[] data) {
             if (hasTimeInfo(data)) {
-                String millis = new String(copyOfRange(data, 2, 15));
+                String millis = new String(copyOfRange(data, 2, 12));
                 try {
-                    return Long.parseLong(millis);
+                    return Long.parseLong(millis) * 1000;
                 } catch (NumberFormatException e) {
                     return -1;
                 }
@@ -777,8 +777,8 @@ private static boolean hasTimeInfo(byte[] data) {
                     && data.length >= timeInfoLen
                     && data[0] == '_'
                     && data[1] == '$'
-                    && data[15] == '$'
-                    && data[16] == '_';
+                    && data[12] == '$'
+                    && data[13] == '_';
         }
 
         private static void writeFileFromBytes(File file, byte[] bytes) {