兼容通知栏权限到更低的版本

getActivity · getActivity · commit becbcbc8ed95 · 2021-11-14T21:37:51.000+08:00
支持申请查看应用使用情况权限
规避某些机型在权限回调上面出现空指针的问题
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ build
 captures
 
 ._*
-*.apk
 *.iml
 .DS_Store
 local.properties
diff --git a/README.md b/README.md
@@ -6,14 +6,13 @@
 
 * 博文地址：[一句代码搞定权限请求，从未如此简单](https://www.jianshu.com/p/c69ff8a445ed)
 
-* 可以扫码下载 Demo 进行演示或者测试，如果扫码下载不了的，[点击此处可直接下载](https://github.com/getActivity/XXPermissions/releases/download/12.8/XXPermissions.apk)
+* 可以扫码下载 Demo 进行演示或者测试，如果扫码下载不了的，[点击此处可直接下载](https://github.com/getActivity/XXPermissions/releases/download/13.0/XXPermissions.apk)
 
 ![](picture/demo_code.png)
 
 * 另外想对 Android 6.0 权限需要深入了解的，可以看这篇文章[Android 6.0 运行权限解析](https://www.jianshu.com/p/6a4dff744031)
 
-![](picture/1.jpg) ![](picture/2.jpg) ![](picture/3.jpg)
-![](picture/4.jpg) ![](picture/5.jpg) ![](picture/6.jpg)
+![](picture/1.jpg) ![](picture/2.jpg) ![](picture/3.jpg) ![](picture/4.jpg) ![](picture/5.jpg) ![](picture/6.jpg) ![](picture/7.jpg) ![](picture/8.jpg)
 
 #### 集成步骤
 
@@ -45,7 +44,7 @@ android {
 
 dependencies {
     // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.github.getActivity:XXPermissions:12.8'
+    implementation 'com.github.getActivity:XXPermissions:13.0'
 }
 ```
 
@@ -186,13 +185,15 @@ XXPermissions.setInterceptor(new IPermissionInterceptor() {});
 
 |     功能及细节    | [XXPermissions](https://github.com/getActivity/XXPermissions)  | [AndPermission](https://github.com/yanzhenjie/AndPermission) | [PermissionX](https://github.com/guolindev/PermissionX) |  [AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode)   | [RxPermissions](https://github.com/tbruyelle/RxPermissions) | [PermissionsDispatcher](https://github.com/permissions-dispatcher/PermissionsDispatcher) |  [EasyPermissions](https://github.com/googlesamples/easypermissions) |
 | :--------: | :------------: | :------------: | :------------: | :------------: | :------------: | :------------: | :------------: |
-|    对应版本  |  12.8 |  2.0.3  |  1.6.1    |  1.30.6    |  0.12   |   4.9.1  |  3.0.0   |
+|    对应版本  |  13.0 |  2.0.3  |  1.6.1    |  1.30.6    |  0.12   |   4.9.1  |  3.0.0   |
 |    issues 数   |  [![](https://img.shields.io/github/issues/getActivity/XXPermissions.svg)](https://github.com/getActivity/XXPermissions/issues)  |  [![](https://img.shields.io/github/issues/yanzhenjie/AndPermission.svg)](https://github.com/yanzhenjie/AndPermission/issues)  |  [![](https://img.shields.io/github/issues/guolindev/PermissionX.svg)](https://github.com/guolindev/PermissionX/issues)  |  [![](https://img.shields.io/github/issues/Blankj/AndroidUtilCode.svg)](https://github.com/Blankj/AndroidUtilCode/issues)  |  [![](https://img.shields.io/github/issues/tbruyelle/RxPermissions.svg)](https://github.com/tbruyelle/RxPermissions/issues)  |  [![](https://img.shields.io/github/issues/permissions-dispatcher/PermissionsDispatcher.svg)](https://github.com/permissions-dispatcher/PermissionsDispatcher/issues)  |  [![](https://img.shields.io/github/issues/googlesamples/easypermissions.svg)](https://github.com/googlesamples/easypermissions/issues)  |
-|    框架体积  |  28 KB  | 127 KB  |   78 KB  |   500 KB  |  28 KB  |   91 KB  |  48 KB   |
+|    框架体积  |  30 KB  | 127 KB  |   78 KB  |   500 KB  |  28 KB  |   91 KB  |  48 KB   |
+|     所有文件管理权限      |  ✅  |  ❌  |  ✅  |  ❌  |  ❌  |  ❌  |  ❌  |
 |        安装包权限        |  ✅  |  ✅  |  ✅  |  ❌  |  ❌  |  ❌  |  ❌  |
 |        悬浮窗权限        |  ✅  |  ✅  |  ✅  |  ✅  |  ❌  |  ✅  |  ❌  |
+|       系统设置权限       |  ✅  |  ✅  |  ✅  |  ✅  |  ❌  |  ✅  |  ❌  |
 |        通知栏权限        |  ✅  |  ✅  |  ❌  |  ❌  |  ❌  |  ❌  |  ❌  |
-|        系统设置权限      |  ✅  |  ✅  |  ✅  |  ✅  |  ❌  |  ✅  |  ❌  |
+|    查看应用使用情况权限   |  ✅  |  ❌  |  ❌  |  ❌  |  ❌  |  ❌  |  ❌  |
 |  Android 8.0 权限适配   |  ✅  |  ✅  |  ✅  |  ❌ |  ❌  |   ✅  |  ❌  |
 |  Android 9.0 权限适配   |  ✅  |  ❌  |  ✅  |  ❌ |  ❌  |   ✅  |  ❌  |
 |  Android 10 权限适配    |  ✅  |  ✅  |  ✅  |  ❌ |  ❌  |   ✅  |  ❌  |
@@ -261,7 +262,7 @@ XXPermissions.setInterceptor(new IPermissionInterceptor() {});
 
 * 简洁易用：采用链式调用的方式，使用只需一句代码
 
-* 体积感人：功能在同类框架中最全的，但是体积是最小的
+* 体积感人：功能在同类框架中是最全的，但是框架体积是垫底的
 
 * 适配极端情况：无论在多么极端恶劣的环境下申请权限，框架依然坚挺
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.permissions.demo"
         minSdkVersion 14
         targetSdkVersion 31
-        versionCode 1280
-        versionName "12.8"
+        versionCode 1300
+        versionName "13.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,8 @@
     <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
     <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
 
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" tools:ignore="ProtectedPermissions" />
+
     <uses-permission android:name="android.permission.WRITE_SETTINGS" tools:ignore="ProtectedPermissions" />
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/app/src/main/java/com/hjq/permissions/demo/MainActivity.java b/app/src/main/java/com/hjq/permissions/demo/MainActivity.java
@@ -32,11 +32,12 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.btn_main_request_location).setOnClickListener(this);
         findViewById(R.id.btn_main_request_bluetooth).setOnClickListener(this);
         findViewById(R.id.btn_main_request_storage).setOnClickListener(this);
-        findViewById(R.id.btn_main_request_package).setOnClickListener(this);
+        findViewById(R.id.btn_main_request_install).setOnClickListener(this);
         findViewById(R.id.btn_main_request_window).setOnClickListener(this);
-        findViewById(R.id.btn_main_request_notification).setOnClickListener(this);
         findViewById(R.id.btn_main_request_setting).setOnClickListener(this);
         findViewById(R.id.btn_main_app_details).setOnClickListener(this);
+        findViewById(R.id.btn_main_request_notification).setOnClickListener(this);
+        findViewById(R.id.btn_main_request_package).setOnClickListener(this);
     }
 
     @Override
@@ -145,7 +146,7 @@ public void onGranted(List<String> permissions, boolean all) {
                 }
             }, delayMillis);
 
-        } else if (viewId == R.id.btn_main_request_package) {
+        } else if (viewId == R.id.btn_main_request_install) {
 
             XXPermissions.with(this)
                     .permission(Permission.REQUEST_INSTALL_PACKAGES)
@@ -169,6 +170,18 @@ public void onGranted(List<String> permissions, boolean all) {
                         }
                     });
 
+        } else if (viewId == R.id.btn_main_request_setting) {
+
+            XXPermissions.with(this)
+                    .permission(Permission.WRITE_SETTINGS)
+                    .request(new OnPermissionCallback() {
+
+                        @Override
+                        public void onGranted(List<String> permissions, boolean all) {
+                            toast("获取系统设置权限成功");
+                        }
+                    });
+
         } else if (viewId == R.id.btn_main_request_notification) {
 
             XXPermissions.with(this)
@@ -181,15 +194,15 @@ public void onGranted(List<String> permissions, boolean all) {
                         }
                     });
 
-        } else if (viewId == R.id.btn_main_request_setting) {
+        } else if (viewId == R.id.btn_main_request_package) {
 
             XXPermissions.with(this)
-                    .permission(Permission.WRITE_SETTINGS)
+                    .permission(Permission.PACKAGE_USAGE_STATS)
                     .request(new OnPermissionCallback() {
 
                         @Override
                         public void onGranted(List<String> permissions, boolean all) {
-                            toast("获取系统设置权限成功");
+                            toast("获取读取包权限成功");
                         }
                     });
 
diff --git a/app/src/main/java/com/hjq/permissions/demo/PermissionInterceptor.java b/app/src/main/java/com/hjq/permissions/demo/PermissionInterceptor.java
@@ -232,22 +232,29 @@ protected String getPermissionHint(Context context, List<String> permissions) {
                     }
                     break;
                 }
-                case Permission.NOTIFICATION_SERVICE: {
-                    String hint = context.getString(R.string.common_permission_notification);
+                case Permission.SYSTEM_ALERT_WINDOW: {
+                    String hint = context.getString(R.string.common_permission_window);
                     if (!hints.contains(hint)) {
                         hints.add(hint);
                     }
                     break;
                 }
-                case Permission.SYSTEM_ALERT_WINDOW: {
-                    String hint = context.getString(R.string.common_permission_window);
+                case Permission.WRITE_SETTINGS: {
+                    String hint = context.getString(R.string.common_permission_setting);
                     if (!hints.contains(hint)) {
                         hints.add(hint);
                     }
                     break;
                 }
-                case Permission.WRITE_SETTINGS: {
-                    String hint = context.getString(R.string.common_permission_setting);
+                case Permission.NOTIFICATION_SERVICE: {
+                    String hint = context.getString(R.string.common_permission_notification);
+                    if (!hints.contains(hint)) {
+                        hints.add(hint);
+                    }
+                    break;
+                }
+                case Permission.PACKAGE_USAGE_STATS: {
+                    String hint = context.getString(R.string.common_permission_task);
                     if (!hints.contains(hint)) {
                         hints.add(hint);
                     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -57,7 +57,7 @@
                 android:text="申请新版存储权限" />
 
             <Button
-                android:id="@+id/btn_main_request_package"
+                android:id="@+id/btn_main_request_install"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -72,6 +72,14 @@
                 android:layout_marginTop="5dp"
                 android:text="申请悬浮窗权限" />
 
+            <Button
+                android:id="@+id/btn_main_request_setting"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="5dp"
+                android:text="申请系统设置权限" />
+
             <Button
                 android:id="@+id/btn_main_request_notification"
                 android:layout_width="match_parent"
@@ -81,12 +89,12 @@
                 android:text="申请通知栏权限" />
 
             <Button
-                android:id="@+id/btn_main_request_setting"
+                android:id="@+id/btn_main_request_package"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="5dp"
-                android:text="申请系统设置权限" />
+                android:text="申请读取包权限" />
 
             <Button
                 android:id="@+id/btn_main_app_details"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -28,7 +28,8 @@
     <string name="common_permission_storage">存储权限</string>
 
     <string name="common_permission_install">安装应用权限</string>
-    <string name="common_permission_notification">通知栏权限</string>
     <string name="common_permission_window">悬浮窗权限</string>
     <string name="common_permission_setting">系统设置权限</string>
+    <string name="common_permission_notification">通知栏权限</string>
+    <string name="common_permission_task">查看使用情况权限</string>
 </resources>
diff --git a/library/build.gradle b/library/build.gradle
@@ -5,8 +5,8 @@ android {
 
     defaultConfig {
         minSdkVersion 11
-        versionCode 1280
-        versionName "12.8"
+        versionCode 1300
+        versionName "13.0"
     }
 
     // 使用 JDK 1.8
diff --git a/library/src/main/java/com/hjq/permissions/Permission.java b/library/src/main/java/com/hjq/permissions/Permission.java
@@ -33,9 +33,6 @@ private Permission() {}
      */
     public static final String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES";
 
-    /** 通知栏权限（特殊权限，注意此权限不需要在清单文件中注册也能申请） */
-    public static final String NOTIFICATION_SERVICE = "android.permission.NOTIFICATION_SERVICE";
-
     /**
      * 悬浮窗权限（特殊权限）
      *
@@ -47,6 +44,12 @@ private Permission() {}
     /** 系统设置权限（特殊权限） */
     public static final String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS";
 
+    /** 通知栏权限（特殊权限，注意此权限不需要在清单文件中注册也能申请） */
+    public static final String NOTIFICATION_SERVICE = "android.permission.NOTIFICATION_SERVICE";
+
+    /** 查看应用使用情况权限，简称读取包权限（特殊权限，Android 5.0 之后才有的权限） */
+    public static final String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";
+
     /** 读取外部存储 */
     public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE";
     /** 写入外部存储 */
diff --git a/library/src/main/java/com/hjq/permissions/PermissionChecker.java b/library/src/main/java/com/hjq/permissions/PermissionChecker.java
@@ -142,7 +142,7 @@ static void checkStoragePermission(Context context, List<String> requestPermissi
 
                 int targetSdkVersion = context.getApplicationInfo().targetSdkVersion;
 
-                boolean requestLegacyExternalStorage = parser.getAttributeBooleanValue(PermissionUtils.ANDROID_NAMESPACE,
+                boolean requestLegacyExternalStorage = parser.getAttributeBooleanValue(PermissionUtils.getAndroidNamespace(),
                         "requestLegacyExternalStorage", false);
                 // 如果在已经适配 Android 10 的情况下
                 if (targetSdkVersion >= Build.VERSION_CODES.Q && !requestLegacyExternalStorage &&
diff --git a/library/src/main/java/com/hjq/permissions/PermissionFragment.java b/library/src/main/java/com/hjq/permissions/PermissionFragment.java
@@ -1,17 +1,14 @@
 package com.hjq.permissions;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
-import android.util.ArraySet;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +22,6 @@
  *    desc   : 权限请求 Fragment
  */
 @SuppressWarnings("deprecation")
-@TargetApi(Build.VERSION_CODES.M)
 public final class PermissionFragment extends Fragment implements Runnable {
 
     /** 请求的权限组 */
@@ -35,7 +31,7 @@ public final class PermissionFragment extends Fragment implements Runnable {
     private static final String REQUEST_CODE = "request_code";
 
     /** 权限请求码存放集合 */
-    private static final ArraySet<Integer> REQUEST_CODE_ARRAY = new ArraySet<>();
+    private static final List<Integer> REQUEST_CODE_ARRAY = new ArrayList<>();
 
     /**
      * 开启权限申请
@@ -205,13 +201,13 @@ public void requestSpecialPermission() {
             return;
         }
 
-        List<String> permissions = arguments.getStringArrayList(REQUEST_PERMISSIONS);
+        List<String> allPermissions = arguments.getStringArrayList(REQUEST_PERMISSIONS);
 
         // 是否需要申请特殊权限
         boolean requestSpecialPermission = false;
 
         // 判断当前是否包含特殊权限
-        for (String permission : permissions) {
+        for (String permission : allPermissions) {
             if (PermissionUtils.isSpecialPermission(permission)) {
                 if (PermissionUtils.isGrantedPermission(activity, permission)) {
                     // 已经授予过了，可以跳过
@@ -248,7 +244,18 @@ public void requestDangerousPermission() {
         final int requestCode = arguments.getInt(REQUEST_CODE);
 
         final ArrayList<String> allPermissions = arguments.getStringArrayList(REQUEST_PERMISSIONS);
-        if (allPermissions == null || allPermissions.size() == 0) {
+        if (allPermissions == null || allPermissions.isEmpty()) {
+            return;
+        }
+
+        if (!PermissionUtils.isAndroid6()) {
+            // 如果是 Android 6.0 以下，没有危险权限的概念，则直接回调监听
+            int[] grantResults = new int[allPermissions.size()];
+            for (int i = 0; i < grantResults.length; i++) {
+                grantResults[i] = PermissionUtils.isGrantedPermission(activity, allPermissions.get(i)) ?
+                        PackageManager.PERMISSION_GRANTED : PackageManager.PERMISSION_DENIED;
+            }
+            onRequestPermissionsResult(requestCode, allPermissions.toArray(new String[0]), grantResults);
             return;
         }
 
@@ -330,6 +337,11 @@ public void onDenied(List<String> permissions, boolean never) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (permissions == null || permissions.length == 0 ||
+                grantResults == null || grantResults.length == 0) {
+            return;
+        }
+
         Bundle arguments = getArguments();
         Activity activity = getActivity();
         if (activity == null || arguments == null || mInterceptor == null ||
@@ -346,21 +358,21 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
         // 优化权限回调结果
         PermissionUtils.optimizePermissionResults(activity, permissions, grantResults);
 
-        // 全部权限
+        // 将数组转换成 ArrayList
         List<String> allPermissions = PermissionUtils.asArrayList(permissions);
 
         // 释放对这个请求码的占用
-        REQUEST_CODE_ARRAY.remove(requestCode);
+        REQUEST_CODE_ARRAY.remove((Integer) requestCode);
         // 将 Fragment 从 Activity 移除
         detachActivity(activity);
 
         // 获取已授予的权限
-        List<String> grantedPermission = PermissionUtils.getGrantedPermissions(allPermissions, grantResults);
+        List<String> grantedPermissions = PermissionUtils.getGrantedPermissions(allPermissions, grantResults);
 
         // 如果请求成功的权限集合大小和请求的数组一样大时证明权限已经全部授予
-        if (grantedPermission.size() == allPermissions.size()) {
+        if (grantedPermissions.size() == allPermissions.size()) {
             // 代表申请的所有的权限都授予了
-            interceptor.grantedPermissions(activity, allPermissions, grantedPermission, true, callback);
+            interceptor.grantedPermissions(activity, allPermissions, grantedPermissions, true, callback);
             return;
         }
 
@@ -372,8 +384,8 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
                 PermissionUtils.isPermissionPermanentDenied(activity, deniedPermission), callback);
 
         // 证明还有一部分权限被成功授予，回调成功接口
-        if (!grantedPermission.isEmpty()) {
-            interceptor.grantedPermissions(activity, allPermissions, grantedPermission, false, callback);
+        if (!grantedPermissions.isEmpty()) {
+            interceptor.grantedPermissions(activity, allPermissions, grantedPermissions, false, callback);
         }
     }
 
diff --git a/library/src/main/java/com/hjq/permissions/PermissionSettingPage.java b/library/src/main/java/com/hjq/permissions/PermissionSettingPage.java
diff --git a/library/src/main/java/com/hjq/permissions/PermissionUtils.java b/library/src/main/java/com/hjq/permissions/PermissionUtils.java
diff --git a/picture/7.jpg b/picture/7.jpg
diff --git a/picture/8.jpg b/picture/8.jpg

Original file line number	Diff line number	Diff line change
`@@ -232,22 +232,29 @@ protected String getPermissionHint(Context context, List<String> permissions) {`
`232`	`232`	`}`
`233`	`233`	`break;`
`234`	`234`	`}`
`235`		`- case Permission.NOTIFICATION_SERVICE: {`
`236`		`- String hint = context.getString(R.string.common_permission_notification);`
	`235`	`+ case Permission.SYSTEM_ALERT_WINDOW: {`
	`236`	`+ String hint = context.getString(R.string.common_permission_window);`
`237`	`237`	`if (!hints.contains(hint)) {`
`238`	`238`	`hints.add(hint);`
`239`	`239`	`}`
`240`	`240`	`break;`
`241`	`241`	`}`
`242`		`- case Permission.SYSTEM_ALERT_WINDOW: {`
`243`		`- String hint = context.getString(R.string.common_permission_window);`
	`242`	`+ case Permission.WRITE_SETTINGS: {`
	`243`	`+ String hint = context.getString(R.string.common_permission_setting);`
`244`	`244`	`if (!hints.contains(hint)) {`
`245`	`245`	`hints.add(hint);`
`246`	`246`	`}`
`247`	`247`	`break;`
`248`	`248`	`}`
`249`		`- case Permission.WRITE_SETTINGS: {`
`250`		`- String hint = context.getString(R.string.common_permission_setting);`
	`249`	`+ case Permission.NOTIFICATION_SERVICE: {`
	`250`	`+ String hint = context.getString(R.string.common_permission_notification);`
	`251`	`+ if (!hints.contains(hint)) {`
	`252`	`+ hints.add(hint);`
	`253`	`+ }`
	`254`	`+ break;`
	`255`	`+ }`
	`256`	`+ case Permission.PACKAGE_USAGE_STATS: {`
	`257`	`+ String hint = context.getString(R.string.common_permission_task);`
`251`	`258`	`if (!hints.contains(hint)) {`
`252`	`259`	`hints.add(hint);`
`253`	`260`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ android {`
`5`	`5`
`6`	`6`	`defaultConfig {`
`7`	`7`	`minSdkVersion 11`
`8`		`- versionCode 1280`
`9`		`- versionName "12.8"`
	`8`	`+ versionCode 1300`
	`9`	`+ versionName "13.0"`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`// 使用 JDK 1.8`