优化字段命名

Author: HJQ

library/build.gradle

@@ -4,24 +4,24 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 23
     buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 11
-        targetSdkVersion 25
-        versionCode 3
-        versionName "1.2"
+        targetSdkVersion 23
+        versionCode 5
+        versionName "1.3"
     }
 }
 
 def siteUrl = 'https://github.com/getActivity/XXPermissions' //项目在github中的地址
 def gitUrl = siteUrl + ".git" //项目在github中的地址
 
-//compile 'com.hjq:xxpermissions:1.2'
+//compile 'com.hjq:xxpermissions:1.3'
 def groupId = 'com.hjq' //定义的maven group id最终引用形式
 def artifactId = 'xxpermissions'//maven的artifact id，不要带大写，可以用“-”代替
-def versionName = '1.2'//maven 上发布版本号
+def versionName = '1.3'//maven 上发布版本号
 
 def repositoryName = 'maven' //自己创建的仓库名，直接在bintray账号下创建的
 def repositoryDesc = 'Android 6.0 permissions adaptation framework' //仓库描述，自己定义

library/src/main/java/com/hjq/permissions/PermissionFragment.java

@@ -11,13 +11,13 @@
  */
 public final class PermissionFragment extends Fragment {
 
-    private static final String PERMISSIONS = "permissions";
+    private static final String PERMISSION_GROUP = "permission_group";
     private static final String REQUEST_CODE ="request_code";
 
     public static PermissionFragment newInstant(ArrayList<String> permissions, int requestCode) {
         PermissionFragment fragment = new PermissionFragment();
         Bundle bundle = new Bundle();
-        bundle.putStringArrayList(PERMISSIONS, permissions);
+        bundle.putStringArrayList(PERMISSION_GROUP, permissions);
         bundle.putInt(REQUEST_CODE, requestCode);
         fragment.setArguments(bundle);
         return fragment;
@@ -27,7 +27,7 @@ public static PermissionFragment newInstant(ArrayList<String> permissions, int r
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (PermissionUtils.isOverMarshmallow()) {
-            ArrayList<String> permissions = getArguments().getStringArrayList(PERMISSIONS);
+            ArrayList<String> permissions = getArguments().getStringArrayList(PERMISSION_GROUP);
             requestPermissions(permissions.toArray(new String[permissions.size() - 1]), getArguments().getInt(REQUEST_CODE));
         }
     }

library/src/main/java/com/hjq/permissions/XXPermissions.java

@@ -13,9 +13,8 @@
  */
 public final class XXPermissions {
 
-    private final static SparseArray<OnPermission> mContainer = new SparseArray<>();
-
-    private static long requestTime;
+    private final static SparseArray<OnPermission> sContainer = new SparseArray<>();
+    private static long sRequestTime;
 
     private Activity mActivity;
     private String[] mPermissions;
@@ -72,7 +71,7 @@ public void request(OnPermission call) {
         do {
             //requestCode = new Random().nextInt(65535);//Studio编译的APK请求码必须小于65536
             requestCode = new Random().nextInt(255);//Eclipse编译的APK请求码必须小于256
-        } while (mContainer.get(requestCode) != null);
+        } while (sContainer.get(requestCode) != null);
 
         ArrayList<String> failPermissions = PermissionUtils.getFailPermissions(mActivity, mPermissions);
 
@@ -81,9 +80,9 @@ public void request(OnPermission call) {
             call.hasPermission(Arrays.asList(mPermissions));
         } else {
             //将当前的请求码和对象添加到集合中
-            mContainer.put(requestCode, call);
+            sContainer.put(requestCode, call);
             //记录本次申请时间
-            requestTime = System.currentTimeMillis();
+            sRequestTime = System.currentTimeMillis();
             //检测权限有没有在清单文件中注册
             PermissionUtils.checkPermissions(mActivity, mPermissions);
             //申请没有授予过的权限
@@ -107,7 +106,7 @@ public static boolean isHasPermission(Context context, String... permissions) {
      * @param context           上下文对象
      */
     public static void gotoPermissionSettings(Context context) {
-        gotoPermissionSettings(context, false);
+        PermissionUtils.gotoPermissionSettings(context, false);
     }
 
     /**
@@ -125,27 +124,29 @@ public static void gotoPermissionSettings(Context context, boolean newTask) {
      */
     static void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
 
-        OnPermission call = mContainer.get(requestCode);
+        OnPermission call = sContainer.get(requestCode);
 
         //根据请求码取出的对象为空，就直接返回不处理
         if (call == null) return;
 
+        //获取授予权限
         List<String> succeedPermissions = PermissionUtils.getSucceedPermissions(permissions, grantResults);
-        List<String> failPermissions = PermissionUtils.getFailPermissions(permissions, grantResults);
         //如果请求成功的权限集合大小和请求的数组一样大时证明权限已经全部授予
         if (succeedPermissions.size() == permissions.length) {
             //代表申请的所有的权限都授予了
             call.hasPermission(succeedPermissions);
         }else {
+            //获取拒绝权限
+            List<String> failPermissions = PermissionUtils.getFailPermissions(permissions, grantResults);
             //代表申请的权限中有不同意授予的，如果拒绝的时间过快证明是系统自动拒绝
-            call.noPermission(failPermissions, System.currentTimeMillis() - requestTime < 200);
+            call.noPermission(failPermissions, System.currentTimeMillis() - sRequestTime < 200);
             //证明还有一部分权限被成功授予，回调成功接口
             if (!succeedPermissions.isEmpty()) {
                 call.hasPermission(succeedPermissions);
             }
         }
 
         //权限回调结束后要删除集合中的对象，避免重复请求
-        mContainer.remove(requestCode);
+        sContainer.remove(requestCode);
     }
 }