diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f1cab9c5a3..5122c63a01 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.blankj.androidutilcode">
+    package="com.blankj.androidutilcode">
 
     <!--读写内存-->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <!--network-->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <!--phone-->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.CALL_PHONE"/>
-    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
     <!--拨打电话-->
-    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
     <!--发送短信-->
-    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS" />
     <!--获取手机联系人-->
     <!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>-->
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
     <!--获取短信-->
     <!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>-->
-    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.READ_SMS" />
 
     <application
         android:name=".App"
@@ -35,27 +35,27 @@
         android:label="@string/my_app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".activities.ActivityActivity"/>
-        <activity android:name=".activities.AppActivity"/>
-        <activity android:name=".activities.CleanActivity"/>
-        <activity android:name=".activities.DeviceActivity"/>
-        <activity android:name=".activities.HandlerActivity"/>
-        <activity android:name=".activities.ImageActivity"/>
+        <activity android:name=".activities.ActivityActivity" />
+        <activity android:name=".activities.AppActivity" />
+        <activity android:name=".activities.CleanActivity" />
+        <activity android:name=".activities.DeviceActivity" />
+        <activity android:name=".activities.HandlerActivity" />
+        <activity android:name=".activities.ImageActivity" />
         <activity
             android:name=".activities.KeyboardActivity"
-            android:windowSoftInputMode="stateHidden|adjustPan"/>
+            android:windowSoftInputMode="stateHidden|adjustPan" />
         <activity android:name=".activities.MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activities.NetworkActivity"/>
-        <activity android:name=".activities.PhoneActivity"/>
-        <activity android:name=".activities.ProcessActivity"/>
-        <activity android:name=".activities.SDCardActivity"/>
-        <activity android:name=".activities.SnackbarActivity"/>
-        <activity android:name=".activities.ToastActivity"/>
+        <activity android:name=".activities.NetworkActivity" />
+        <activity android:name=".activities.PhoneActivity" />
+        <activity android:name=".activities.ProcessActivity" />
+        <activity android:name=".activities.SDCardActivity" />
+        <activity android:name=".activities.SnackbarActivity" />
+        <activity android:name=".activities.ToastActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/blankj/androidutilcode/App.java b/app/src/main/java/com/blankj/androidutilcode/App.java
index 1a55efc070..fa1307ab68 100644
--- a/app/src/main/java/com/blankj/androidutilcode/App.java
+++ b/app/src/main/java/com/blankj/androidutilcode/App.java
@@ -1,15 +1,11 @@
 package com.blankj.androidutilcode;
 
 import android.app.Application;
-import android.os.Handler;
-import android.os.Message;
 
 import com.blankj.utilcode.utils.CrashUtils;
 import com.blankj.utilcode.utils.LogUtils;
 import com.squareup.leakcanary.LeakCanary;
 
-import java.lang.ref.WeakReference;
-
 /**
  * <pre>
  *     author: Blankj
diff --git a/app/src/main/java/com/blankj/androidutilcode/activities/CleanActivity.java b/app/src/main/java/com/blankj/androidutilcode/activities/CleanActivity.java
index 6877196b76..c8f75960d2 100644
--- a/app/src/main/java/com/blankj/androidutilcode/activities/CleanActivity.java
+++ b/app/src/main/java/com/blankj/androidutilcode/activities/CleanActivity.java
@@ -1,7 +1,7 @@
 package com.blankj.androidutilcode.activities;
 
-import android.os.Bundle;
 import android.app.Activity;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
diff --git a/app/src/main/java/com/blankj/androidutilcode/activities/HandlerActivity.java b/app/src/main/java/com/blankj/androidutilcode/activities/HandlerActivity.java
index 0f0e07ecf5..f5ccb773ab 100644
--- a/app/src/main/java/com/blankj/androidutilcode/activities/HandlerActivity.java
+++ b/app/src/main/java/com/blankj/androidutilcode/activities/HandlerActivity.java
@@ -7,9 +7,7 @@
 import android.widget.TextView;
 
 import com.blankj.androidutilcode.R;
-import com.blankj.utilcode.utils.DeviceUtils;
 import com.blankj.utilcode.utils.HandlerUtils;
-import com.blankj.utilcode.utils.LogUtils;
 
 /**
  * <pre>
diff --git a/app/src/main/java/com/blankj/androidutilcode/activities/LocationActivity.java b/app/src/main/java/com/blankj/androidutilcode/activities/LocationActivity.java
index edf642ebc0..09a01cb059 100644
--- a/app/src/main/java/com/blankj/androidutilcode/activities/LocationActivity.java
+++ b/app/src/main/java/com/blankj/androidutilcode/activities/LocationActivity.java
@@ -19,8 +19,8 @@
  */
 public class LocationActivity extends Activity {
 
-    Context       mContext;
-    TextView      tvAboutLocation;
+    Context mContext;
+    TextView tvAboutLocation;
     LocationUtils locationUtils;
 
     @Override
diff --git a/app/src/main/java/com/blankj/androidutilcode/activities/ToastActivity.java b/app/src/main/java/com/blankj/androidutilcode/activities/ToastActivity.java
index 172ef86e5b..0d36840192 100644
--- a/app/src/main/java/com/blankj/androidutilcode/activities/ToastActivity.java
+++ b/app/src/main/java/com/blankj/androidutilcode/activities/ToastActivity.java
@@ -4,7 +4,6 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
 
 import com.blankj.androidutilcode.R;
diff --git a/utilcode/src/main/AndroidManifest.xml b/utilcode/src/main/AndroidManifest.xml
index 75b90a94de..0c22085117 100644
--- a/utilcode/src/main/AndroidManifest.xml
+++ b/utilcode/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.blankj.utilcode"/>
\ No newline at end of file
+<manifest package="com.blankj.utilcode" />
\ No newline at end of file
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/AppUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/AppUtils.java
index 20160441c2..3a7c4b586c 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/AppUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/AppUtils.java
@@ -12,10 +12,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * <pre>
@@ -506,13 +503,13 @@ public static boolean isAppForeground(Context context, String packageName) {
      */
     public static class AppInfo {
 
-        private String   name;
+        private String name;
         private Drawable icon;
-        private String   packageName;
-        private String   packagePath;
-        private String   versionName;
-        private int      versionCode;
-        private boolean  isSystem;
+        private String packageName;
+        private String packagePath;
+        private String versionName;
+        private int versionCode;
+        private boolean isSystem;
 
         public Drawable getIcon() {
             return icon;
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/BarUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/BarUtils.java
index 7af3dfc041..f2d3c47b42 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/BarUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/BarUtils.java
@@ -4,9 +4,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
-import android.media.audiofx.BassBoost;
 import android.os.Build;
-import android.support.annotation.ColorInt;
 import android.support.v4.widget.DrawerLayout;
 import android.util.AttributeSet;
 import android.util.TypedValue;
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/CameraUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/CameraUtils.java
index 488b0f7d69..1d3d2ab2b9 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/CameraUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/CameraUtils.java
@@ -1,17 +1,5 @@
 package com.blankj.utilcode.utils;
 
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.MediaStore;
-
-import java.io.File;
-import java.io.IOException;
-
 /**
  * <pre>
  *     author: Blankj
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/CleanUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/CleanUtils.java
index c250126be4..80d6b9a2a0 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/CleanUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/CleanUtils.java
@@ -1,13 +1,8 @@
 package com.blankj.utilcode.utils;
 
-import android.app.ActivityManager;
 import android.content.Context;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 /**
  * <pre>
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/CloseUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/CloseUtils.java
index 17a85feb9c..47eb6445f5 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/CloseUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/CloseUtils.java
@@ -2,7 +2,6 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.net.Socket;
 
 /**
  * <pre>
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/ConstUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/ConstUtils.java
index 97be1d1afb..7a119b4e94 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/ConstUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/ConstUtils.java
@@ -22,15 +22,15 @@ private ConstUtils() {
     /**
      * KB与Byte的倍数
      */
-    public static final int KB   = 1024;
+    public static final int KB = 1024;
     /**
      * MB与Byte的倍数
      */
-    public static final int MB   = 1048576;
+    public static final int MB = 1048576;
     /**
      * GB与Byte的倍数
      */
-    public static final int GB   = 1073741824;
+    public static final int GB = 1073741824;
 
     public enum MemoryUnit {
         BYTE,
@@ -47,11 +47,11 @@ public enum MemoryUnit {
     /**
      * 秒与毫秒的倍数
      */
-    public static final int SEC  = 1000;
+    public static final int SEC = 1000;
     /**
      * 分与毫秒的倍数
      */
-    public static final int MIN  = 60000;
+    public static final int MIN = 60000;
     /**
      * 时与毫秒的倍数
      */
@@ -59,7 +59,7 @@ public enum MemoryUnit {
     /**
      * 天与毫秒的倍数
      */
-    public static final int DAY  = 86400000;
+    public static final int DAY = 86400000;
 
     public enum TimeUnit {
         MSEC,
@@ -82,73 +82,73 @@ public enum TimeUnit {
      * <p>全球星：1349</p>
      * <p>虚拟运营商：170</p>
      */
-    public static final String REGEX_MOBILE_EXACT  = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(147))\\d{8}$";
+    public static final String REGEX_MOBILE_EXACT = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(147))\\d{8}$";
     /**
      * 正则：电话号码
      */
-    public static final String REGEX_TEL           = "^0\\d{2,3}[- ]?\\d{7,8}";
+    public static final String REGEX_TEL = "^0\\d{2,3}[- ]?\\d{7,8}";
     /**
      * 正则：身份证号码15位
      */
-    public static final String REGEX_ID_CARD15     = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$";
+    public static final String REGEX_ID_CARD15 = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$";
     /**
      * 正则：身份证号码18位
      */
-    public static final String REGEX_ID_CARD18     = "^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([0-9Xx])$";
+    public static final String REGEX_ID_CARD18 = "^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([0-9Xx])$";
     /**
      * 正则：邮箱
      */
-    public static final String REGEX_EMAIL         = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$";
+    public static final String REGEX_EMAIL = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$";
     /**
      * 正则：URL
      */
-    public static final String REGEX_URL           = "[a-zA-z]+://[^\\s]*";
+    public static final String REGEX_URL = "[a-zA-z]+://[^\\s]*";
     /**
      * 正则：汉字
      */
-    public static final String REGEX_ZH            = "^[\\u4e00-\\u9fa5]+$";
+    public static final String REGEX_ZH = "^[\\u4e00-\\u9fa5]+$";
     /**
      * 正则：用户名，取值范围为a-z,A-Z,0-9,"_",汉字，不能以"_"结尾,用户名必须是6-20位
      */
-    public static final String REGEX_USERNAME      = "^[\\w\\u4e00-\\u9fa5]{6,20}(?<!_)$";
+    public static final String REGEX_USERNAME = "^[\\w\\u4e00-\\u9fa5]{6,20}(?<!_)$";
     /**
      * 正则：yyyy-MM-dd格式的日期校验，已考虑平闰年
      */
-    public static final String REGEX_DATE          = "^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$";
+    public static final String REGEX_DATE = "^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$";
     /**
      * 正则：IP地址
      */
-    public static final String REGEX_IP            = "((2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(2[0-4]\\d|25[0-5]|[01]?\\d\\d?)";
+    public static final String REGEX_IP = "((2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(2[0-4]\\d|25[0-5]|[01]?\\d\\d?)";
 
     /************** 以下摘自http://tool.oschina.net/regex **************/
     /**
      * 正则：双字节字符(包括汉字在内)
      */
-    public static final String REGEX_DOUBLE_BYTE_CHAR     = "[^\\x00-\\xff]";
+    public static final String REGEX_DOUBLE_BYTE_CHAR = "[^\\x00-\\xff]";
     /**
      * 正则：空白行
      */
-    public static final String REGEX_BLANK_LINE           = "\\n\\s*\\r";
+    public static final String REGEX_BLANK_LINE = "\\n\\s*\\r";
     /**
      * 正则：QQ号
      */
-    public static final String REGEX_TENCENT_NUM          = "[1-9][0-9]{4,}";
+    public static final String REGEX_TENCENT_NUM = "[1-9][0-9]{4,}";
     /**
      * 正则：中国邮政编码
      */
-    public static final String REGEX_ZIP_CODE             = "[1-9]\\d{5}(?!\\d)";
+    public static final String REGEX_ZIP_CODE = "[1-9]\\d{5}(?!\\d)";
     /**
      * 正则：正整数
      */
-    public static final String REGEX_POSITIVE_INTEGER     = "^[1-9]\\d*$";
+    public static final String REGEX_POSITIVE_INTEGER = "^[1-9]\\d*$";
     /**
      * 正则：负整数
      */
-    public static final String REGEX_NEGATIVE_INTEGER     = "^-[1-9]\\d*$";
+    public static final String REGEX_NEGATIVE_INTEGER = "^-[1-9]\\d*$";
     /**
      * 正则：整数
      */
-    public static final String REGEX_INTEGER              = "^-?[1-9]\\d*$";
+    public static final String REGEX_INTEGER = "^-?[1-9]\\d*$";
     /**
      * 正则：非负整数(正整数 + 0)
      */
@@ -160,11 +160,11 @@ public enum TimeUnit {
     /**
      * 正则：正浮点数
      */
-    public static final String REGEX_POSITIVE_FLOAT       = "^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*$";
+    public static final String REGEX_POSITIVE_FLOAT = "^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*$";
     /**
      * 正则：负浮点数
      */
-    public static final String REGEX_NEGATIVE_FLOAT       = "^-[1-9]\\d*\\.\\d*|-0\\.\\d*[1-9]\\d*$";
+    public static final String REGEX_NEGATIVE_FLOAT = "^-[1-9]\\d*\\.\\d*|-0\\.\\d*[1-9]\\d*$";
 
     /************** If u want more please visit http://toutiao.com/i6231678548520731137/ **************/
 }
\ No newline at end of file
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/CrashUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/CrashUtils.java
index b49d47d4ec..165985781a 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/CrashUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/CrashUtils.java
@@ -28,10 +28,10 @@ public class CrashUtils implements Thread.UncaughtExceptionHandler {
     private volatile static CrashUtils mInstance;
 
     private UncaughtExceptionHandler mHandler;
-    private boolean                  mInitialized;
-    private String                   crashDir;
-    private String                   versionName;
-    private int                      versionCode;
+    private boolean mInitialized;
+    private String crashDir;
+    private String versionName;
+    private int versionCode;
 
     private CrashUtils() {
     }
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/EncodeUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/EncodeUtils.java
index f2a8fce2d9..b5ba6b9072 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/EncodeUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/EncodeUtils.java
@@ -2,6 +2,7 @@
 
 import android.os.Build;
 import android.text.Html;
+import android.text.Spanned;
 import android.util.Base64;
 
 import java.io.UnsupportedEncodingException;
@@ -188,7 +189,17 @@ public static String htmlEncode(String input) {
      * @param input 待解码的字符串
      * @return Html解码后的字符串
      */
+    @SuppressWarnings("deprecation")
     public static String htmlDecode(String input) {
-        return Html.fromHtml(input).toString();
+
+        Spanned result;
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+            result = Html.fromHtml(input, Html.FROM_HTML_MODE_LEGACY);
+        } else {
+            result = Html.fromHtml(input);
+        }
+
+        return result.toString();
     }
 }
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/EncryptUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/EncryptUtils.java
index 12286d3255..c55ead831e 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/EncryptUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/EncryptUtils.java
@@ -570,8 +570,8 @@ private static byte[] hmacTemplate(byte[] data, byte[] key, String algorithm) {
      * <p>加密模式有：电子密码本模式ECB、加密块链模式CBC、加密反馈模式CFB、输出反馈模式OFB</p>
      * <p>填充方式有：NoPadding、ZerosPadding、PKCS5Padding</p>
      */
-    public static        String DES_Transformation = "DES/ECB/NoPadding";
-    private static final String DES_Algorithm      = "DES";
+    public static String DES_Transformation = "DES/ECB/NoPadding";
+    private static final String DES_Algorithm = "DES";
 
     /**
      * DES加密后转为Base64编码
@@ -646,8 +646,8 @@ public static byte[] decryptDES(byte[] data, byte[] key) {
      * <p>加密模式有：电子密码本模式ECB、加密块链模式CBC、加密反馈模式CFB、输出反馈模式OFB</p>
      * <p>填充方式有：NoPadding、ZerosPadding、PKCS5Padding</p>
      */
-    public static        String TripleDES_Transformation = "DESede/ECB/NoPadding";
-    private static final String TripleDES_Algorithm      = "DESede";
+    public static String TripleDES_Transformation = "DESede/ECB/NoPadding";
+    private static final String TripleDES_Algorithm = "DESede";
 
 
     /**
@@ -723,8 +723,8 @@ public static byte[] decrypt3DES(byte[] data, byte[] key) {
      * <p>加密模式有：电子密码本模式ECB、加密块链模式CBC、加密反馈模式CFB、输出反馈模式OFB</p>
      * <p>填充方式有：NoPadding、ZerosPadding、PKCS5Padding</p>
      */
-    public static        String AES_Transformation = "AES/ECB/NoPadding";
-    private static final String AES_Algorithm      = "AES";
+    public static String AES_Transformation = "AES/ECB/NoPadding";
+    private static final String AES_Algorithm = "AES";
 
 
     /**
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/IntentUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/IntentUtils.java
index 2e883f5486..f56a342fa4 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/IntentUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/IntentUtils.java
@@ -3,7 +3,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/LocationUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/LocationUtils.java
index 0922fa766d..360ac6efd9 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/LocationUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/LocationUtils.java
@@ -10,14 +10,10 @@
 import android.location.LocationProvider;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.util.Log;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Locale;
 
-import static android.support.v7.widget.StaggeredGridLayoutManager.TAG;
-
 /**
  * <pre>
  *     author: Blankj
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/LogUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/LogUtils.java
index 61532fdf55..71d0bc579b 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/LogUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/LogUtils.java
@@ -26,11 +26,11 @@ private LogUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }
 
-    private static boolean logSwitch      = true;
+    private static boolean logSwitch = true;
     private static boolean log2FileSwitch = false;
-    private static char    logFilter      = 'v';
-    private static String  tag            = "TAG";
-    private static String  dir            = null;
+    private static char logFilter = 'v';
+    private static String tag = "TAG";
+    private static String dir = null;
 
     /**
      * 初始化函数
@@ -72,10 +72,10 @@ public static Builder getBuilder(Context context) {
 
     public static class Builder {
 
-        private boolean logSwitch      = true;
+        private boolean logSwitch = true;
         private boolean log2FileSwitch = false;
-        private char    logFilter      = 'v';
-        private String  tag            = "TAG";
+        private char logFilter = 'v';
+        private String tag = "TAG";
 
         public Builder setLogSwitch(boolean logSwitch) {
             this.logSwitch = logSwitch;
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/NetworkUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/NetworkUtils.java
index c52c9cfd28..0908113f18 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/NetworkUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/NetworkUtils.java
@@ -4,14 +4,12 @@
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.telephony.TelephonyManager;
 
 import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
-import java.net.Socket;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.Enumeration;
@@ -20,8 +18,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 /**
  * <pre>
@@ -37,16 +33,16 @@ private NetworkUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }
 
-    public static final int NETWORK_WIFI    = 1;    // wifi network
-    public static final int NETWORK_4G      = 4;    // "4G" networks
-    public static final int NETWORK_3G      = 3;    // "3G" networks
-    public static final int NETWORK_2G      = 2;    // "2G" networks
+    public static final int NETWORK_WIFI = 1;    // wifi network
+    public static final int NETWORK_4G = 4;    // "4G" networks
+    public static final int NETWORK_3G = 3;    // "3G" networks
+    public static final int NETWORK_2G = 2;    // "2G" networks
     public static final int NETWORK_UNKNOWN = 5;    // unknown network
-    public static final int NETWORK_NO      = -1;   // no network
+    public static final int NETWORK_NO = -1;   // no network
 
-    private static final int NETWORK_TYPE_GSM      = 16;
+    private static final int NETWORK_TYPE_GSM = 16;
     private static final int NETWORK_TYPE_TD_SCDMA = 17;
-    private static final int NETWORK_TYPE_IWLAN    = 18;
+    private static final int NETWORK_TYPE_IWLAN = 18;
 
     /**
      * 打开网络设置界面
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/PhoneUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/PhoneUtils.java
index 455bfeed60..b82c5a23d2 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/PhoneUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/PhoneUtils.java
@@ -8,7 +8,6 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.SystemClock;
-import android.provider.Settings;
 import android.telephony.SmsManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/RegexUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/RegexUtils.java
index 1887db762e..bcb23cdadc 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/RegexUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/RegexUtils.java
@@ -5,7 +5,17 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.blankj.utilcode.utils.ConstUtils.*;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_DATE;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_EMAIL;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_ID_CARD15;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_ID_CARD18;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_IP;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_MOBILE_EXACT;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_MOBILE_SIMPLE;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_TEL;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_URL;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_USERNAME;
+import static com.blankj.utilcode.utils.ConstUtils.REGEX_ZH;
 
 /**
  * <pre>
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/SDCardUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/SDCardUtils.java
index ec8237174b..17a3a29796 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/SDCardUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/SDCardUtils.java
@@ -115,13 +115,13 @@ public static String getSDCardInfo() {
 
     public static class SDCardInfo {
         boolean isExist;
-        long    totalBlocks;
-        long    freeBlocks;
-        long    availableBlocks;
-        long    blockByteSize;
-        long    totalBytes;
-        long    freeBytes;
-        long    availableBytes;
+        long totalBlocks;
+        long freeBlocks;
+        long availableBlocks;
+        long blockByteSize;
+        long totalBytes;
+        long freeBytes;
+        long availableBytes;
 
         @Override
         public String toString() {
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/SPUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/SPUtils.java
index 887fb745c0..434a4db582 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/SPUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/SPUtils.java
@@ -15,7 +15,7 @@
  */
 public class SPUtils {
 
-    private SharedPreferences        sp;
+    private SharedPreferences sp;
     private SharedPreferences.Editor editor;
 
     /**
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/ServiceUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/ServiceUtils.java
index ac713207ba..c112053bed 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/ServiceUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/ServiceUtils.java
@@ -2,17 +2,10 @@
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/ShellUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/ShellUtils.java
index 29a64fc2fa..50e36404e8 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/ShellUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/ShellUtils.java
@@ -142,7 +142,7 @@ public static class CommandResult {
         /**
          * 结果码
          **/
-        public int    result;
+        public int result;
         /**
          * 成功信息
          **/
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/SnackbarUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/SnackbarUtils.java
index 3ea51ce3ac..3dbfb21387 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/SnackbarUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/SnackbarUtils.java
@@ -9,7 +9,6 @@
 
 import com.blankj.utilcode.R;
 
-import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 
 /**
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/ThreadPoolUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/ThreadPoolUtils.java
index 3aad23c8d8..1dcaf820f1 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/ThreadPoolUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/ThreadPoolUtils.java
@@ -32,7 +32,7 @@ public enum Type {
         SingleThread,
     }
 
-    private ExecutorService          exec;
+    private ExecutorService exec;
     private ScheduledExecutorService scheduleExec;
 
     /**
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/VibrationUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/VibrationUtils.java
index 5087ff0dea..341f99d641 100644
--- a/utilcode/src/main/java/com/blankj/utilcode/utils/VibrationUtils.java
+++ b/utilcode/src/main/java/com/blankj/utilcode/utils/VibrationUtils.java
@@ -1,8 +1,5 @@
 package com.blankj.utilcode.utils;
 
-import android.content.Context;
-import android.os.Vibrator;
-
 /**
  * <pre>
  *     author: Blankj
diff --git a/utilcode/src/main/res/drawable/snackbar_action_bg.xml b/utilcode/src/main/res/drawable/snackbar_action_bg.xml
index ff5a49254e..1a4d925904 100644
--- a/utilcode/src/main/res/drawable/snackbar_action_bg.xml
+++ b/utilcode/src/main/res/drawable/snackbar_action_bg.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2014 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,8 +14,8 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:drawable="@drawable/snackbar_action_bg_focused"/>
-    <item android:state_pressed="true" android:drawable="@drawable/snackbar_action_bg_focused"/>
-    <item android:drawable="@android:color/transparent"/>
+    <item android:drawable="@drawable/snackbar_action_bg_focused" android:state_focused="true" />
+    <item android:drawable="@drawable/snackbar_action_bg_focused" android:state_pressed="true" />
+    <item android:drawable="@android:color/transparent" />
 </selector>
 
diff --git a/utilcode/src/main/res/drawable/snackbar_action_bg_focused.xml b/utilcode/src/main/res/drawable/snackbar_action_bg_focused.xml
index cfb93c565c..7d0ccd12ac 100644
--- a/utilcode/src/main/res/drawable/snackbar_action_bg_focused.xml
+++ b/utilcode/src/main/res/drawable/snackbar_action_bg_focused.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2014 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,17 +16,17 @@
 <!-- Used as the canonical button shape. -->
 
 <inset xmlns:android="http://schemas.android.com/apk/res/android"
-       android:insetBottom="6dp"
-       android:insetLeft="4dp"
-       android:insetRight="4dp"
-       android:insetTop="6dp">
+    android:insetBottom="6dp"
+    android:insetLeft="4dp"
+    android:insetRight="4dp"
+    android:insetTop="6dp">
     <shape android:shape="rectangle">
-        <corners android:radius="2dp"/>
-        <solid android:color="@android:color/white"/>
+        <corners android:radius="2dp" />
+        <solid android:color="@android:color/white" />
         <padding
             android:bottom="4dp"
             android:left="8dp"
             android:right="8dp"
-            android:top="4dp"/>
+            android:top="4dp" />
     </shape>
 </inset>
diff --git a/utilcode/src/main/res/layout/design_layout_snackbar_include.xml b/utilcode/src/main/res/layout/design_layout_snackbar_include.xml
index 5bf4f0dd71..5b7e79b784 100644
--- a/utilcode/src/main/res/layout/design_layout_snackbar_include.xml
+++ b/utilcode/src/main/res/layout/design_layout_snackbar_include.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,34 +15,35 @@
 -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <TextView
         android:id="@+id/snackbar_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|left|start"
         android:layout_weight="1"
-        android:paddingTop="14dp"
+        android:ellipsize="end"
+        android:maxLines="2"
         android:paddingBottom="14dp"
         android:paddingLeft="12dp"
         android:paddingRight="12dp"
-        android:textSize="14sp"
+        android:paddingTop="14dp"
+        android:textAlignment="viewStart"
         android:textColor="#000000"
-        android:maxLines="2"
-        android:layout_gravity="center_vertical|left|start"
-        android:ellipsize="end"
-        android:textAlignment="viewStart"/>
+        android:textSize="14sp" />
 
     <Button
         android:id="@+id/snackbar_action"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|right|end"
         android:layout_marginLeft="0dp"
         android:layout_marginStart="0dp"
-        android:layout_gravity="center_vertical|right|end"
-        android:paddingTop="14dp"
+        android:background="@drawable/snackbar_action_bg"
         android:paddingBottom="14dp"
         android:paddingLeft="12dp"
         android:paddingRight="12dp"
-        android:visibility="gone"
+        android:paddingTop="14dp"
         android:textColor="#000000"
-        android:background="@drawable/snackbar_action_bg"/>
+        android:visibility="gone" />
 </merge>
\ No newline at end of file
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/ClipboardUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/ClipboardUtilsTest.java
index 4b139bfca7..824f187023 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/ClipboardUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/ClipboardUtilsTest.java
@@ -1,15 +1,11 @@
 package com.blankj.utilcode.utils;
 
-import android.content.ContentResolver;
 import android.net.Uri;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowContentResolver;
-
-import java.io.File;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/ConvertUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/ConvertUtilsTest.java
index 0fc5f390ef..e0c1802fd9 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/ConvertUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/ConvertUtilsTest.java
@@ -3,7 +3,18 @@
 
 import org.junit.Test;
 
-import static com.blankj.utilcode.utils.ConvertUtils.*;
+import static com.blankj.utilcode.utils.ConvertUtils.bits2Bytes;
+import static com.blankj.utilcode.utils.ConvertUtils.byte2FitSize;
+import static com.blankj.utilcode.utils.ConvertUtils.byte2Size;
+import static com.blankj.utilcode.utils.ConvertUtils.bytes2Bits;
+import static com.blankj.utilcode.utils.ConvertUtils.bytes2Chars;
+import static com.blankj.utilcode.utils.ConvertUtils.bytes2HexString;
+import static com.blankj.utilcode.utils.ConvertUtils.bytes2InputStream;
+import static com.blankj.utilcode.utils.ConvertUtils.chars2Bytes;
+import static com.blankj.utilcode.utils.ConvertUtils.hexString2Bytes;
+import static com.blankj.utilcode.utils.ConvertUtils.inputStream2Bytes;
+import static com.blankj.utilcode.utils.ConvertUtils.inputStream2String;
+import static com.blankj.utilcode.utils.ConvertUtils.string2InputStream;
 import static com.google.common.truth.Truth.assertThat;
 
 
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/EmptyUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/EmptyUtilsTest.java
index 89dd30261f..c84634eda3 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/EmptyUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/EmptyUtilsTest.java
@@ -26,7 +26,7 @@
  * </pre>
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE , sdk = 23)
+@Config(manifest = Config.NONE, sdk = 23)
 public class EmptyUtilsTest {
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
@@ -37,7 +37,7 @@ public void isEmpty() throws Exception {
         int[][] arr = new int[][]{};
         int[] arr1 = null;
         LinkedList<Integer> list = new LinkedList<>();
-        HashMap<String,Integer> map = new HashMap<>();
+        HashMap<String, Integer> map = new HashMap<>();
         SparseArray<String> sa = new SparseArray<>();
         SparseBooleanArray sba = new SparseBooleanArray();
         SparseIntArray sia = new SparseIntArray();
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/EncodeUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/EncodeUtilsTest.java
index 817939ad8b..c827b9c7e7 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/EncodeUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/EncodeUtilsTest.java
@@ -5,7 +5,13 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import static com.blankj.utilcode.utils.EncodeUtils.*;
+import static com.blankj.utilcode.utils.EncodeUtils.base64Decode;
+import static com.blankj.utilcode.utils.EncodeUtils.base64Encode;
+import static com.blankj.utilcode.utils.EncodeUtils.base64Encode2String;
+import static com.blankj.utilcode.utils.EncodeUtils.htmlDecode;
+import static com.blankj.utilcode.utils.EncodeUtils.htmlEncode;
+import static com.blankj.utilcode.utils.EncodeUtils.urlDecode;
+import static com.blankj.utilcode.utils.EncodeUtils.urlEncode;
 import static com.google.common.truth.Truth.assertThat;
 
 /**
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/EncryptUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/EncryptUtilsTest.java
index c5f3553d40..747a8f5069 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/EncryptUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/EncryptUtilsTest.java
@@ -7,9 +7,53 @@
 
 import java.io.File;
 
-import static com.blankj.utilcode.utils.ConvertUtils.*;
-import static com.blankj.utilcode.utils.EncodeUtils.*;
-import static com.blankj.utilcode.utils.EncryptUtils.*;
+import static com.blankj.utilcode.utils.ConvertUtils.hexString2Bytes;
+import static com.blankj.utilcode.utils.EncodeUtils.base64Encode;
+import static com.blankj.utilcode.utils.EncryptUtils.decrypt3DES;
+import static com.blankj.utilcode.utils.EncryptUtils.decryptAES;
+import static com.blankj.utilcode.utils.EncryptUtils.decryptBase64AES;
+import static com.blankj.utilcode.utils.EncryptUtils.decryptBase64DES;
+import static com.blankj.utilcode.utils.EncryptUtils.decryptBase64_3DES;
+import static com.blankj.utilcode.utils.EncryptUtils.decryptDES;
+import static com.blankj.utilcode.utils.EncryptUtils.decryptHexString3DES;
+import static com.blankj.utilcode.utils.EncryptUtils.decryptHexStringAES;
+import static com.blankj.utilcode.utils.EncryptUtils.decryptHexStringDES;
+import static com.blankj.utilcode.utils.EncryptUtils.encrypt3DES;
+import static com.blankj.utilcode.utils.EncryptUtils.encrypt3DES2Base64;
+import static com.blankj.utilcode.utils.EncryptUtils.encrypt3DES2HexString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptAES;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptAES2Base64;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptAES2HexString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptDES;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptDES2Base64;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptDES2HexString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacMD5;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacMD5ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA1;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA1ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA224;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA224ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA256;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA256ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA384;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA384ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA512;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptHmacSHA512ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptMD2;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptMD2ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptMD5;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptMD5File2String;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptMD5ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA1;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA1ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA224;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA224ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA256;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA256ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA384;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA384ToString;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA512;
+import static com.blankj.utilcode.utils.EncryptUtils.encryptSHA512ToString;
 import static com.google.common.truth.Truth.assertThat;
 
 /**
@@ -21,7 +65,7 @@
  * </pre>
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE ,sdk = 23)
+@Config(manifest = Config.NONE, sdk = 23)
 public class EncryptUtilsTest {
 
     String blankjMD2 = "15435017570D8A73449E25C4622E17A4";
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/FileUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/FileUtilsTest.java
index ffcd4847d9..a7ff930224 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/FileUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/FileUtilsTest.java
@@ -6,7 +6,37 @@
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
 
-import static com.blankj.utilcode.utils.FileUtils.*;
+import static com.blankj.utilcode.utils.FileUtils.copyDir;
+import static com.blankj.utilcode.utils.FileUtils.copyFile;
+import static com.blankj.utilcode.utils.FileUtils.createFileByDeleteOldFile;
+import static com.blankj.utilcode.utils.FileUtils.createOrExistsDir;
+import static com.blankj.utilcode.utils.FileUtils.createOrExistsFile;
+import static com.blankj.utilcode.utils.FileUtils.deleteDir;
+import static com.blankj.utilcode.utils.FileUtils.deleteFile;
+import static com.blankj.utilcode.utils.FileUtils.deleteFilesInDir;
+import static com.blankj.utilcode.utils.FileUtils.getDirName;
+import static com.blankj.utilcode.utils.FileUtils.getFileByPath;
+import static com.blankj.utilcode.utils.FileUtils.getFileCharsetSimple;
+import static com.blankj.utilcode.utils.FileUtils.getFileExtension;
+import static com.blankj.utilcode.utils.FileUtils.getFileLines;
+import static com.blankj.utilcode.utils.FileUtils.getFileMD5ToString;
+import static com.blankj.utilcode.utils.FileUtils.getFileName;
+import static com.blankj.utilcode.utils.FileUtils.getFileNameNoExtension;
+import static com.blankj.utilcode.utils.FileUtils.getFileSize;
+import static com.blankj.utilcode.utils.FileUtils.isDir;
+import static com.blankj.utilcode.utils.FileUtils.isFile;
+import static com.blankj.utilcode.utils.FileUtils.isFileExists;
+import static com.blankj.utilcode.utils.FileUtils.listFilesInDir;
+import static com.blankj.utilcode.utils.FileUtils.listFilesInDirWithFilter;
+import static com.blankj.utilcode.utils.FileUtils.moveDir;
+import static com.blankj.utilcode.utils.FileUtils.moveFile;
+import static com.blankj.utilcode.utils.FileUtils.readFile2Bytes;
+import static com.blankj.utilcode.utils.FileUtils.readFile2List;
+import static com.blankj.utilcode.utils.FileUtils.readFile2String;
+import static com.blankj.utilcode.utils.FileUtils.rename;
+import static com.blankj.utilcode.utils.FileUtils.searchFileInDir;
+import static com.blankj.utilcode.utils.FileUtils.writeFileFromIS;
+import static com.blankj.utilcode.utils.FileUtils.writeFileFromString;
 import static com.blankj.utilcode.utils.TestUtils.BASEPATH;
 import static com.blankj.utilcode.utils.TestUtils.SEP;
 import static com.google.common.truth.Truth.assertThat;
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/RegexUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/RegexUtilsTest.java
index b692cb2f37..f62e019e3c 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/RegexUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/RegexUtilsTest.java
@@ -4,7 +4,21 @@
 
 import java.util.Arrays;
 
-import static com.blankj.utilcode.utils.RegexUtils.*;
+import static com.blankj.utilcode.utils.RegexUtils.getMatches;
+import static com.blankj.utilcode.utils.RegexUtils.getReplaceAll;
+import static com.blankj.utilcode.utils.RegexUtils.getReplaceFirst;
+import static com.blankj.utilcode.utils.RegexUtils.getSplits;
+import static com.blankj.utilcode.utils.RegexUtils.isDate;
+import static com.blankj.utilcode.utils.RegexUtils.isEmail;
+import static com.blankj.utilcode.utils.RegexUtils.isIDCard18;
+import static com.blankj.utilcode.utils.RegexUtils.isIP;
+import static com.blankj.utilcode.utils.RegexUtils.isMatch;
+import static com.blankj.utilcode.utils.RegexUtils.isMobileExact;
+import static com.blankj.utilcode.utils.RegexUtils.isMobileSimple;
+import static com.blankj.utilcode.utils.RegexUtils.isTel;
+import static com.blankj.utilcode.utils.RegexUtils.isURL;
+import static com.blankj.utilcode.utils.RegexUtils.isUsername;
+import static com.blankj.utilcode.utils.RegexUtils.isZh;
 import static com.google.common.truth.Truth.assertThat;
 
 /**
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/StringUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/StringUtilsTest.java
index 15dba435b2..8593a93ad3 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/StringUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/StringUtilsTest.java
@@ -2,7 +2,16 @@
 
 import org.junit.Test;
 
-import static com.blankj.utilcode.utils.StringUtils.*;
+import static com.blankj.utilcode.utils.StringUtils.equalsIgnoreCase;
+import static com.blankj.utilcode.utils.StringUtils.isEmpty;
+import static com.blankj.utilcode.utils.StringUtils.isSpace;
+import static com.blankj.utilcode.utils.StringUtils.length;
+import static com.blankj.utilcode.utils.StringUtils.lowerFirstLetter;
+import static com.blankj.utilcode.utils.StringUtils.null2Length0;
+import static com.blankj.utilcode.utils.StringUtils.reverse;
+import static com.blankj.utilcode.utils.StringUtils.toDBC;
+import static com.blankj.utilcode.utils.StringUtils.toSBC;
+import static com.blankj.utilcode.utils.StringUtils.upperFirstLetter;
 import static com.google.common.truth.Truth.assertThat;
 
 /**
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/TestUtils.java b/utilcode/src/test/java/com/blankj/utilcode/utils/TestUtils.java
index 72d6c3b08c..9c7dfb6895 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/TestUtils.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/TestUtils.java
@@ -1,7 +1,6 @@
 package com.blankj.utilcode.utils;
 
 import android.content.Context;
-import android.util.SparseArray;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,8 +9,6 @@
 import org.robolectric.annotation.Config;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/TimeUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/TimeUtilsTest.java
index 08bf69438d..44c00f0199 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/TimeUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/TimeUtilsTest.java
@@ -3,11 +3,23 @@
 import org.junit.Test;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-import static com.blankj.utilcode.utils.TimeUtils.*;
+import static com.blankj.utilcode.utils.TimeUtils.date2Milliseconds;
+import static com.blankj.utilcode.utils.TimeUtils.date2String;
+import static com.blankj.utilcode.utils.TimeUtils.getCurTimeMills;
+import static com.blankj.utilcode.utils.TimeUtils.getCurTimeString;
+import static com.blankj.utilcode.utils.TimeUtils.getIntervalTime;
+import static com.blankj.utilcode.utils.TimeUtils.getWeek;
+import static com.blankj.utilcode.utils.TimeUtils.getWeekIndex;
+import static com.blankj.utilcode.utils.TimeUtils.getWeekOfMonth;
+import static com.blankj.utilcode.utils.TimeUtils.getWeekOfYear;
+import static com.blankj.utilcode.utils.TimeUtils.isLeapYear;
+import static com.blankj.utilcode.utils.TimeUtils.milliseconds2Date;
+import static com.blankj.utilcode.utils.TimeUtils.milliseconds2String;
+import static com.blankj.utilcode.utils.TimeUtils.string2Date;
+import static com.blankj.utilcode.utils.TimeUtils.string2Milliseconds;
 import static com.google.common.truth.Truth.assertThat;
 
 
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/ZipUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/ZipUtilsTest.java
index c8943dbcaa..3ca466db21 100644
--- a/utilcode/src/test/java/com/blankj/utilcode/utils/ZipUtilsTest.java
+++ b/utilcode/src/test/java/com/blankj/utilcode/utils/ZipUtilsTest.java
@@ -8,8 +8,14 @@
 
 import static com.blankj.utilcode.utils.TestUtils.BASEPATH;
 import static com.blankj.utilcode.utils.TestUtils.SEP;
-import static com.blankj.utilcode.utils.ZipUtils.*;
-import static com.google.common.truth.Truth.*;
+import static com.blankj.utilcode.utils.ZipUtils.getComments;
+import static com.blankj.utilcode.utils.ZipUtils.getFilesPath;
+import static com.blankj.utilcode.utils.ZipUtils.unzipFile;
+import static com.blankj.utilcode.utils.ZipUtils.unzipFileByKeyword;
+import static com.blankj.utilcode.utils.ZipUtils.unzipFiles;
+import static com.blankj.utilcode.utils.ZipUtils.zipFile;
+import static com.blankj.utilcode.utils.ZipUtils.zipFiles;
+import static com.google.common.truth.Truth.assertThat;
 
 /**
  * <pre>