From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 8148fc5..638eab9 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;
@@ -112,23 +113,26 @@
             @Override
             public void onClick(View v) {
                 //Manifest.permission.WRITE_EXTERNAL_STORAGE 璇诲啓璁惧涓婄殑鐓х墖浠ュ強鏂囦欢
-                //generalPermission.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE});
-                //Android 13浠ヤ笂鐢ㄥ埆鐨勬潈闄�
-//                if (Build.VERSION.SDK_INT >= 33) {
+//                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) {
-////                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
+//                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
 //                                return;
 //                            }
-//                            changedUserAvatar();
+                    changedUserAvatar();
 //                        }
 //                    }, true);
-//                } else {
+                } 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;
@@ -136,7 +140,7 @@
                             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