Merge pull request Blankj#822 from Blankj/1.23.3

1.23.3

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,6 @@
+* `19/01/29` [fix] LogUtils format json when json not start with '{'. Publish v1.23.3.
+* `19/01/28` [fix] KeyboardUtils#fixSoftInputLeaks don't work on the device of HuaWei.
+* `19/01/26` [fix] NetworkUtils#getNetworkType.
 * `19/01/25` [add] CloneUtils, PermissionUtils support request permission of WRITE_SETTINGS and DRAW_OVERLAYS. Publish v1.23.2.
 * `19/01/24` [add] BrightnessUtils and FlashlightUtils.
 * `19/01/23` [add] Modify the demo of utilcode use kotlin. Publish v1.23.1.

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.23.2-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.3-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.23.2-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.3-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

config.gradle

@@ -5,8 +5,8 @@ ext {
     compileSdkVersion = 27
     minSdkVersion = 14
     targetSdkVersion = 27
-    versionCode = 1_023_002
-    versionName = '1.23.2'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_023_003
+    versionName = '1.23.3'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,
@@ -17,7 +17,7 @@ ext {
     // lib version
     kotlin_version = '1.3.0'
     support_version = '27.1.1'
-    leakcanary_version = '1.5.4'
+    leakcanary_version = '1.6.3'
 
     dep = [
             plugin       : [
@@ -38,8 +38,9 @@ ext {
             constraint   : "com.android.support.constraint:constraint-layout:1.1.3",
             kotlin       : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
             leakcanary   : [
-                    android      : "com.squareup.leakcanary:leakcanary-android:$leakcanary_version",
-                    android_no_op: "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version",
+                    android         : "com.squareup.leakcanary:leakcanary-android:$leakcanary_version",
+                    android_no_op   : "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version",
+                    support_fragment: "com.squareup.leakcanary:leakcanary-support-fragment:$leakcanary_version"
             ],
             free_proguard: "com.blankj:free-proguard:0.0.7",
             adapt_screen : "com.blankj:adapt-screen:0.0.3",

config_app.gradle

@@ -40,6 +40,7 @@ android {
 dependencies {
     // LeakCanary
     debugImplementation dep.leakcanary.android
+    debugImplementation dep.leakcanary.support_fragment
     releaseImplementation dep.leakcanary.android_no_op
 }
 

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.23.2'
+//    api 'com.blankj:utilcode:1.23.3'
 }

subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt

@@ -51,7 +51,7 @@ class LocationActivity : BaseBackActivity() {
                 override fun getLocation(lastLatitude: String, lastLongitude: String, latitude: String,
                                          longitude: String, country: String, locality: String, street: String) {
                     runOnUiThread {
-                        locationAboutTv.text = SpanUtils()
+                        SpanUtils.with(locationAboutTv)
                                 .appendLine("lastLatitude: $lastLatitude")
                                 .appendLine("lastLongitude: $lastLongitude")
                                 .appendLine("latitude: $latitude")
@@ -77,7 +77,7 @@ class LocationActivity : BaseBackActivity() {
     override fun initView(savedInstanceState: Bundle?, contentView: View) {
         setTitle(R.string.demo_location)
 
-        locationAboutTv.text = SpanUtils()
+        SpanUtils.with(locationAboutTv)
                 .appendLine("lastLatitude: unknown")
                 .appendLine("lastLongitude: unknown")
                 .appendLine("latitude: unknown")

utilcode/README-CN.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.23.2'
+implementation 'com.blankj:utilcode:1.23.3'
 ```
 
 

utilcode/README-STATIC-BUS.md

@@ -27,7 +27,7 @@ apply plugin: "com.blankj.bus"
 给 base 模块添加 [AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 依赖：
 
 ```groovy
-api "com.blankj:utilcode:1.23.2"
+api "com.blankj:utilcode:1.23.3"
 ```
 
 比如 module0 中存在的 `Module0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们给它添加 `@BusUtils.Subscribe` 注解，并给注解的 `name` 赋唯一值，要注意，函数务必要 `public static` 哦：

utilcode/README.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.23.2'
+implementation 'com.blankj:utilcode:1.23.3'
 ```
 
 

utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java

@@ -736,7 +736,7 @@ public static AppInfo getAppInfo() {
      * </ul>
      *
      * @param packageName The name of the package.
-     * @return 当前应用的 AppInfo
+     * @return the application's information
      */
     public static AppInfo getAppInfo(final String packageName) {
         try {

utilcode/lib/src/main/java/com/blankj/utilcode/util/BarUtils.java

@@ -127,7 +127,6 @@ public static void setStatusBarLightMode(@NonNull final Window window,
             if (decorView != null) {
                 int vis = decorView.getSystemUiVisibility();
                 if (isLightMode) {
-                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
                     vis |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
                 } else {
                     vis &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
@@ -137,6 +136,33 @@ public static void setStatusBarLightMode(@NonNull final Window window,
         }
     }
 
+    /**
+     * Is the status bar light mode.
+     *
+     * @param activity The activity.
+     * @return {@code true}: yes<br>{@code false}: no
+     */
+    public static boolean isStatusBarLightMode(@NonNull final Activity activity) {
+        return isStatusBarLightMode(activity.getWindow());
+    }
+
+    /**
+     * Is the status bar light mode.
+     *
+     * @param window The window.
+     * @return {@code true}: yes<br>{@code false}: no
+     */
+    public static boolean isStatusBarLightMode(@NonNull final Window window) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            View decorView = window.getDecorView();
+            if (decorView != null) {
+                int vis = decorView.getSystemUiVisibility();
+                return (vis & View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR) != 0;
+            }
+        }
+        return false;
+    }
+
     /**
      * Add the top margin size equals status bar's height for view.
      *
@@ -437,9 +463,10 @@ public static int getNavBarHeight() {
      * @param activity  The activity.
      * @param isVisible True to set navigation bar visible, false otherwise.
      */
-    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     public static void setNavBarVisibility(@NonNull final Activity activity, boolean isVisible) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
         setNavBarVisibility(activity.getWindow(), isVisible);
+
     }
 
     /**
@@ -448,8 +475,8 @@ public static void setNavBarVisibility(@NonNull final Activity activity, boolean
      * @param window    The window.
      * @param isVisible True to set navigation bar visible, false otherwise.
      */
-    @RequiresApi(Build.VERSION_CODES.KITKAT)
     public static void setNavBarVisibility(@NonNull final Window window, boolean isVisible) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) return;
         final ViewGroup decorView = (ViewGroup) window.getDecorView();
         for (int i = 0, count = decorView.getChildCount(); i < count; i++) {
             final View child = decorView.getChildAt(i);

utilcode/lib/src/main/java/com/blankj/utilcode/util/ConvertUtils.java

@@ -1,6 +1,7 @@
 package com.blankj.utilcode.util;
 
 import android.annotation.SuppressLint;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ -578,7 +579,7 @@ public static Bitmap view2Bitmap(final View view) {
      * @return value of px
      */
     public static int dp2px(final float dpValue) {
-        final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
+        final float scale = Resources.getSystem().getDisplayMetrics().density;
         return (int) (dpValue * scale + 0.5f);
     }
 
@@ -589,7 +590,7 @@ public static int dp2px(final float dpValue) {
      * @return value of dp
      */
     public static int px2dp(final float pxValue) {
-        final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
+        final float scale = Resources.getSystem().getDisplayMetrics().density;
         return (int) (pxValue / scale + 0.5f);
     }
 
@@ -600,7 +601,7 @@ public static int px2dp(final float pxValue) {
      * @return value of px
      */
     public static int sp2px(final float spValue) {
-        final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
+        final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
         return (int) (spValue * fontScale + 0.5f);
     }
 
@@ -611,7 +612,7 @@ public static int sp2px(final float spValue) {
      * @return value of sp
      */
     public static int px2sp(final float pxValue) {
-        final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
+        final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
         return (int) (pxValue / fontScale + 0.5f);
     }
 

utilcode/lib/src/main/java/com/blankj/utilcode/util/JsonUtils.java

@@ -211,10 +211,15 @@ public static String formatJson(final String json) {
 
     public static String formatJson(final String json, final int indentSpaces) {
         try {
-            if (json.startsWith("{")) {
-                return new JSONObject(json).toString(indentSpaces);
-            } else if (json.startsWith("[")) {
-                return new JSONArray(json).toString(indentSpaces);
+            for (int i = 0, len = json.length(); i < len; i++) {
+                char c = json.charAt(i);
+                if (c == '{') {
+                    return new JSONObject(json).toString(indentSpaces);
+                } else if (c == '[') {
+                    return new JSONArray(json).toString(indentSpaces);
+                } else if (!Character.isWhitespace(c)) {
+                    return json;
+                }
             }
         } catch (JSONException e) {
             e.printStackTrace();

utilcode/lib/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java

@@ -259,28 +259,26 @@ private static int getContentViewInvisibleHeight(final Activity activity) {
      * Fix the leaks of soft input.
      * <p>Call the function in {@link Activity#onDestroy()}.</p>
      *
-     * @param context The context.
+     * @param activity The activity.
      */
-    public static void fixSoftInputLeaks(final Context context) {
-        if (context == null) return;
+    public static void fixSoftInputLeaks(final Activity activity) {
+        if (activity == null) return;
         InputMethodManager imm =
                 (InputMethodManager) Utils.getApp().getSystemService(Context.INPUT_METHOD_SERVICE);
-        String[] strArr = new String[]{"mCurRootView", "mServedView", "mNextServedView", "mLastSrvView"};
-        for (int i = 0; i < 4; i++) {
+        if (imm == null) return;
+        String[] leakViews = new String[]{"mLastSrvView", "mCurRootView", "mServedView", "mNextServedView"};
+        for (String leakView : leakViews) {
             try {
-                //noinspection ConstantConditions
-                Field declaredField = imm.getClass().getDeclaredField(strArr[i]);
+                Field declaredField = InputMethodManager.class.getDeclaredField(leakView);
                 if (declaredField == null) continue;
                 if (!declaredField.isAccessible()) {
                     declaredField.setAccessible(true);
                 }
                 Object obj = declaredField.get(imm);
                 if (!(obj instanceof View)) continue;
                 View view = (View) obj;
-                if (view.getContext() == context) {
+                if (view.getRootView() == activity.getWindow().getDecorView().getRootView()) {
                     declaredField.set(imm, null);
-                } else {
-                    return;
                 }
             } catch (Throwable th) {
                 th.printStackTrace();