From 20119c1e9849ab28add56b977ffbca87e13e1072 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 14 二月 2025 10:47:09 +0800
Subject: [PATCH] 2025年02月14日10:46:45
---
app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
index f0e1da1..fe0ecac 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
@@ -36,6 +36,7 @@
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.photovoltaic.widget.ConfirmationInputDialog;
+import com.hdl.photovoltaic.widget.PermissionExplanationDialog;
import com.hdl.photovoltaic.widget.popupview.CameraAlbumPopWindow;
import java.io.File;
@@ -114,29 +115,32 @@
//Manifest.permission.WRITE_EXTERNAL_STORAGE 璇诲啓璁惧涓婄殑鐓х墖浠ュ強鏂囦欢
//generalPermission.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE});
//Android 13浠ヤ笂鐢ㄥ埆鐨勬潈闄�
- if (Build.VERSION.SDK_INT >= 33) {
- PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.READ_MEDIA_IMAGES, new PermissionUtils.PermissionState() {
- @Override
- public void Success(int value) {
- if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
+// if (Build.VERSION.SDK_INT >= 33) {
+// PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.READ_MEDIA_IMAGES, new PermissionUtils.PermissionState() {
+// @Override
+// public void Success(int value) {
+// if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
+//// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
+// return;
+// }
+// changedUserAvatar();
+// }
+// }, true);
+// } else {
+ // 鏈巿鏉� 濡傛灉搴旂敤绋嬪簭娌℃湁鎵�闇�鐨勬潈闄愶紝鍒欐樉绀鸿В閲婅鏄�
+ PermissionExplanationDialog.getInstance().showPortConflictPdDialog(_mActivity, getString(R.string.camera_storage_instructions), getString(R.string.camera_storage_purpose));
+ PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE, new PermissionUtils.PermissionState() {
+ @Override
+ public void Success(int value) {
+ PermissionExplanationDialog.getInstance().dismiss();
+ if (value == PermissionUtils.STATUS_REFUSE_PERMANENT | value == PermissionUtils.STATUS_REFUSE) {
// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
- return;
- }
- changedUserAvatar();
+ return;
}
- }, true);
- } else {
- PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE, new PermissionUtils.PermissionState() {
- @Override
- public void Success(int value) {
- if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
-// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
- return;
- }
- changedUserAvatar();
- }
- }, true);
- }
+ changedUserAvatar();
+ }
+ }, true);
+// }
}
});
@@ -205,7 +209,9 @@
private void changedUserAvatar() {
if (UserConfigManage.getInstance().isBAccount()) {
//todo B绔笉鏀寔鏇存敼鏄电О
- HdlThreadLogic.toast(_mActivity, R.string.loading_not_supported);
+// HdlThreadLogic.toast(_mActivity, R.string.loading_not_supported);
+
+
} else {
cameraAlbumPopWindow = new CameraAlbumPopWindow(_mActivity, new CameraAlbumPopWindow.CameraAlbumListener() {
@Override
--
Gitblit v1.8.0