更新

jaychou2012 · Dec 29, 2019 · d4dbb21 · d4dbb21
1 parent 459cef4
commit d4dbb21
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/policylib-release.aar b/policylib-release.aar
diff --git a/policylib/src/main/java/com/db/policylib/PermissionPolicy.java b/policylib/src/main/java/com/db/policylib/PermissionPolicy.java
@@ -4,7 +4,7 @@
 
 public class PermissionPolicy implements Serializable {
     private int id;
-    private String permission;
+    private String[] permission;
     private int icon;
     private String title;
     private String des;
@@ -26,11 +26,11 @@ public void setId(int id) {
         this.id = id;
     }
 
-    public String getPermission() {
+    public String[] getPermission() {
         return permission;
     }
 
-    public void setPermission(String permission) {
+    public void setPermission(String... permission) {
         this.permission = permission;
     }
 
@@ -57,4 +57,13 @@ public String getDes() {
     public void setDes(String des) {
         this.des = des;
     }
+
+    private String[] getStringsOneDimensional(String... strings) {
+        String[] string;
+        string = new String[strings.length];
+        for (int i = 0; i < strings.length; i++) {
+            string[i] = strings[i];
+        }
+        return string;
+    }
 }
diff --git a/policylib/src/main/java/com/db/policylib/Policy.java b/policylib/src/main/java/com/db/policylib/Policy.java
@@ -29,6 +29,7 @@
 import java.util.List;
 
 import pub.devrel.easypermissions.AppSettingsDialog;
+import pub.devrel.easypermissions.EasyPermissions;
 
 public class Policy {
 
@@ -68,7 +69,7 @@ public void showPermissionDesDialog(Context context, int requestCode, List<Permi
         }
         List<PermissionPolicy> listRequest = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
-            if (!hasPermission(context, list.get(i).getPermission())) {
+            if (!EasyPermissions.hasPermissions(context, list.get(i).getPermission())) {
                 listRequest.add(list.get(i));
             }
         }
@@ -206,7 +207,7 @@ public void showPermissionDesSuitDialog(final Context context, final List<Permis
         }
         List<PermissionPolicy> listRequest = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
-            if (!hasPermission(context, list.get(i).getPermission())) {
+            if (!EasyPermissions.hasPermissions(context, list.get(i).getPermission())) {
                 listRequest.add(list.get(i));
             }
         }
@@ -218,7 +219,9 @@ public void showPermissionDesSuitDialog(final Context context, final List<Permis
         }
         final ArrayList<String> stringLists = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
-            stringLists.add(list.get(i).getPermission());
+            for (int j = 0; j < list.get(i).getPermission().length; j++) {
+                stringLists.add(list.get(i).getPermission()[j]);
+            }
         }
         if (!before) {
             PermissionSuit.with((Activity) context).setPermissions(stringLists).excute(new PermissionListener(context, list, requestTipsPermission));
@@ -270,7 +273,7 @@ public void getAllPermission(ArrayList<String> permission) {
 
         @Override
         public void noPermision(ArrayList<String> permission) {
-            getRequestPermission(permission, list, new Policy.RequestPermission() {
+            getRequestPermission(permission, list, new RequestPermission() {
                 @Override
                 public void request(boolean showRequest) {
                     if (showRequest) {

diff --git a/policylib/src/main/java/pub/devrel/easypermissions/EasyPermissions.java b/policylib/src/main/java/pub/devrel/easypermissions/EasyPermissions.java
@@ -116,7 +116,7 @@ public static void requestPermissions(
         context = (Context) host;
         for (int i = 0; i < list.size(); i++) {
             PermissionPolicy policy = list.get(i);
-            if (Policy.getInstance().hasPermission(host, policy.getPermission())) {
+            if (EasyPermissions.hasPermissions(host, policy.getPermission())) {
                 list.remove(i);
                 perms[i].replace(perms[i], "");
             }