1、修改8.0系统上透明activity引起的bug 2、targetSDK升级到28 3、支持在util类中的非静态方法中申请权限

maqiang · maqiang · commit c17833c4b250 · 2019-06-13T21:40:48.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'android-aspectjx'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "26.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.ninetripods.aopermission"
         minSdkVersion 15
-        targetSdkVersion 23
-        versionCode 1100
-        versionName "1.1"
+        targetSdkVersion 28
+        versionCode 1200
+        versionName "1.2.0"
     }
     buildTypes {
         release {
@@ -33,7 +33,7 @@ aspectjx {
 dependencies {
     compile project(':permissionlib')
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:appcompat-v7:28.0.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:support-v4:28.0.0'
 }
diff --git a/app/src/main/java/com/ninetripods/aopermission/MainActivity.java b/app/src/main/java/com/ninetripods/aopermission/MainActivity.java
@@ -18,7 +18,6 @@
 import com.ninetripods.aopermission.permissionlib.bean.DenyBean;
 import com.ninetripods.aopermission.permissionlib.util.SettingUtil;
 
-import java.util.Arrays;
 import java.util.List;
 
 
@@ -85,8 +84,6 @@ private void callMap() {
     @PermissionDenied
     public void dealPermission(DenyBean bean) {
         if (bean == null) return;
-        Toast.makeText(this, "requestCode:" + bean.getRequestCode()
-                + ",Permissions: " + Arrays.toString(bean.getDenyList().toArray()), Toast.LENGTH_SHORT).show();
         List<String> denyList = bean.getDenyList();
         switch (bean.getRequestCode()) {
             case 10:
@@ -151,7 +148,7 @@ public void onClick(DialogInterface dialog, int which) {
      */
     @PermissionCanceled
     public void dealCancelPermission(CancelBean bean) {
-        Toast.makeText(this, "requestCode:" + bean.getRequestCode(), Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, "权限申请被取消，请求码 :" + bean.getRequestCode(), Toast.LENGTH_SHORT).show();
     }
 
     /**
@@ -164,4 +161,13 @@ public void startPermissionService(View view) {
         startService(intent);
     }
 
+    /**
+     * 在util类中的非静态方法中申请
+     *
+     * @param view
+     */
+    public void requestByUtil(View view) {
+        RequestPermissionByUtil util = new RequestPermissionByUtil();
+        util.requestPermission(this);
+    }
 }
diff --git a/app/src/main/java/com/ninetripods/aopermission/RequestPermissionByUtil.java b/app/src/main/java/com/ninetripods/aopermission/RequestPermissionByUtil.java
@@ -0,0 +1,70 @@
+package com.ninetripods.aopermission;
+
+import android.Manifest;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.widget.Toast;
+
+import com.ninetripods.aopermission.permissionlib.annotation.NeedPermission;
+import com.ninetripods.aopermission.permissionlib.annotation.PermissionCanceled;
+import com.ninetripods.aopermission.permissionlib.annotation.PermissionDenied;
+import com.ninetripods.aopermission.permissionlib.bean.CancelBean;
+import com.ninetripods.aopermission.permissionlib.bean.DenyBean;
+import com.ninetripods.aopermission.permissionlib.util.SettingUtil;
+
+
+/**
+ * Created by mq on 2019-06-11 19:58
+ * mqcoder90@gmail.com
+ */
+public class RequestPermissionByUtil {
+
+
+    @NeedPermission(value = {Manifest.permission.CAMERA})
+    public void requestPermission(Context context) {
+        Toast.makeText(context, "相机权限申请成功", Toast.LENGTH_SHORT).show();
+    }
+
+    /**
+     * 权限被取消
+     *
+     * @param bean CancelBean
+     */
+    @PermissionCanceled
+    public void dealCancelPermission(CancelBean bean) {
+        Toast.makeText(bean.getContext(), "相机权限申请被取消，请求码 :" + bean.getRequestCode(), Toast.LENGTH_SHORT).show();
+    }
+
+    /**
+     * 权限被拒绝
+     *
+     * @param denyBean DenyBean
+     */
+    @PermissionDenied
+    public void dealDeniedPermission(DenyBean denyBean) {
+
+        final Context context = denyBean.getContext();
+
+        new AlertDialog.Builder(context)
+                .setTitle("提示")
+                .setMessage("相机权限被禁止，需要手动打开")
+                .setPositiveButton("去设置", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                        SettingUtil.go2Setting(context);
+                    }
+                })
+                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                    }
+                })
+                .create().show();
+
+    }
+
+
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -51,6 +51,22 @@
         android:onClick="startPermissionService"
         android:text="启动Service" />
 
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:text="在Util类中申请权限"
+        android:textSize="18dp" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:layout_marginTop="20dp"
+        android:onClick="requestByUtil"
+        android:text="通过util申请权限" />
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/permissionlib/build.gradle b/permissionlib/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'//添加
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "26.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -28,15 +28,15 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.4.0'
+    compile 'com.android.support:appcompat-v7:28.0.0'
     compile 'org.aspectj:aspectjrt:1.8.9'
 }
 
 publish {
     userOrg = 'crazyqiang'//bintray.com用户名
     groupId = 'com.ninetripods'//jCenter上的路径
     artifactId = 'aop-permission'//项目名称
-    publishVersion = '1.1.0'//修改版本号
+    publishVersion = '1.2.0'//修改版本号
     desc = 'A library that request Permissions in an AOP manner'//描述，不重要
     website = 'https://github.com/crazyqiang/Aopermission'
 }
diff --git a/permissionlib/src/main/AndroidManifest.xml b/permissionlib/src/main/AndroidManifest.xml
@@ -5,7 +5,6 @@
     <application>
         <activity
             android:name="com.ninetripods.aopermission.permissionlib.PermissionRequestActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/translucent" />
     </application>
 </manifest>
diff --git a/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/PermissionRequestActivity.java b/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/PermissionRequestActivity.java
@@ -3,6 +3,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
@@ -48,6 +50,9 @@ public static void PermissionRequest(Context context, String[] permissions, int
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_request_permission);
+        if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
         Bundle bundle = getIntent().getExtras();
         if (bundle != null) {
             permissions = bundle.getStringArray(PERMISSION_KEY);
@@ -72,7 +77,7 @@ private void requestPermission(String[] permissions) {
             //all permissions granted
             if (permissionListener != null) {
                 permissionListener.PermissionGranted();
-                permissionListener=null;
+                permissionListener = null;
             }
             finish();
             overridePendingTransition(0, 0);
@@ -111,7 +116,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             }
 
         }
-        permissionListener=null;
+        permissionListener = null;
         finish();
         overridePendingTransition(0, 0);
     }
diff --git a/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/aop/PermissionAspect.java b/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/aop/PermissionAspect.java
@@ -10,6 +10,7 @@
 import com.ninetripods.aopermission.permissionlib.bean.CancelBean;
 import com.ninetripods.aopermission.permissionlib.bean.DenyBean;
 import com.ninetripods.aopermission.permissionlib.interf.IPermission;
+import com.ninetripods.aopermission.permissionlib.util.Utils;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -21,12 +22,15 @@
 import java.util.List;
 
 /**
+ * 权限切面Aspect类
  * Created by mq on 2018/3/6 上午11:33
  * mqcoder90@gmail.com
  */
 @Aspect
 public class PermissionAspect {
 
+    Context context;
+
     private static final String PERMISSION_REQUEST_POINTCUT =
             "execution(@com.ninetripods.aopermission.permissionlib.annotation.NeedPermission * *(..))";
 
@@ -37,15 +41,32 @@ public void requestPermissionMethod(NeedPermission needPermission) {
     @Around("requestPermissionMethod(needPermission)")
     public void AroundJoinPoint(final ProceedingJoinPoint joinPoint, NeedPermission needPermission) {
 
-        Context context = null;
         final Object object = joinPoint.getThis();
+        if (object == null) return;
+
         if (object instanceof Context) {
             context = (Context) object;
         } else if (object instanceof Fragment) {
             context = ((Fragment) object).getActivity();
         } else if (object instanceof android.support.v4.app.Fragment) {
             context = ((android.support.v4.app.Fragment) object).getActivity();
+        } else {
+            //获取切入点方法上的参数列表
+            Object[] objects = joinPoint.getArgs();
+            if (objects.length > 0) {
+                //非静态方法且第一个参数为context
+                if (objects[0] instanceof Context) {
+                    context = (Context) objects[0];
+                } else {
+                    //没有传入context 默认使用application
+                    context = Utils.getApp();
+                }
+            } else {
+                context = Utils.getApp();
+            }
+
         }
+
         if (context == null || needPermission == null) return;
 
         PermissionRequestActivity.PermissionRequest(context, needPermission.value(),
@@ -63,21 +84,22 @@ public void PermissionGranted() {
                     public void PermissionDenied(int requestCode, List<String> denyList) {
                         Class<?> cls = object.getClass();
                         Method[] methods = cls.getDeclaredMethods();
-                        if (methods == null || methods.length == 0) return;
+                        if (methods.length == 0) return;
                         for (Method method : methods) {
                             //过滤不含自定义注解PermissionDenied的方法
                             boolean isHasAnnotation = method.isAnnotationPresent(PermissionDenied.class);
                             if (isHasAnnotation) {
                                 method.setAccessible(true);
                                 //获取方法类型
                                 Class<?>[] types = method.getParameterTypes();
-                                if (types == null || types.length != 1) return;
+                                if (types.length != 1) return;
                                 //获取方法上的注解
                                 PermissionDenied aInfo = method.getAnnotation(PermissionDenied.class);
                                 if (aInfo == null) return;
                                 //解析注解上对应的信息
                                 DenyBean bean = new DenyBean();
                                 bean.setRequestCode(requestCode);
+                                bean.setContext(context);
                                 bean.setDenyList(denyList);
                                 try {
                                     method.invoke(object, bean);
@@ -94,20 +116,21 @@ public void PermissionDenied(int requestCode, List<String> denyList) {
                     public void PermissionCanceled(int requestCode) {
                         Class<?> cls = object.getClass();
                         Method[] methods = cls.getDeclaredMethods();
-                        if (methods == null || methods.length == 0) return;
+                        if (methods.length == 0) return;
                         for (Method method : methods) {
                             //过滤不含自定义注解PermissionCanceled的方法
                             boolean isHasAnnotation = method.isAnnotationPresent(PermissionCanceled.class);
                             if (isHasAnnotation) {
                                 method.setAccessible(true);
                                 //获取方法类型
                                 Class<?>[] types = method.getParameterTypes();
-                                if (types == null || types.length != 1) return;
+                                if (types.length != 1) return;
                                 //获取方法上的注解
                                 PermissionCanceled aInfo = method.getAnnotation(PermissionCanceled.class);
                                 if (aInfo == null) return;
                                 //解析注解上对应的信息
                                 CancelBean bean = new CancelBean();
+                                bean.setContext(context);
                                 bean.setRequestCode(requestCode);
                                 try {
                                     method.invoke(object, bean);
diff --git a/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/bean/CancelBean.java b/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/bean/CancelBean.java
@@ -1,12 +1,23 @@
 package com.ninetripods.aopermission.permissionlib.bean;
 
+import android.content.Context;
+
 /**
  * Created by mq on 2018/3/28 下午8:36
  * mqcoder90@gmail.com
  */
 
 public class CancelBean {
     private int requestCode;
+    private Context context;
+
+    public Context getContext() {
+        return context;
+    }
+
+    public void setContext(Context context) {
+        this.context = context;
+    }
 
     public int getRequestCode() {
         return requestCode;
diff --git a/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/bean/DenyBean.java b/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/bean/DenyBean.java
@@ -1,5 +1,7 @@
 package com.ninetripods.aopermission.permissionlib.bean;
 
+import android.content.Context;
+
 import java.util.List;
 
 /**
@@ -11,6 +13,15 @@ public class DenyBean {
 
     private int requestCode;
     private List<String> denyList;
+    private Context context;
+
+    public Context getContext() {
+        return context;
+    }
+
+    public void setContext(Context context) {
+        this.context = context;
+    }
 
     public int getRequestCode() {
         return requestCode;
diff --git a/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/util/Utils.java b/permissionlib/src/main/java/com/ninetripods/aopermission/permissionlib/util/Utils.java
