From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java b/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java
index 7d19b72..cfcdf76 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java
@@ -440,34 +440,39 @@
* 浠庣浉鍐屼腑鑾峰彇鍥剧墖
*/
private void select_photo() {
- String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
- int status = PermissionUtils.getPermissionState(mContext, permission);
- switch (status) {
- case PermissionUtils.STATUS_SUCCESS:
- openAlbum();
- break;
- case PermissionUtils.STATUS_REFUSE:
- case PermissionUtils.STATUS_DEFAULT:
- XXPermissions.with(mContext)
- .permission(permission)
- .request(new OnPermissionCallback() {
- @Override
- public void onGranted(List<String> permissions, boolean all) {
- SharedPreUtils.putBoolean(permission, true);
- openAlbum();
- }
+ 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();
+ break;
+ case PermissionUtils.STATUS_REFUSE:
+ case PermissionUtils.STATUS_DEFAULT:
+ XXPermissions.with(mContext)
+ .permission(permission)
+ .request(new OnPermissionCallback() {
+ @Override
+ public void onGranted(List<String> permissions, boolean all) {
+ SharedPreUtils.putBoolean(permission, true);
+ openAlbum();
+ }
- @Override
- public void onDenied(List<String> permissions, boolean never) {
- SharedPreUtils.putBoolean(permission, true);
- }
- });
- break;
- case PermissionUtils.STATUS_REFUSE_PERMANENT:
+ @Override
+ public void onDenied(List<String> permissions, boolean never) {
+ SharedPreUtils.putBoolean(permission, true);
+ }
+ });
+ break;
+ case PermissionUtils.STATUS_REFUSE_PERMANENT:
// HdlThreadLogic.toast(mContext, R.string.permission_open);
- HdlDialogLogic.getInstance().showSettingPermissionDialog(mContext);
- break;
+ HdlDialogLogic.getInstance().showSettingPermissionDialog(mContext);
+ break;
+ }
}
}
--
Gitblit v1.8.0