1 优化基类权限申请逻辑

YangShuai
1 parent a1ebbd54
Showing 1 changed file with 18 additions and 12 deletions
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
@@ -892,6 +892,8 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onSuccess(permissions);
                 }
+                //重置显示值
+                resetPermissionConfig();
             } else {
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onFail();
@@ -899,12 +901,11 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                 if (isShowRefuseDialog) {
                     showTipsDialog();
                 } else {
-                    //重置显示值
-                    isShowRefuseDialog = true;
                     if (isDefinePermissionCloseActivity) {
                         finish();
-                        isDefinePermissionCloseActivity = false;
                     }
+                    //重置显示值
+                    resetPermissionConfig();
                 }
             }
         }
@@ -914,6 +915,8 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onSuccess(permissions);
                 }
+                //重置显示值
+                resetPermissionConfig();
             } else {
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onFail();
@@ -921,19 +924,25 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                 if (isShowRefuseDialog) {
                     showTipsDialog();
                 } else {
-                    //重置显示值
-                    isShowRefuseDialog = true;
                     if (isDefinePermissionCloseActivity) {
                         finish();
-                        isDefinePermissionCloseActivity = false;
                     }
+                    //重置显示值
+                    resetPermissionConfig();
                 }
             }
-            //重置用户提示语
-            userSetDefinePermissionTip = "";
+
         }
     }
+    private void resetPermissionConfig() {
+        isShowRefuseDialog = true;//默认显示权限拒绝提示框
+        isUserClickAllowBtn = false;//默认用户没有点击允许按钮
+        USER_SET_REQUEST_CODE_PERMISSION = -0x00099;//默认用户没有自己设置权限请求码
+        userSetDefinePermissionTip = "";//默认没有设置提示语
+        isDefinePermissionCloseActivity = false;//默认不允许关闭当前窗口
+    }
+
     /**
      * 检测所有的权限是否都已授权
      *
@@ -999,13 +1008,10 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
                 .setNegativeButton("取消", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        isUserClickAllowBtn = false;
-                        isShowRefuseDialog = true;
                         if (isDefinePermissionCloseActivity) {
-                            isDefinePermissionCloseActivity = false;
                             finish();
                         }
-
+                        resetPermissionConfig();
                     }
                 })
                 .setPositiveButton("去设置", new DialogInterface.OnClickListener() {