diff --git a/entry/src/main/java/rebus/permissionutils/sample/InfoDialog.java b/entry/src/main/java/rebus/permissionutils/sample/InfoDialog.java index 44320f3105dc850ac51e1bf200eb7e91ab0b5f2e..15b4623edb3446883f2775f4b8ea7576f950da87 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/InfoDialog.java +++ b/entry/src/main/java/rebus/permissionutils/sample/InfoDialog.java @@ -33,11 +33,10 @@ import ohos.utils.net.Uri; * @since 2021-04-22 */ public class InfoDialog extends CommonDialog { + private static final int NUM_10 = 10; + private static final int NUM_9 = 9; + private static final int NUM_3 = 3; private Ability context; - private String message = ""; - private final int num10 = 10; - private final int num9 = 9; - private final int num3 = 3; /** * 向外暴露的构造 @@ -48,7 +47,6 @@ public class InfoDialog extends CommonDialog { public InfoDialog(Ability context, String info) { super(context); this.context = context; - this.message = info; initViewDialog(); } @@ -66,11 +64,10 @@ public class InfoDialog extends CommonDialog { Display display = DisplayManager.getInstance().getDefaultDisplay(context).get(); int width = display.getAttributes().width; int height = display.getAttributes().height; - int dialogWidth = (int) ((width / num10) * num9); - int titleHeight = height / num10; - int dialogHeight = titleHeight * num3; + int dialogWidth = (int) ((width / NUM_10) * NUM_9); + int titleHeight = height / NUM_10; + int dialogHeight = titleHeight * NUM_3; InfoDialog.this.setSize(dialogWidth, dialogHeight); - final Text title = (Text) component.findComponentById(ResourceTable.Id_title); final Text close = (Text) component.findComponentById(ResourceTable.Id_close); final Text github = (Text) component.findComponentById(ResourceTable.Id_github); final Text twitter = (Text) component.findComponentById(ResourceTable.Id_twitter); diff --git a/entry/src/main/java/rebus/permissionutils/sample/ListDialog.java b/entry/src/main/java/rebus/permissionutils/sample/ListDialog.java index 7678693a63fe2d2124ed0653543f06e788c5e53b..412ae655ec4b825d066ef919a93ed7faeb09a790 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/ListDialog.java +++ b/entry/src/main/java/rebus/permissionutils/sample/ListDialog.java @@ -33,15 +33,15 @@ import java.util.List; * @since 2021-04-08 */ public class ListDialog { + private static final int TEN = 10; + private static final int NUM_50 = 50; + private static final int NUM_6 = 6; + private static final int NUM_12 = 12; + private static final int NUM_9 = 9; + private static final int NUM_86 = 86; private List items; private CommonDialog mCommonDialog = null; private Ability context; - private final int ten = 10; - private final int num50 = 50; - private final int num6 = 6; - private final int num12 = 12; - private final int num9 = 9; - private final int num86 = 86; /** * 构造 @@ -78,21 +78,19 @@ public class ListDialog { private void initComponent(Component component1, CommonDialog dialog) { Display display = DisplayManager.getInstance().getDefaultDisplay(context).get(); int width = display.getAttributes().width; - int height = display.getAttributes().height; ListContainer listContainer = (ListContainer) component1.findComponentById(ResourceTable.Id_list_dialog); - int simleHeight = AttrHelper.vp2px(num50,context); - int maxwidth = (width / ten) * num9; - int maxheight = simleHeight * num6; - if (items.size() < num12) { + int simleHeight = AttrHelper.vp2px(NUM_50,context); + int maxwidth = (width / TEN) * NUM_9; + int maxheight = simleHeight * NUM_6; + if (items.size() < NUM_12) { int size = items.size(); int heightt = simleHeight * size; - mCommonDialog.setSize(maxwidth,heightt + num86); + mCommonDialog.setSize(maxwidth,heightt + NUM_86); } else { - mCommonDialog.setSize(maxwidth, maxheight + ten + num86); + mCommonDialog.setSize(maxwidth, maxheight + TEN + NUM_86); } ListProvider listProvider = new ListProvider(context, items); listContainer.setItemProvider(listProvider); - int width2 = listContainer.getWidth(); mCommonDialog.setContentCustomComponent(component1); mCommonDialog.siteRemovable(true); mCommonDialog.setAutoClosable(true); diff --git a/entry/src/main/java/rebus/permissionutils/sample/MainAbility.java b/entry/src/main/java/rebus/permissionutils/sample/MainAbility.java index 344318bfd20aeb996872f1b1bea04f39dc6a5b9e..db0aaa0b5731e15f087d810b8a818ef1b2ae7bb2 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/MainAbility.java +++ b/entry/src/main/java/rebus/permissionutils/sample/MainAbility.java @@ -18,7 +18,6 @@ package rebus.permissionutils.sample; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; -import ohos.agp.window.service.WindowManager; import rebus.permissionutils.PermissionManager; import rebus.permissionutils.sample.slice.MainAbilitySlice; diff --git a/entry/src/main/java/rebus/permissionutils/sample/MainFraction.java b/entry/src/main/java/rebus/permissionutils/sample/MainFraction.java index a71386dfbfc0b85c1c7781dda6a1b669c426eba9..e1f6a941c0d2d958f2895a71f688e4b3f4e2388f 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/MainFraction.java +++ b/entry/src/main/java/rebus/permissionutils/sample/MainFraction.java @@ -45,6 +45,19 @@ import java.util.List; * @since 2021-04-07 */ public class MainFraction extends Fraction implements Component.ClickedListener, FullCallback { + private static final int NUM_9001 = 9001; + private static final int NUM_801 = 801; + private static final int NUM_701 = 701; + private static final int NUM_601 = 601; + private static final int NUM_2101 = 2101; + private static final int NUM_2001 = 2001; + private static final int NUM_2 = 2; + private static final int NUM_3 = 3; + private static final int NUM_10 = 10; + private static final int NUM_8 = 8; + private static final String GRANTED = "allPermissionsGranted ["; + private static final int NUM_200 = 200; + private static final String kh = "]"; private SuperButton fragmentAskOnePermission; private SuperButton fragmentAskThreePermission; private SuperButton askOnePermissionSimple; @@ -53,20 +66,6 @@ public class MainFraction extends Fraction implements Component.ClickedListener, private SuperButton fragmentAskThreePermissionSmart; private SuperButton fragmentCheckPermission; - private final int num9001 = 9001; - private final int num801 = 801; - private final int num701 = 701; - private final int num601 = 601; - private final int num2101 = 2101; - private final int num2001 = 2001; - private final int num2 = 2; - private final int num3 = 3; - private final int num10 = 10; - private final int num8 = 8; - private final String allp = "allPermissionsGranted ["; - private final int num200 = 200; - private final String kh = "]"; - @Override protected void onStart(Intent intent) { super.onStart(intent); @@ -162,7 +161,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, private void fragmentAskThreePermissionSmart2() { PermissionManager.Builder() - .key(num2101) + .key(NUM_2101) .permission(PermissionEnum.WRITE_EXTERNAL_STORAGE, PermissionEnum.ACCESS_FINE_LOCATION, PermissionEnum.READ_CALENDAR) .askAgain(true) @@ -178,7 +177,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, showToast(PermissionEnum.WRITE_EXTERNAL_STORAGE.toString() + ", " + PermissionEnum.ACCESS_FINE_LOCATION.toString() + ", " + PermissionEnum.READ_CALENDAR.toString() - + allp + isAllPermissionsGranted + "] somePermissionsDeniedForever [" + + GRANTED + isAllPermissionsGranted + "] somePermissionsDeniedForever [" + isSomePermissionsDeniedForever + kh, getFractionAbility()); } }) @@ -187,7 +186,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, private void fragmentAskOnePermissionSmart2() { PermissionManager.Builder() - .key(num2001) + .key(NUM_2001) .permission(PermissionEnum.WRITE_EXTERNAL_STORAGE) .askAgain(true) .askAgainCallback(new AskAgainCallback() { @@ -199,7 +198,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, .callback(new SmartCallback() { @Override public void result(boolean isAllPermissionsGranted, boolean isSomePermissionsDeniedForever) { - showToast(PermissionEnum.WRITE_EXTERNAL_STORAGE.toString() + allp + showToast(PermissionEnum.WRITE_EXTERNAL_STORAGE.toString() + GRANTED + isAllPermissionsGranted + "] somePermissionsDeniedForever [" + isSomePermissionsDeniedForever + kh, getFractionAbility()); } @@ -209,7 +208,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, private void fragmentAskThreePermissionSimple() { PermissionManager.Builder() - .key(num601) + .key(NUM_601) .permission(PermissionEnum.WRITE_EXTERNAL_STORAGE, PermissionEnum.ACCESS_FINE_LOCATION, PermissionEnum.READ_CALENDAR) .askAgain(true) @@ -224,7 +223,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, public void result(boolean isAllPermissionsGranted) { showToast(PermissionEnum.WRITE_EXTERNAL_STORAGE.toString() + ", " + PermissionEnum.ACCESS_FINE_LOCATION.toString() + ", " - + PermissionEnum.READ_CALENDAR.toString() + allp + + PermissionEnum.READ_CALENDAR.toString() + GRANTED + isAllPermissionsGranted + kh, getFractionAbility()); } }) @@ -233,7 +232,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, private void fragmentAskOnePermissionSimple() { PermissionManager.Builder() - .key(num701) + .key(NUM_701) .permission(PermissionEnum.WRITE_EXTERNAL_STORAGE) .askAgain(true) .askAgainCallback(new AskAgainCallback() { @@ -246,7 +245,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, @Override public void result(boolean isAllPermissionsGranted) { showToast(PermissionEnum.WRITE_EXTERNAL_STORAGE.toString() - + allp + isAllPermissionsGranted + kh, getFractionAbility()); + + GRANTED + isAllPermissionsGranted + kh, getFractionAbility()); } }) .ask(MainFraction.this); @@ -254,7 +253,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, private void fragmentAskThreePermission2() { PermissionManager.Builder() - .key(num801) + .key(NUM_801) .permission(PermissionEnum.WRITE_EXTERNAL_STORAGE, PermissionEnum.ACCESS_FINE_LOCATION, PermissionEnum.READ_CALENDAR) .askAgain(true) @@ -270,7 +269,7 @@ public class MainFraction extends Fraction implements Component.ClickedListener, private void askOnePermission2() { PermissionManager.Builder() - .key(num9001) + .key(NUM_9001) .permission(PermissionEnum.WRITE_EXTERNAL_STORAGE) .askAgain(true) .askAgainCallback(new AskAgainCallback() { @@ -292,8 +291,8 @@ public class MainFraction extends Fraction implements Component.ClickedListener, Display display = DisplayManager.getInstance().getDefaultDisplay(getFractionAbility()).get(); int width = display.getAttributes().width; int height = display.getAttributes().height; - float height2 = (float) ((height / num10) * num3); - commonDialog.setSize(width / num10 * num8, (int) height2); + float height2 = (float) ((height / NUM_10) * NUM_3); + commonDialog.setSize(width / NUM_10 * NUM_8, (int) height2); commonDialog.setMovable(false); commonDialog.show(); } @@ -338,9 +337,9 @@ public class MainFraction extends Fraction implements Component.ClickedListener, int width = display.getAttributes().width; new ToastDialog(ability) .setComponent(layout) - .setSize(width / num10 * num8, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setSize(width / NUM_10 * NUM_8, DirectionalLayout.LayoutConfig.MATCH_CONTENT) .setAlignment(LayoutAlignment.CENTER) - .setOffset(0, height / num2 - num200) + .setOffset(0, height / NUM_2 - NUM_200) .show(); } diff --git a/entry/src/main/java/rebus/permissionutils/sample/SuperButton.java b/entry/src/main/java/rebus/permissionutils/sample/SuperButton.java index a93d5e2f3a7c6c1018f2e43c81b961faaf35f5fd..f1adb461a4f64d7296370e0e02ed16751ea4b749 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/SuperButton.java +++ b/entry/src/main/java/rebus/permissionutils/sample/SuperButton.java @@ -26,8 +26,6 @@ import ohos.agp.components.element.StateElement; import ohos.agp.render.Canvas; import ohos.agp.utils.Color; import ohos.app.Context; -import ohos.eventhandler.EventHandler; -import ohos.eventhandler.EventRunner; import ohos.multimodalinput.event.TouchEvent; /** @@ -37,10 +35,10 @@ import ohos.multimodalinput.event.TouchEvent; */ public class SuperButton extends Button implements Component.DrawTask, Component.TouchEventListener, Component.ComponentStateChangedListener { - private final int num255 = 255; - private final int down = 18432; - private final int up = 2048; - private final float numldq = 0.7F; + private static final int NUM_255 = 255; + private static final int DOWN = 18432; + private static final int UP = 2048; + private static final float NUMLDQ = 0.7F; private float mPhase; private float[] mDashPath; @@ -56,8 +54,6 @@ public class SuperButton extends Button implements Component.DrawTask, private StateElement mBackground; - private EventHandler mHandle = new EventHandler(EventRunner.getMainEventRunner()); - private int shape = ShapeElement.RECTANGLE; private ShapeElement.Orientation gorientation5; @@ -166,7 +162,7 @@ public class SuperButton extends Button implements Component.DrawTask, if (normalColor != null) { mStateEmptyElement.setRgbColor(normalColor); } else { - normalColor = new RgbColor(num255, num255, num255, num255); + normalColor = new RgbColor(NUM_255, NUM_255, NUM_255, NUM_255); mStateEmptyElement.setRgbColor(normalColor); } if (strokeWidth != 0 && strokeColor != null) { @@ -285,7 +281,7 @@ public class SuperButton extends Button implements Component.DrawTask, * @return button */ public SuperButton setShapeCornersRadius(float[] radius) { - this.cornersRadius2 = radius; + this.cornersRadius2 = radius.clone(); invalidate(); return this; } @@ -309,7 +305,7 @@ public class SuperButton extends Button implements Component.DrawTask, * @return button */ public SuperButton setShapeGradientColor(RgbColor[] gradientColors2) { - this.gradientColors = gradientColors2; + this.gradientColors = gradientColors2.clone(); invalidate(); return this; } @@ -334,7 +330,7 @@ public class SuperButton extends Button implements Component.DrawTask, * @return button */ public SuperButton setShapeDashPathEffectValues(float[] dashPath, float phase) { - this.mDashPath = dashPath; + this.mDashPath = dashPath.clone(); this.mPhase = phase; invalidate(); return this; @@ -370,12 +366,12 @@ public class SuperButton extends Button implements Component.DrawTask, @Override public void onComponentStateChanged(Component component, int state) { switch (state) { - case down: + case DOWN: if (selectColor == null) { - this.setAlpha(numldq); + this.setAlpha(NUMLDQ); } break; - case up: + case UP: default: setAlpha(1); } diff --git a/entry/src/main/java/rebus/permissionutils/sample/slice/FragmentAbilitySlice.java b/entry/src/main/java/rebus/permissionutils/sample/slice/FragmentAbilitySlice.java index 9e0bcad44aa19d6ba165fd59606eff40225f51b6..8455feafccdfa53b5dd3a1db2f66c1360cbc3ac4 100644 --- a/entry/src/main/java/rebus/permissionutils/sample/slice/FragmentAbilitySlice.java +++ b/entry/src/main/java/rebus/permissionutils/sample/slice/FragmentAbilitySlice.java @@ -33,7 +33,6 @@ public class FragmentAbilitySlice extends AbilitySlice { protected void onStart(Intent intent) { super.onStart(intent); setUIContent(ResourceTable.Layout_ability_fragment_container); - boolean isFragmentX = intent.getBooleanParam("IS_FRAGMENT_X",false); initView(); }