Merge pull request Blankj#812 from Blankj/1.23.1

1.23.1

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,5 @@
+* `19/01/23` [add] Modify the demo of utilcode use kotlin. Publish v1.23.1.
+* `19/01/22` [fix] AppUtils#installApp.
 * `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.

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.0-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.1-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.0-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.23.1-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_000
-    versionName = '1.23.0'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_023_001
+    versionName = '1.23.1'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,

launcher/app/__bus__.json

@@ -1,4 +1,4 @@
 {
   "SubUtilActivity#start": "void com.blankj.subutil.pkg.feature.SubUtilActivity.start(android.content.Context)",
-  "CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.start(android.content.Context)"
+  "CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.Companion.start(android.content.Context)"
 }

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

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

@@ -83,7 +83,7 @@ open class BaseApplication : Application() {
         }
     }
 
-    protected fun isDebug(): Boolean {
+    fun isDebug(): Boolean {
         if (isDebug == null) isDebug = AppUtils.isAppDebug()
         return isDebug!!
     }

subutil/lib/src/main/java/com/blankj/subutil/util/HttpsUtil renamed to subutil/lib/src/main/java/com/blankj/subutil/util/HttpsUtil.java

@@ -13,13 +13,13 @@
 public class HttpsUtil {
 
     private static final int CONNECT_TIMEOUT_TIME = 15000;
-    private static final int READ_TIMEOUT_TIME = 19000;
+    private static final int READ_TIMEOUT_TIME    = 19000;
 
     /**
      * POST + JSON
      *
      * @param data send data
-     * @param url target url
+     * @param url  target url
      * @return data receive from server
      * @author MilkZS
      */
@@ -31,7 +31,7 @@ public static String postJson(String data, String url) {
      * POST + FORM
      *
      * @param data send data
-     * @param url target url
+     * @param url  target url
      * @return data receive from serv
      * @author MilkZS
      */
@@ -43,7 +43,7 @@ public static String postForm(String data, String url) {
      * GET + JSON
      *
      * @param data send data
-     * @param url target url
+     * @param url  target url
      * @return data receive from server
      * @author MilkZS
      */
@@ -55,7 +55,7 @@ public static String getJson(String data, String url) {
      * GET + FORM
      *
      * @param data send data
-     * @param url target url
+     * @param url  target url
      * @return data receive from server
      * @author MilkZS
      */

utilcode/README-CN.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.23.0'
+implementation 'com.blankj:utilcode:1.23.1'
 ```
 
 
@@ -445,9 +445,7 @@ getCaptureIntent                 : 获取拍照的意图
 * ### 键盘相关 -> [KeyboardUtils.java][keyboard.java] -> [Demo][keyboard.demo]
 ```
 showSoftInput                     : 显示软键盘
-showSoftInputUsingToggle          : 显示软键盘用 toggle
 hideSoftInput                     : 隐藏软键盘
-hideSoftInputUsingToggle          : 隐藏软键盘用 toggle
 toggleSoftInput                   : 切换键盘显示与否状态
 isSoftInputVisible                : 判断软键盘是否可见
 registerSoftInputChangedListener  : 注册软键盘改变监听器

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.0"
+api "com.blankj:utilcode:1.23.1"
 ```
 
 比如 module0 中存在的 `Module0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们给它添加 `@BusUtils.Subscribe` 注解，并给注解的 `name` 赋唯一值，要注意，函数务必要 `public static` 哦：

utilcode/README.md

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

utilcode/app/__bus__.json

@@ -1,3 +1,3 @@
 {
-  "CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.start(android.content.Context)"
+  "CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.Companion.start(android.content.Context)"
 }

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

@@ -969,10 +969,11 @@ private static Intent getInstallAppIntent(final File file, final boolean isNewTa
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
             data = Uri.fromFile(file);
         } else {
-            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             String authority = Utils.getApp().getPackageName() + ".utilcode.provider";
             data = FileProvider.getUriForFile(Utils.getApp(), authority, file);
+            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         }
+        Utils.getApp().grantUriPermission(Utils.getApp().getPackageName(), data, Intent.FLAG_GRANT_READ_URI_PERMISSION);
         intent.setDataAndType(data, type);
         return isNewTask ? intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) : intent;
     }

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

@@ -476,6 +476,7 @@ public static void setNavBarVisibility(@NonNull final Window window, boolean isV
 
     /**
      * Return whether the navigation bar visible.
+     * <p>Call it in onWindowFocusChanged will get right result.</p>
      *
      * @param activity The activity.
      * @return {@code true}: yes<br>{@code false}: no
@@ -486,6 +487,7 @@ public static boolean isNavBarVisible(@NonNull final Activity activity) {
 
     /**
      * Return whether the navigation bar visible.
+     * <p>Call it in onWindowFocusChanged will get right result.</p>
      *
      * @param window The window.
      * @return {@code true}: yes<br>{@code false}: no

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

@@ -201,7 +201,7 @@ public static int getRandomColor() {
      * @return the random color
      */
     public static int getRandomColor(final boolean supportAlpha) {
-        int high = supportAlpha ? (int) (Math.random() * 0xFF) << 24 : 0xFF000000;
-        return high | (int) (Math.random() * 0xFFFFFF);
+        int high = supportAlpha ? (int) (Math.random() * 0x100) << 24 : 0xFF000000;
+        return high | (int) (Math.random() * 0x1000000);
     }
 }

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

@@ -120,15 +120,15 @@ public static String getMacAddress() {
      */
     @RequiresPermission(allOf = {ACCESS_WIFI_STATE, INTERNET})
     public static String getMacAddress(final String... excepts) {
-        String macAddress = getMacAddressByWifiInfo();
+        String macAddress = getMacAddressByNetworkInterface();
         if (isAddressNotInExcepts(macAddress, excepts)) {
             return macAddress;
         }
-        macAddress = getMacAddressByNetworkInterface();
+        macAddress = getMacAddressByInetAddress();
         if (isAddressNotInExcepts(macAddress, excepts)) {
             return macAddress;
         }
-        macAddress = getMacAddressByInetAddress();
+        macAddress = getMacAddressByWifiInfo();
         if (isAddressNotInExcepts(macAddress, excepts)) {
             return macAddress;
         }
@@ -151,12 +151,13 @@ private static boolean isAddressNotInExcepts(final String address, final String.
         return true;
     }
 
-    @SuppressLint({"HardwareIds", "MissingPermission", "WifiManagerLeak"})
+    @SuppressLint({"MissingPermission", "HardwareIds"})
     private static String getMacAddressByWifiInfo() {
         try {
-            WifiManager wifi = (WifiManager) Utils.getApp().getSystemService(Context.WIFI_SERVICE);
+            final WifiManager wifi = (WifiManager) Utils.getApp()
+                    .getApplicationContext().getSystemService(Context.WIFI_SERVICE);
             if (wifi != null) {
-                WifiInfo info = wifi.getConnectionInfo();
+                final WifiInfo info = wifi.getConnectionInfo();
                 if (info != null) return info.getMacAddress();
             }
         } catch (Exception e) {

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

@@ -10,7 +10,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
@@ -19,6 +18,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import javax.net.ssl.HttpsURLConnection;
+
 /**
  * <pre>
  *     author: Blankj
@@ -993,7 +994,7 @@ public static long getFileLength(final String filePath) {
         boolean isURL = filePath.matches("[a-zA-z]+://[^\\s]*");
         if (isURL) {
             try {
-                HttpURLConnection conn = (HttpURLConnection) new URL(filePath).openConnection();
+                HttpsURLConnection conn = (HttpsURLConnection) new URL(filePath).openConnection();
                 conn.setRequestProperty("Accept-Encoding", "identity");
                 conn.connect();
                 if (conn.getResponseCode() == 200) {

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

@@ -50,24 +50,15 @@ public static void showSoftInput(final Activity activity) {
      * Show the soft input.
      *
      * @param activity The activity.
+     * @param flags    Provides additional operating flags.  Currently may be
+     *                 0 or have the {@link InputMethodManager#SHOW_IMPLICIT} bit set.
      */
     public static void showSoftInput(final Activity activity, final int flags) {
-        InputMethodManager imm =
-                (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
-        if (imm == null) return;
         View view = activity.getCurrentFocus();
         if (view == null) {
             view = new View(activity);
-            view.setFocusable(true);
-            view.setFocusableInTouchMode(true);
-            view.requestFocus();
         }
-        imm.showSoftInput(view, flags, new ResultReceiver(new Handler()) {
-            @Override
-            protected void onReceiveResult(int resultCode, Bundle resultData) {
-                LogUtils.e(resultCode);
-            }
-        });
+        showSoftInput(view, flags);
     }
 
     /**
@@ -82,26 +73,26 @@ public static void showSoftInput(final View view) {
     /**
      * Show the soft input.
      *
-     * @param view The view.
+     * @param view  The view.
+     * @param flags Provides additional operating flags.  Currently may be
+     *              0 or have the {@link InputMethodManager#SHOW_IMPLICIT} bit set.
      */
     public static void showSoftInput(final View view, final int flags) {
         InputMethodManager imm =
                 (InputMethodManager) Utils.getApp().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm == null) return;
         view.setFocusable(true);
         view.setFocusableInTouchMode(true);
         view.requestFocus();
-        //noinspection ConstantConditions
-        imm.showSoftInput(view, flags);
-    }
-
-    /**
-     * Show the soft input using toggle.
-     *
-     * @param activity The activity.
-     */
-    public static void showSoftInputUsingToggle(final Activity activity) {
-        if (isSoftInputVisible(activity)) return;
-        toggleSoftInput();
+        imm.showSoftInput(view, flags, new ResultReceiver(new Handler()) {
+            @Override
+            protected void onReceiveResult(int resultCode, Bundle resultData) {
+                if (resultCode == InputMethodManager.RESULT_UNCHANGED_HIDDEN
+                        || resultCode == InputMethodManager.RESULT_HIDDEN) {
+                    toggleSoftInput();
+                }
+            }
+        });
     }
 
     /**
@@ -110,12 +101,11 @@ public static void showSoftInputUsingToggle(final Activity activity) {
      * @param activity The activity.
      */
     public static void hideSoftInput(final Activity activity) {
-        InputMethodManager imm =
-                (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
-        if (imm == null) return;
         View view = activity.getCurrentFocus();
-        if (view == null) view = new View(activity);
-        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        if (view == null) {
+            view = new View(activity);
+        }
+        hideSoftInput(view);
     }
 
     /**
@@ -126,18 +116,16 @@ public static void hideSoftInput(final Activity activity) {
     public static void hideSoftInput(final View view) {
         InputMethodManager imm =
                 (InputMethodManager) Utils.getApp().getSystemService(Context.INPUT_METHOD_SERVICE);
-        //noinspection ConstantConditions
-        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
-    }
-
-    /**
-     * Hide the soft input.
-     *
-     * @param activity The activity.
-     */
-    public static void hideSoftInputUsingToggle(final Activity activity) {
-        if (!isSoftInputVisible(activity)) return;
-        toggleSoftInput();
+        if (imm == null) return;
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0, new ResultReceiver(new Handler()) {
+            @Override
+            protected void onReceiveResult(int resultCode, Bundle resultData) {
+                if (resultCode == InputMethodManager.RESULT_UNCHANGED_SHOWN
+                        || resultCode == InputMethodManager.RESULT_SHOWN) {
+                    toggleSoftInput();
+                }
+            }
+        });
     }
 
     /**