diff --git a/README-CN.md b/README-CN.md index c5a3bf7740f28689f3b6dc432d46e145b92f25cf..2a2dc027eb5332e9e6f4da678c4f827f94eb8a69 100644 --- a/README-CN.md +++ b/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.14.1-brightgreen.svg +[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.14.2-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 index ff9b5d99e8cd00d15ad8f9cd1105974fb4e592f7..25c3fa599d47cad8624fedf99e5ecf3d150faea1 100644 --- a/README.md +++ b/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.14.1-brightgreen.svg +[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.14.2-brightgreen.svg [auc]: https://github.com/Blankj/AndroidUtilCode [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg diff --git a/app/build.gradle b/app/build.gradle index 790dabb3141f1ddc2523b7798e6d4b0a5cb998a0..f641e3acd1780cd92bb8f61dedad595a1711300a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ dependencies { // LeakCanary debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version" releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version" -// implementation 'com.blankj:utilcode:1.14.1' +// implementation 'com.blankj:utilcode:1.14.2' } diff --git a/app/src/main/java/com/blankj/androidutilcode/base/BaseBackActivity.java b/app/src/main/java/com/blankj/androidutilcode/base/BaseBackActivity.java index 0ad793f5a1733cb84ea466ff4e523e16290a810b..dab3c6c092af96fba019fe430282741acd07772b 100644 --- a/app/src/main/java/com/blankj/androidutilcode/base/BaseBackActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/base/BaseBackActivity.java @@ -1,5 +1,6 @@ package com.blankj.androidutilcode.base; +import android.annotation.SuppressLint; import android.support.annotation.LayoutRes; import android.support.design.widget.AppBarLayout; import android.support.design.widget.CoordinatorLayout; @@ -31,6 +32,7 @@ public abstract class BaseBackActivity extends BaseActivity { protected AppBarLayout abl; protected FrameLayout flActivityContainer; + @SuppressLint("ResourceType") @Override protected void setBaseView(@LayoutRes int layoutId) { Slidr.attach(this); @@ -40,7 +42,9 @@ public abstract class BaseBackActivity extends BaseActivity { abl = findViewById(R.id.abl); mToolbar = findViewById(R.id.toolbar); flActivityContainer = findViewById(R.id.activity_container); - flActivityContainer.addView(LayoutInflater.from(this).inflate(layoutId, flActivityContainer, false)); + if (layoutId > 0) { + flActivityContainer.addView(LayoutInflater.from(this).inflate(layoutId, flActivityContainer, false)); + } setSupportActionBar(mToolbar); getToolBar().setDisplayHomeAsUpEnabled(true); diff --git a/build.gradle b/build.gradle index 4651f238a0273664a77056b6cd411d918c9b1b57..0dff04507f672c05394a35c4a4c780072c75ce47 100644 --- a/build.gradle +++ b/build.gradle @@ -44,8 +44,8 @@ ext { min_sdk_version = 14 target_sdk_version = 27 - version_code = 1_014_001 - version_name = '1.14.1'// E.g 1.9.72 => 1,009,072 + version_code = 1_014_002 + version_name = '1.14.2'// E.g 1.9.72 => 1,009,072 // App dependencies support_version = '27.1.0' diff --git a/update_log.md b/update_log.md index 031ea4aa050a84f496a4402efe81a0b03e6e69c4..cce522fc54f0e2fcdc8b9d3450b65493483c13a4 100644 --- a/update_log.md +++ b/update_log.md @@ -1,3 +1,4 @@ +* 18/05/02 修复 PermissionUtils 空异常，发布 1.14.2 版本 * 18/04/28 新增 FlashlightUtils，发布 1.14.1 版本 * 18/04/26 修复 KeyboardUtils 全屏 NO_LIMIT 的 bug * 18/04/25 修复多个空异常 diff --git a/utilcode/README-CN.md b/utilcode/README-CN.md index 6c61d57a20346f250f5755c7d74648a73a7e632a..5979e82655164767ed478a4b986bed531d3e3101 100644 --- a/utilcode/README-CN.md +++ b/utilcode/README-CN.md @@ -2,7 +2,7 @@ Gradle: ```groovy -implementation 'com.blankj:utilcode:1.14.1' +implementation 'com.blankj:utilcode:1.14.2' ``` diff --git a/utilcode/README.md b/utilcode/README.md index cfcd911cca9ed3b2bdbf964f57307710ddb958e2..75f5578bd87d0da4729fd39820a21981b781e3a9 100644 --- a/utilcode/README.md +++ b/utilcode/README.md @@ -2,7 +2,7 @@ Gradle: ```groovy -implementation 'com.blankj:utilcode:1.14.1' +implementation 'com.blankj:utilcode:1.14.2' ``` diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java index f7f2c5fce38b4fde86fd7bde45a2a7bc2a3356c3..aef6a5ec02a85cddd18fe403f499b1c4c8a869de 100644 --- a/utilcode/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java +++ b/utilcode/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java @@ -41,7 +41,12 @@ public final class KeyboardUtils { (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE); if (imm == null) return; View view = activity.getCurrentFocus(); - if (view == null) view = new View(activity); + if (view == null) { + view = new View(activity); + view.setFocusable(true); + view.setFocusableInTouchMode(true); + view.requestFocus(); + } imm.showSoftInput(view, InputMethodManager.SHOW_FORCED); } diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java index 6f06b45e7457289931f6c91942943d23cdc83c60..6df610448155191ae942f89bb503d68a4d1d0b61 100755 --- a/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java +++ b/utilcode/src/main/java/com/blankj/utilcode/util/PermissionUtils.java @@ -11,6 +11,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; import android.support.v4.content.ContextCompat; +import android.util.Log; import com.blankj.utilcode.constant.PermissionConstants; import com.blankj.utilcode.util.PermissionUtils.OnRationaleListener.ShouldRequest; @@ -287,6 +288,11 @@ public final class PermissionUtils { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { + if (sInstance == null) { + Log.e("PermissionUtils", "request permissions failed"); + finish(); + return; + } if (sInstance.mThemeCallback != null) { sInstance.mThemeCallback.onActivityCreate(this); }