Merge branch '1.25.9'

Blankj · Aug 25, 2019 · 7bc1ec6 · 7bc1ec6
2 parents 4a3c080 + bfc0a67
commit 7bc1ec6
Show file tree

Hide file tree

Showing 33 changed files with 259 additions and 143 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+* `19/08/25` [upd] ImageUtils#getImageType. [add] LogUtils# Publish v1.25.9.
+* `19/08/24` [fix] PhoneUtils#getIMEI crash on SDK 29.
+* `19/08/23` [add] ViewUtils#isLayoutRtl.
+* `19/08/22` [add] LogUtils#getLogFiles.
 * `19/08/13` [add] MapUtils and MapUtilsTest. Publish v1.25.8.
 * `19/08/12` [add] CollectionUtils and CollectionUtilsTest.
 * `19/08/11` [add] ArrayUtils and ArrayUtilsTest.

diff --git a/README-CN.md b/README-CN.md
@@ -51,7 +51,7 @@
 
 [frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame_cn.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.8-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.9-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.8-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.9-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

diff --git a/buildSrc/src/main/groovy/Config.groovy b/buildSrc/src/main/groovy/Config.groovy
@@ -14,8 +14,8 @@ class Config {
     static compileSdkVersion = 28
     static minSdkVersion = 14
     static targetSdkVersion = 28
-    static versionCode = 1_025_008
-    static versionName = '1.25.8-alpha1'// E.g. 1.9.72 => 1,009,072
+    static versionCode = 1_025_009
+    static versionName = '1.25.9'// E.g. 1.9.72 => 1,009,072
 
     // lib version
     static kotlin_version = '1.3.10'

diff --git a/buildSrc/src/main/groovy/GitUtils.groovy b/buildSrc/src/main/groovy/GitUtils.groovy
@@ -1,6 +1,5 @@
 import org.gradle.api.Action
 import org.gradle.api.Project
-import org.gradle.api.Task
 import org.gradle.api.invocation.Gradle
 
 import java.text.SimpleDateFormat
@@ -34,55 +33,43 @@ class GitUtils {
     }
 
     static void addGitPushTask(Project project) {
-        project.task("gitPush", new Action<Task>() {
-            @Override
-            void execute(Task task) {
-                task.doLast {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd")
-                    String date = simpleDateFormat.format(new Date())
-                    GLog.d(ShellUtils.execCmd([
-                            "git add -A",
-                            "git commit -m \"see $date log\"",
-                            "git push origin $sCurBranchName"
-                    ] as String[]))
-                }
-            }
-        })
+        project.task("gitPush").doLast {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd")
+            String date = simpleDateFormat.format(new Date())
+            GLog.d(ShellUtils.execCmd([
+                    "git add -A",
+                    "git commit -m \"see $date log\"",
+                    "git push origin $sCurBranchName"
+            ] as String[]))
+        }
     }
 
     static void addGitPushAndMerge2MasterTask(Project project) {
-        project.task("gitPushAndMerge2Master", new Action<Task>() {
-            @Override
-            void execute(Task task) {
-                task.doLast {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd")
-                    String date = simpleDateFormat.format(new Date())
-                    GLog.d(ShellUtils.execCmd([
-                            "git add -A",
-                            "git commit -m \"see $date log\"",
-                            "git push origin $sCurBranchName",
-                            "git checkout master",
-                            "git merge $sCurBranchName",
-                            "git push origin master",
-                            "git checkout $sCurBranchName",
-                    ] as String[]))
-                }
-            }
-        })
+        project.task("gitPushAndMerge2Master").doLast {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd")
+            String date = simpleDateFormat.format(new Date())
+            GLog.d(ShellUtils.execCmd([
+                    "git add -A",
+                    "git commit -m \"see $date log\"",
+                    "git push origin $sCurBranchName",
+                    "git checkout master",
+                    "git merge $sCurBranchName",
+                    "git push origin master",
+                    "git checkout $sCurBranchName",
+            ] as String[]))
+        }
     }
 
     static void addGitNewBranchTask(Project project) {
-        project.task("gitNewBranch", new Action<Task>() {
-            @Override
-            void execute(Task task) {
-                task.doLast {
-                    GLog.d(ShellUtils.execCmd([
-                            "git checkout master",
-                            "git checkout -b ${Config.versionName}",
-                            "git push origin ${Config.versionName}:${Config.versionName}",
-                    ] as String[]))
-                }
-            }
-        })
+        project.task("gitNewBranch").doLast {
+            GLog.d(ShellUtils.execCmd([
+                    "git checkout master",
+                    "git checkout -b ${Config.versionName}",
+                    "git push origin ${Config.versionName}:${Config.versionName}",
+            ] as String[]))
+        }
     }
 }
+// ./gradlew gitPush
+// ./gradlew gitPushAndMerge2Master
+// ./gradlew gitNewBranch
diff --git a/buildSrc/src/main/groovy/GitUtils.java b/buildSrc/src/main/groovy/GitUtils.java
diff --git a/gradle.properties b/gradle.properties
@@ -16,6 +16,7 @@
 org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
 org.gradle.daemon=true
 #org.gradle.configureondemand=true
-#org.gradle.parallel=true
+org.gradle.parallel=true
+org.gradle.caching=true
 
 #-Dorg.gradle.debug=true --no-daemon
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/lib/utilcode/README-CN.md b/lib/utilcode/README-CN.md
@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.25.8'
+implementation 'com.blankj:utilcode:1.25.9'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.25.8'
+implementation 'com.blankj:utilcodex:1.25.9'
 ```
 
 
@@ -1069,6 +1069,15 @@ vibrate: 震动
 cancel : 取消
 ```
 
+* ### 视图相关 -> [ViewUtils.java][view.java]
+```
+setViewEnabled      : 设置视图是否可用
+runOnUiThread       : 在 UI 线程运行
+runOnUiThreadDelayed: 在 UI 线程延迟运行
+isLayoutRtl         : 布局是否从右到左
+fixScrollViewTopping: 修复 ScrollView 置顶问题
+```
+
 * ### 压缩相关 -> [ZipUtils.java][zip.java] -> [Test][zip.test]
 ```
 zipFiles          : 批量压缩文件
@@ -1269,5 +1278,7 @@ getComments       : 获取压缩文件中的注释链表
 [vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
 [vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.kt
 
+[view.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ViewUtils.java
+
 [zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
 [zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java
diff --git a/lib/utilcode/README.md b/lib/utilcode/README.md
@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.25.8'
+implementation 'com.blankj:utilcode:1.25.9'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.25.8'
+implementation 'com.blankj:utilcodex:1.25.9'
 ```
 
 
@@ -1069,6 +1069,15 @@ vibrate
 cancel
 ```
 
+* ### About View -> [ViewUtils.java][view.java]
+```
+setViewEnabled
+runOnUiThread
+runOnUiThreadDelayed
+isLayoutRtl
+fixScrollViewTopping
+```
+
 * ### About Zip -> [ZipUtils.java][zip.java] -> [Test][zip.test]
 ```
 zipFiles
@@ -1266,5 +1275,7 @@ getComments
 [vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
 [vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.kt
 
+[view.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ViewUtils.java
+
 [zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
 [zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java b/lib/utilcode/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
@@ -64,7 +64,7 @@ public final class PermissionConstants {
             permission.RECEIVE_WAP_PUSH, permission.RECEIVE_MMS,
     };
     private static final String[] GROUP_STORAGE       = {
-            permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE
+            permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE,
     };
 
     @StringDef({CALENDAR, CAMERA, CONTACTS, LOCATION, MICROPHONE, PHONE, SENSORS, SMS, STORAGE,})

diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java
@@ -865,7 +865,7 @@ private static boolean isSpace(final String s) {
         return true;
     }
 
-    private static final char HEX_DIGITS[] =
+    private static final char[] HEX_DIGITS =
             {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
     private static byte[] hashTemplate(final byte[] data, final String algorithm) {

diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ConvertUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ConvertUtils.java
@@ -35,7 +35,7 @@ private ConvertUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }
 
-    private static final char hexDigits[] =
+    private static final char[] hexDigits =
             {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
     /**
@@ -581,7 +581,7 @@ public static Bitmap view2Bitmap(final View view) {
      * @return value of px
      */
     public static int dp2px(final float dpValue) {
-        final float scale = Resources.getSystem().getDisplayMetrics().density;
+        final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
         return (int) (dpValue * scale + 0.5f);
     }
 
@@ -592,7 +592,7 @@ public static int dp2px(final float dpValue) {
      * @return value of dp
      */
     public static int px2dp(final float pxValue) {
-        final float scale = Resources.getSystem().getDisplayMetrics().density;
+        final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
         return (int) (pxValue / scale + 0.5f);
     }
 
@@ -603,7 +603,7 @@ public static int px2dp(final float pxValue) {
      * @return value of px
      */
     public static int sp2px(final float spValue) {
-        final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
+        final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
         return (int) (spValue * fontScale + 0.5f);
     }
 
@@ -614,7 +614,7 @@ public static int sp2px(final float spValue) {
      * @return value of sp
      */
     public static int px2sp(final float pxValue) {
-        final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
+        final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
         return (int) (pxValue / fontScale + 0.5f);
     }
 

diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java
@@ -41,7 +41,7 @@ public final class CrashUtils {
 
     private static final String FILE_SEP = System.getProperty("file.separator");
     @SuppressLint("SimpleDateFormat")
-    private static final Format FORMAT   = new SimpleDateFormat("MM-dd HH-mm-ss");
+    private static final Format FORMAT   = new SimpleDateFormat("MM-dd_HH-mm-ss");
 
     private static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER;
     private static final UncaughtExceptionHandler UNCAUGHT_EXCEPTION_HANDLER;