see 01/29 log

Author: Blankj

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.12.2-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.12.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 ptoject helps you a lot, and you would like to support this ptoject's fu
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.12.2-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.12.3-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

app/build.gradle

@@ -67,7 +67,7 @@ dependencies {
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
 
-//    implementation 'com.blankj:utilcode:1.12.2'
+//    implementation 'com.blankj:utilcode:1.12.3'
 }
 
 

app/src/main/java/com/blankj/androidutilcode/feature/core/device/DeviceActivity.java

@@ -47,7 +47,8 @@ public void initView(Bundle savedInstanceState, View view) {
         TextView tvAboutDevice = findViewById(R.id.tv_about_device);
         tvAboutDevice.setText(new SpanUtils()
                 .appendLine("isRoot: " + DeviceUtils.isDeviceRooted())
-                .appendLine("getSDKVersion: " + DeviceUtils.getSDKVersion())
+                .appendLine("getSDKVersionName: " + DeviceUtils.getSDKVersionName())
+                .appendLine("getSDKVersionCode: " + DeviceUtils.getSDKVersionCode())
                 .appendLine("getAndroidID: " + DeviceUtils.getAndroidID())
                 .appendLine("getMacAddress: " + DeviceUtils.getMacAddress())
                 .appendLine("getManufacturer: " + DeviceUtils.getManufacturer())

build.gradle

@@ -32,8 +32,8 @@ ext {
     min_sdk_version = 14
     target_sdk_version = 23
 
-    version_code = 1_012_002
-    version_name = '1.12.2'// E.g 1.9.72 => 1,009,072
+    version_code = 1_012_003
+    version_name = '1.12.3'// E.g 1.9.72 => 1,009,072
 
     // App dependencies
     support_version = '26.1.0'

update_log.md

@@ -1,4 +1,4 @@
-* 18/01/27 修复 ToastUtils 默认样式问题，发布 1.12.2
+* 18/01/27 修复 ToastUtils 默认样式问题，发布 1.12.2，新增 DeviceUtils#getSDKVersionName，发布 1.12.3
 * 18/01/27 修复 PermissionUtils 某些机型闪烁问题，发布 1.12.1
 * 18/01/17 完善 ReflectUtils 及 单元测试，发布 1.12.0 版本
 * 18/01/16 完善 ReflectUtils 及 单元测试

utilcode/README-CN.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-compile 'com.blankj:utilcode:1.12.2'
+compile 'com.blankj:utilcode:1.12.3'
 ```
 
 
@@ -154,7 +154,8 @@ init: 初始化
 * ### 设备相关 -> [DeviceUtils.java][device.java] -> [Demo][device.demo]
 ```
 isDeviceRooted   : 判断设备是否 rooted
-getSDKVersion    : 获取设备系统版本号
+getSDKVersionName: 获取设备系统版本号
+getSDKVersionCode: 获取设备系统版本码
 getAndroidID     : 获取设备 AndroidID
 getMacAddress    : 获取设备 MAC 地址
 getManufacturer  : 获取设备厂商

utilcode/README.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-compile 'com.blankj:utilcode:1.12.2'
+compile 'com.blankj:utilcode:1.12.3'
 ```
 
 
@@ -154,7 +154,8 @@ init
 * ### About Device -> [DeviceUtils.java][device.java] -> [Demo][device.demo]
 ```
 isDeviceRooted
-getSDKVersion
+getSDKVersionName
+getSDKVersionCode
 getAndroidID
 getMacAddress
 getManufacturer
@@ -725,7 +726,7 @@ getComments
 [process.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/core/process/ProcessActivity.java
 
 [reflect.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ReflectUtils.java
-[reflect.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/ReflectUtilsTest.java
+[reflect.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/reflect/ReflectUtilsTest.java
 
 [regex.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/RegexUtils.java
 [regex.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/RegexUtilsTest.java

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

@@ -50,10 +50,18 @@ public static boolean isDeviceRooted() {
      *
      * @return 设备系统版本号
      */
-    public static int getSDKVersion() {
-        return android.os.Build.VERSION.SDK_INT;
+    public static String getSDKVersionName() {
+        return android.os.Build.VERSION.RELEASE;
     }
 
+    /**
+     * 获取设备系统版本码
+     *
+     * @return 设备系统版本码
+     */
+    public static int getSDKVersionCode() {
+        return android.os.Build.VERSION.SDK_INT;
+    }
 
     /**
      * 获取设备 AndroidID

utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java

@@ -207,11 +207,14 @@ private static void show(final CharSequence text, final int duration) {
             public void run() {
                 cancel();
                 sToast = Toast.makeText(Utils.getApp(), text, duration);
-                //t solve the font of toast
                 TextView tvMessage = sToast.getView().findViewById(android.R.id.message);
+                int msgColor = tvMessage.getCurrentTextColor();
+                //it solve the font of toast
                 TextViewCompat.setTextAppearance(tvMessage, android.R.style.TextAppearance);
                 if (sMsgColor != COLOR_DEFAULT) {
                     tvMessage.setTextColor(sMsgColor);
+                } else {
+                    tvMessage.setTextColor(msgColor);
                 }
                 if (sGravity != -1 || sXOffset != -1 || sYOffset != -1) {
                     sToast.setGravity(sGravity, sXOffset, sYOffset);