Merge branch '1.5.2' into 1.5.1_google

wjc

2025-04-09 0b357bcd7c472c91227093239f180a28638c57a4

 app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java

@@ -34,6 +34,7 @@
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.widget.PermissionExplanationDialog;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.XXPermissions;

@@ -102,10 +103,12 @@
     */
    private void checkPermission_After(final Activity context, final int tag) {
        String permission = Manifest.permission.CAMERA;
        // 未授权 如果应用程序没有所需的权限，则显示解释说明
        PermissionExplanationDialog.getInstance().showPortConflictPdDialog(context, context.getString(R.string.camera_storage_instructions), context.getString(R.string.camera_storage_purpose));
        int status = PermissionUtils.getPermissionState(context, permission);

        switch (status) {
            case PermissionUtils.STATUS_SUCCESS:
                PermissionExplanationDialog.getInstance().dismiss();
                dismiss();
                if (0 == tag) {
                    take_photo();
@@ -120,6 +123,7 @@
                        .request(new OnPermissionCallback() {
                            @Override
                            public void onGranted(List<String> permissions, boolean all) {
                                PermissionExplanationDialog.getInstance().dismiss();
                                dismiss();
                                SharedPreUtils.putBoolean(permission, true);
                                if (0 == tag) {
@@ -131,12 +135,14 @@

                            @Override
                            public void onDenied(List<String> permissions, boolean never) {
                                PermissionExplanationDialog.getInstance().dismiss();
                                dismiss();
                                SharedPreUtils.putBoolean(permission, true);
                            }
                        });
                break;
            case PermissionUtils.STATUS_REFUSE_PERMANENT:
                PermissionExplanationDialog.getInstance().dismiss();
//                HdlThreadLogic.toast(mContext, R.string.permission_open);
                HdlDialogLogic.getInstance().showSettingPermissionDialog(mContext);
                break;
@@ -434,9 +440,13 @@
     * 从相册中获取图片
     */
    private void select_photo() {

        if (Build.VERSION.SDK_INT >= 33) {
            //默认成功
            openAlbum();
        } else {
        String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
        int status = PermissionUtils.getPermissionState(mContext, permission);

        switch (status) {
            case PermissionUtils.STATUS_SUCCESS:
                openAlbum();
@@ -464,6 +474,7 @@
                break;
        }
    }
    }

    /**
     * 打开相册的方法