Merge pull request Blankj#805 from Blankj/1.23.0

1.23.0

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,8 @@
+* `19/01/17` [fix] Publish v1.23.0.
+* `19/01/16` [fix] BarUtils get Activity from view and delete the function of set status bar alpha.
+* `19/01/15` [add] ColorUtils.
+* `19/01/04` [add] CacheDiskStaticUtils, CacheDoubleStaticUtils, CacheMemoryStaticUtils.
+* `19/01/03` [add] SPStaticUtils.
 * `19/01/02` [fix] LogUtils log object. Publish v1.22.10.
 * `19/01/01` [add] GsonUtils.
 * `18/12/29` [add] AntiShakeUtils and VibrateUtils. Publish v1.22.9.

README-CN.md

@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.10-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.0-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.10-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.0-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

bus-gradle-plugin/src/main/java/com/blankj/util/JsonUtils.groovy

@@ -13,8 +13,9 @@ import com.google.gson.GsonBuilder
  */
 final class JsonUtils {
 
+    static final Gson GSON = new GsonBuilder().setPrettyPrinting().create()
+
     static String getFormatJson(Object object) {
-        Gson gson = new GsonBuilder().setPrettyPrinting().create()
-        return gson.toJson(object)
+        return GSON.toJson(object)
     }
 }

bus-gradle-plugin/src/main/java/com/blankj/util/ZipUtils.java

@@ -291,13 +291,23 @@ public static List<File> unzipFileByKeyword(final File zipFile,
             if (isSpace(keyword)) {
                 while (entries.hasMoreElements()) {
                     ZipEntry entry = ((ZipEntry) entries.nextElement());
-                    if (!unzipChildFile(destDir, files, zip, entry)) return files;
+                    String entryName = entry.getName();
+                    if (entryName.contains("../")) {
+                        System.err.println("entryName: " + entryName + " is dangerous!");
+                        continue;
+                    }
+                    if (!unzipChildFile(destDir, files, zip, entry, entryName)) return files;
                 }
             } else {
                 while (entries.hasMoreElements()) {
                     ZipEntry entry = ((ZipEntry) entries.nextElement());
-                    if (entry.getName().contains(keyword)) {
-                        if (!unzipChildFile(destDir, files, zip, entry)) return files;
+                    String entryName = entry.getName();
+                    if (entryName.contains("../")) {
+                        System.out.println("entryName: " + entryName + " is dangerous!");
+                        continue;
+                    }
+                    if (entryName.contains(keyword)) {
+                        if (!unzipChildFile(destDir, files, zip, entry, entryName)) return files;
                     }
                 }
             }
@@ -310,8 +320,9 @@ public static List<File> unzipFileByKeyword(final File zipFile,
     private static boolean unzipChildFile(final File destDir,
                                           final List<File> files,
                                           final ZipFile zip,
-                                          final ZipEntry entry) throws IOException {
-        File file = new File(destDir, entry.getName());
+                                          final ZipEntry entry,
+                                          final String name) throws IOException {
+        File file = new File(destDir, name);
         files.add(file);
         if (entry.isDirectory()) {
             return createOrExistsDir(file);
@@ -365,7 +376,13 @@ public static List<String> getFilesPath(final File zipFile)
         ZipFile zip = new ZipFile(zipFile);
         Enumeration<?> entries = zip.entries();
         while (entries.hasMoreElements()) {
-            paths.add(((ZipEntry) entries.nextElement()).getName());
+            String entryName = ((ZipEntry) entries.nextElement()).getName();
+            if (entryName.contains("../")) {
+                System.out.println("entryName: " + entryName + " is dangerous!");
+                paths.add(entryName);
+            } else {
+                paths.add(entryName);
+            }
         }
         zip.close();
         return paths;

config.gradle

@@ -5,8 +5,8 @@ ext {
     compileSdkVersion = 27
     minSdkVersion = 14
     targetSdkVersion = 27
-    versionCode = 1_022_010
-    versionName = '1.22.10'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_023_000
+    versionName = '1.23.0'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,

launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt

@@ -5,7 +5,6 @@ import android.os.Bundle
 import android.support.v7.app.ActionBarDrawerToggle
 import android.view.View
 import android.widget.ImageView
-import com.blankj.launcher.pkg.R
 import com.blankj.lib.base.BaseDrawerActivity
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.BarUtils
@@ -44,7 +43,7 @@ class MainActivity : BaseDrawerActivity() {
         mDrawerRootLayout.addDrawerListener(toggle)
         toggle.syncState()
 
-        BarUtils.setStatusBarAlpha4Drawer(this, mDrawerRootLayout, launcherMainFakeStatusBar, 0, false)
+        BarUtils.setStatusBarColor4Drawer(mDrawerRootLayout, launcherMainFakeStatusBar, Color.TRANSPARENT, false)
         BarUtils.addMarginTopEqualStatusBarHeight(launcherMainToolbar)
 
         launcherMainCoreUtilBtn.setOnClickListener {

lib/base/build.gradle

@@ -15,5 +15,5 @@ dependencies {
     api dep.free_proguard
     api 'com.r0adkll:slidableactivity:2.0.5'
     compileOnly dep.leakcanary.android_no_op
-//    api 'com.blankj:utilcode:1.22.10'
+//    api 'com.blankj:utilcode:1.22.11'
 }

lib/base/src/main/java/com/blankj/lib/base/BaseActivity.kt

@@ -5,7 +5,7 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
-import com.blankj.utilcode.util.AntiShakeUtils
+import com.blankj.utilcode.util.*
 
 /**
  * ```
@@ -27,6 +27,15 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
         setRootLayout(bindLayout())
         initView(savedInstanceState, mContentView)
         doBusiness()
+        AppUtils.registerAppStatusChangedListener(this, object : Utils.OnAppStatusChangedListener {
+            override fun onForeground() {
+                ToastUtils.showShort("foreground")
+            }
+
+            override fun onBackground() {
+                ToastUtils.showShort("background")
+            }
+        })
     }
 
     override fun setRootLayout(layoutId: Int) {
@@ -40,4 +49,10 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
             onWidgetClick(view)
         }
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        AppUtils.unregisterAppStatusChangedListener(this)
+        KeyboardUtils.fixSoftInputLeaks(this);
+    }
 }

lib/base/src/main/java/com/blankj/lib/base/BaseBackActivity.kt

@@ -28,7 +28,7 @@ abstract class BaseBackActivity : BaseActivity() {
         setSupportActionBar(baseBackToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        BarUtils.setStatusBarColor(this, ContextCompat.getColor(Utils.getApp(), R.color.colorPrimary), 0)
+        BarUtils.setStatusBarColor(this, ContextCompat.getColor(Utils.getApp(), R.color.colorPrimary))
         BarUtils.addMarginTopEqualStatusBarHeight(backRootLayout)
     }
 

lib/base/src/main/res/values/colors.xml

@@ -26,4 +26,42 @@
         <item>@color/rainbow_blue</item>
         <item>@color/rainbow_purple</item>
     </integer-array>
+
+
+    <!--beautiful color-->
+    <color name="grapefruit">#ED5565</color>
+    <color name="grapefruitDark">#DA4453</color>
+
+    <color name="bittersweet">#FC6E51</color>
+    <color name="bittersweetDark">#E9573F</color>
+
+    <color name="sunflower">#FFCE54</color>
+    <color name="sunflowerDark">#F6BB42</color>
+
+    <color name="grass">#A0D468</color>
+    <color name="grassDark">#8CC152</color>
+
+    <color name="mint">#48CFAD</color>
+    <color name="mintDark">#37BC9B</color>
+
+    <color name="aqua">#4FC1E9</color>
+    <color name="aquaDark">#3BAFDA</color>
+
+    <color name="blueJeans">#5D9CEC</color>
+    <color name="blueJeansDark">#4A89DC</color>
+
+    <color name="lavander">#AC92EC</color>
+    <color name="lavanderDark">#967ADC</color>
+
+    <color name="pinkRose">#EC87C0</color>
+    <color name="pinkRoseDark">#D770AD</color>
+
+    <color name="lightGray">#F5F7FA</color>
+    <color name="lightGrayDark">#E6E9ED</color>
+
+    <color name="mediumGray">#CCD1D9</color>
+    <color name="mediumGrayDark">#AAB2BD</color>
+
+    <color name="darkGray">#656D78</color>
+    <color name="darkGrayDark">#434A54</color>
 </resources>