Merge branch '1.23.4'

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,4 @@
+* `19/01/30` [add] RomUtils. Publish v1.23.4.
 * `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.

utilcode/README-CN.md

@@ -679,6 +679,30 @@ readRaw2String    : 从 raw 中读取字符串
 readRaw2List      : 从 raw 中按行读取字符串
 ```
 
+* ### Rom 相关 -> [RomUtils.java][rom.java] -> [Demo][rom.demo]
+```
+isHuawei   : 是否华为
+isVivo     : 是否 VIVO
+isXiaomi   : 是否小米
+isOppo     : 是否 OPPO
+isLeeco    : 是否乐视
+is360      : 是否 360
+isZte      : 是否中兴
+isOneplus  : 是否一加
+isNubia    : 是否努比亚
+isCoolpad  : 是否酷派
+isLg       : 是否 LG
+isGoogle   : 是否谷歌
+isSamsung  : 是否三星
+isMeizu    : 是否魅族
+isLenovo   : 是否联想
+isSmartisan: 是否锤子
+isHtc      : 是否 HTC
+isSony     : 是否索尼
+isAmigo    : 是否金立
+getRomInfo : 获取 ROM 信息
+```
+
 * ### 屏幕相关 -> [ScreenUtils.java][screen.java] -> [Demo][screen.demo]
 ```
 getScreenWidth     : 获取屏幕的宽度（单位：px）
@@ -1055,6 +1079,9 @@ getComments       : 获取压缩文件中的注释链表
 [resource.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
 [resource.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/resource/ResourceActivity.kt
 
+[rom.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/RomUtils.java
+[rom.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/rom/RomActivity.kt
+
 [screen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
 [screen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/screen/ScreenActivity.kt
 

utilcode/README.md

@@ -679,6 +679,30 @@ readRaw2String
 readRaw2List
 ```
 
+* ### About Rom -> [RomUtils.java][rom.java] -> [Demo][rom.demo]
+```
+isHuawei
+isVivo
+isXiaomi
+isOppo
+isLeeco
+is360
+isZte
+isOneplus
+isNubia
+isCoolpad
+isLg
+isGoogle
+isSamsung
+isMeizu
+isLenovo
+isSmartisan
+isHtc
+isSony
+isAmigo
+getRomInfo
+```
+
 * ### About Screen -> [ScreenUtils.java][screen.java] -> [Demo][screen.demo]
 ```
 getScreenWidth
@@ -1055,6 +1079,9 @@ getComments
 [resource.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
 [resource.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/resource/ResourceActivity.kt
 
+[rom.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/RomUtils.java
+[rom.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/rom/RomActivity.kt
+
 [screen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
 [screen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/screen/ScreenActivity.kt
 

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

@@ -922,7 +922,8 @@ private static boolean isSpace(final String s) {
     private static boolean isDeviceRooted() {
         String su = "su";
         String[] locations = {"/system/bin/", "/system/xbin/", "/sbin/", "/system/sd/xbin/",
-                "/system/bin/failsafe/", "/data/local/xbin/", "/data/local/bin/", "/data/local/"};
+                "/system/bin/failsafe/", "/data/local/xbin/", "/data/local/bin/", "/data/local/",
+                "/system/sbin/", "/usr/bin/", "/vendor/bin/"};
         for (String location : locations) {
             if (new File(location + su).exists()) {
                 return true;

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

@@ -43,7 +43,8 @@ private DeviceUtils() {
     public static boolean isDeviceRooted() {
         String su = "su";
         String[] locations = {"/system/bin/", "/system/xbin/", "/sbin/", "/system/sd/xbin/",
-                "/system/bin/failsafe/", "/data/local/xbin/", "/data/local/bin/", "/data/local/"};
+                "/system/bin/failsafe/", "/data/local/xbin/", "/data/local/bin/", "/data/local/",
+                "/system/sbin/", "/usr/bin/", "/vendor/bin/"};
         for (String location : locations) {
             if (new File(location + su).exists()) {
                 return true;