增加 M 版本检测

Author: hupei

README.md

@@ -10,7 +10,7 @@
 
 #使用Gradle构建时添加一下依赖即可:
 ```javascript
-compile 'com.mylhyl:acp:1.0.2'
+compile 'com.mylhyl:acp:1.1.2'
 ```
 
 # 使用说明
@@ -50,3 +50,5 @@ compile 'com.mylhyl:acp:1.0.2'
 > 1.0.1 修改 minSdkVersion 14
 
 > 1.0.2 修复申请的权限不在`AndroidManifest.xml`配置文件时，中仍然显示`RationalMessage`对话框的问题
+
+> 1.1.2 增加`M`版本检测

acp/build.gradle

@@ -26,7 +26,7 @@ def siteUrl = 'https://github.com/mylhyl/AndroidAcp'
 def gitUrl = 'https://github.com/mylhyl/AndroidAcp.git'
 
 group = "com.mylhyl"
-version = "1.0.2"
+version = "1.1.2"
 
 install {
     repositories.mavenInstaller {

acp/src/main/java/com/mylhyl/acp/AcpManager.java

@@ -9,6 +9,7 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 import android.provider.Settings;
 
 import java.util.HashSet;
@@ -62,6 +63,11 @@ synchronized void request(AcpOptions options, AcpListener acpListener) {
 
     private synchronized void checkSelfPermission() {
         mDeniedPermissions.clear();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            mCallback.onGranted();
+            onDestroy();
+            return;
+        }
         String[] permissions = mOptions.getPermissions();
         for (String permission : permissions) {
             //检查申请的权限是否在 AndroidManifest.xml 中

acp/src/main/java/com/mylhyl/acp/AcpService.java

@@ -2,8 +2,12 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.content.PermissionChecker;
 
 /**
  * Created by hupei on 2016/4/26.
@@ -17,6 +21,20 @@ class AcpService {
      * @return
      */
     int checkSelfPermission(Context context, String permission) {
+        try {
+            final PackageInfo info = context.getPackageManager().getPackageInfo(
+                    context.getPackageName(), 0);
+            int targetSdkVersion = info.applicationInfo.targetSdkVersion;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (targetSdkVersion >= Build.VERSION_CODES.M) {
+                    return ContextCompat.checkSelfPermission(context, permission);
+                } else {
+                    return PermissionChecker.checkSelfPermission(context, permission);
+                }
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
         return ContextCompat.checkSelfPermission(context, permission);
     }