Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

 app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java

@@ -48,7 +48,7 @@
     * @param activity -
     * @param strings  -
     */
    public static void askPermission(Activity activity, String[] strings) {
    public static void activityPermission(Activity activity, String[] strings) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            List<String> newList = new ArrayList<>();
            for (String permission : strings) {
@@ -79,7 +79,7 @@
     * 检查多个权限
     *
     * @param activity -
     * @param strings  -
     * @param strings  -权限的数据
     * @return -
     */
    public static String[] checkPermission(Activity activity, String[] strings) {
@@ -139,12 +139,15 @@
                    public void onGranted(List<String> permissions, boolean all) {
                        SharedPreUtils.putBoolean(permission, true);
                        if (permissionStateCallback != null) {
                            permissionStateCallback.Success(STATUS_REFUSE);
                            permissionStateCallback.Success(STATUS_SUCCESS);
                        }
                    }

                    @Override
                    public void onDenied(List<String> permissions, boolean never) {
                        if (permissionStateCallback != null) {
                            permissionStateCallback.Success(STATUS_REFUSE);
                        }
                        if (is_skip) {
                            SharedPreUtils.putBoolean(permission, true);
                        }
@@ -155,6 +158,9 @@
//                if (permissionStateCallback != null) {
//                    permissionStateCallback.Success(STATUS_REFUSE_PERMANENT);
//                }
                if (permissionStateCallback != null) {
                    permissionStateCallback.Success(STATUS_REFUSE_PERMANENT);
                }
                if (is_skip) {
                    HdlDialogLogic.getInstance().showSettingPermissionDialog(activity);
                }