diff --git a/README.md b/README.md index 3dfe26fc1398d16f85c57a9b9dfec4af965ec583..88a4be0c89e4e78e0381b30096231e7895465560 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ permissionEnumArrayList.add(PermissionEnum.READ_CALENDAR); 如果你只需要检查权限，只需 ``` PermissionEnum permissionEnum = PermissionEnum.WRITE_EXTERNAL_STORAGE; -boolean granted = PermissionUtils.isGranted(MainActivity.this, PermissionEnum.WRITE_EXTERNAL_STORAGE); +boolean granted = PermissionUtils.isGranted(MainAbility.this, PermissionEnum.WRITE_EXTERNAL_STORAGE); new ToastDialog(getContext()).setText("permissionEnum.toString() + " isGranted [" + granted + "]").setAlignment(LayoutAlignment.CENTER).show(); ``` diff --git a/entry/src/main/config.json b/entry/src/main/config.json index b863bdd4a4a329c26c3a79c25a65f8a3b3980eca..84987b3fa26a658ca5ad0e66f10f7b81a2e223a4 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -62,7 +62,7 @@ ] }, "orientation": "unspecified", - "name": "rebus.permissionutils.sample.FragmentActivity", + "name": "rebus.permissionutils.sample.FragmentAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -77,7 +77,7 @@ "usedScene": { "ability": [ "rebus.permissionutils.sample.MainAbility", - "rebus.permissionutils.sample.FragmentActivity" + "rebus.permissionutils.sample.FragmentAbility" ], "when": "inuse" } @@ -88,7 +88,7 @@ "usedScene": { "ability": [ "rebus.permissionutils.sample.MainAbility", - "rebus.permissionutils.sample.FragmentActivity" + "rebus.permissionutils.sample.FragmentAbility" ], "when": "inuse" } @@ -99,7 +99,7 @@ "usedScene": { "ability": [ "rebus.permissionutils.sample.MainAbility", - "rebus.permissionutils.sample.FragmentActivity" + "rebus.permissionutils.sample.FragmentAbility" ], "when": "inuse" } diff --git a/entry/src/main/java/rebus/permissionutils/sample/FragmentActivity.java b/entry/src/main/java/rebus/permissionutils/sample/FragmentAbility.java similarity index 96% rename from entry/src/main/java/rebus/permissionutils/sample/FragmentActivity.java rename to entry/src/main/java/rebus/permissionutils/sample/FragmentAbility.java index 320c41bc433395cb07916dc197bf2f6498a22b27..6f62550fb4f5f02be3b5594eb3c8edc37e8bda14 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/FragmentActivity.java +++ b/entry/src/main/java/rebus/permissionutils/sample/FragmentAbility.java @@ -25,7 +25,7 @@ import rebus.permissionutils.sample.slice.FragmentAbilitySlice; * * @since 2021-04-07 */ -public class FragmentActivity extends FractionAbility { +public class FragmentAbility extends FractionAbility { private RequestPermission requestPermission; @Override diff --git a/entry/src/main/java/rebus/permissionutils/sample/LogUtils.java b/entry/src/main/java/rebus/permissionutils/sample/LogUtils.java index a2224f14185fd1ff82f167ef4a8e57633d7d73c0..f892082cceb875ac9f27fefd097bcf677f4a657a 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/LogUtils.java +++ b/entry/src/main/java/rebus/permissionutils/sample/LogUtils.java @@ -98,9 +98,9 @@ public class LogUtils { */ public static final String TAG = "wjtt"; /** - * ACTIVITY_MOTION + * ABILITY_MOTION */ - public static final String ACTIVITY_MOTION = "ohos.permission.ACTIVITY_MOTION"; + public static final String ABILITY_MOTION = "ohos.permission.ABILITY_MOTION"; /** * GYROSCOPE */ diff --git a/entry/src/main/java/rebus/permissionutils/sample/MainFraction.java b/entry/src/main/java/rebus/permissionutils/sample/MainFraction.java index 607081ddc17f303c5e2fcbe4a323be725c74d4eb..ab7aaed9d68efa5e0cf09b2068ecff954d26d2b8 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/MainFraction.java +++ b/entry/src/main/java/rebus/permissionutils/sample/MainFraction.java @@ -103,7 +103,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, fragmentAskThreePermissionSmart.setClickedListener(this); fragmentCheckPermission.setClickedListener(this); - FragmentActivity fractionAbility = (FragmentActivity) getFractionAbility(); + FragmentAbility fractionAbility = (FragmentAbility) getFractionAbility(); fractionAbility.setRequestPermission(new RequestPermission() { @Override public void result(int requestCode, String[] permissions, int[] grantResults) { diff --git a/entry/src/main/java/rebus/permissionutils/sample/slice/MainAbilitySlice.java b/entry/src/main/java/rebus/permissionutils/sample/slice/MainAbilitySlice.java index c7da7bd85d02335a43b600e2187e88f51319de29..43985ace375fab394362e604a605c79ad8cb6679 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/slice/MainAbilitySlice.java +++ b/entry/src/main/java/rebus/permissionutils/sample/slice/MainAbilitySlice.java @@ -143,7 +143,7 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL Operation operationCommonComponts = new Intent.OperationBuilder() .withDeviceId("") .withBundleName("rebus.permissionutils.sample") - .withAbilityName("rebus.permissionutils.sample.FragmentActivity") + .withAbilityName("rebus.permissionutils.sample.FragmentAbility") .build(); intent.setOperation(operationCommonComponts); getAbility().startAbility(intent); diff --git a/library/src/main/java/rebus/permissionutils/PermissionManager.java b/library/src/main/java/rebus/permissionutils/PermissionManager.java index 3fdd58dfd6ce85e270f32fcd91b4d58de5c4b570..8ec78738d160b02fce2dcd164397c7f8a5c8a200 100644 --- a/library/src/main/java/rebus/permissionutils/PermissionManager.java +++ b/library/src/main/java/rebus/permissionutils/PermissionManager.java @@ -82,13 +82,13 @@ public class PermissionManager { /** * 请求权限并返回结果 * - * @param activity target activity + * @param ability target ability * @param requestCode requestCode * @param permissions permissions * @param grantResults grantResults */ - public static void handleResult(Ability activity, int requestCode, String[] permissions, int[] grantResults) { - handleResult(activity, null, requestCode, permissions, grantResults); + public static void handleResult(Ability ability, int requestCode, String[] permissions, int[] grantResults) { + handleResult(ability, null, requestCode, permissions, grantResults); } /** @@ -106,13 +106,13 @@ public class PermissionManager { /** * 请求权限并返回结果 * - * @param activity + * @param ability * @param fragmentX * @param requestCode * @param permissions * @param grantResults */ - private static void handleResult(final Ability activity, + private static void handleResult(final Ability ability, final Fraction fragmentX, int requestCode, String[] permissions, int[] grantResults) { if (instance == null) { @@ -124,8 +124,8 @@ public class PermissionManager { instance.permissionsGranted.add(PermissionEnum.fromManifestPermission(permissions[i])); } else { boolean permissionsDeniedForever = false; - if (activity != null) { - permissionsDeniedForever = activity.canRequestPermission(permissions[i]); + if (ability != null) { + permissionsDeniedForever = ability.canRequestPermission(permissions[i]); } else if (fragmentX != null) { permissionsDeniedForever = fragmentX.getFractionAbility().canRequestPermission(permissions[i]); } @@ -144,14 +144,14 @@ public class PermissionManager { @Override public void result(boolean askAgain) { if (askAgain) { - instance.ask(activity, fragmentX); + instance.ask(ability, fragmentX); } else { instance.showResult(); } } }); } else { - instance.ask(activity, fragmentX); + instance.ask(ability, fragmentX); } } else { instance.showResult(); @@ -270,11 +270,11 @@ public class PermissionManager { /** * 请求事件 * - * @param activity target activity + * @param ability target ability * 只需启动所有权限管理器 */ - public void ask(Ability activity) { - ask(activity, null); + public void ask(Ability ability) { + ask(ability, null); } /** @@ -290,17 +290,17 @@ public class PermissionManager { /** * 开始请求权限 * - * @param activity + * @param ability * @param fragmentX */ - private void ask(Ability activity, Fraction fragmentX) { + private void ask(Ability ability, Fraction fragmentX) { initArray(); - String[] permissionToAsk = permissionToAsk(activity, fragmentX); + String[] permissionToAsk = permissionToAsk(ability, fragmentX); if (permissionToAsk.length == 0) { showResult(); } else { - if (activity != null) { - activity.requestPermissionsFromUser(permissionToAsk, key); + if (ability != null) { + ability.requestPermissionsFromUser(permissionToAsk, key); } else if (fragmentX != null) { fragmentX.getFractionAbility().requestPermissionsFromUser(permissionToAsk, key); } @@ -310,16 +310,16 @@ public class PermissionManager { /** * 得到请求的权限 * - * @param activity Ability + * @param ability Ability * @param fragmentX Fraction * @return 需要请求的权限 String[] */ - private String[] permissionToAsk(Ability activity, Fraction fragmentX) { + private String[] permissionToAsk(Ability ability, Fraction fragmentX) { ArrayList permissionToAsk = new ArrayList<>(); for (PermissionEnum permission : permissions) { boolean isGranted = false; - if (activity != null) { - isGranted = PermissionUtils.isGranted(activity, permission); + if (ability != null) { + isGranted = PermissionUtils.isGranted(ability, permission); } else if (fragmentX != null) { isGranted = PermissionUtils.isGranted(fragmentX.getFractionAbility(), permission); }