From 9d6573a634ca739ac2c970206db223bb845eb6ce Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 15:17:19 +0800
Subject: [PATCH] 2025年01月07日15:17:17

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 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 6087317..f0e1da1 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
@@ -1,5 +1,6 @@
 package com.hdl.photovoltaic.ui.me;
 
+
 import android.Manifest;
 import android.content.Intent;
 import android.os.Build;
@@ -38,6 +39,7 @@
 import com.hdl.photovoltaic.widget.popupview.CameraAlbumPopWindow;
 
 import java.io.File;
+import java.util.Objects;
 
 
 /**
@@ -72,6 +74,7 @@
     }
 
     private void initData() {
+
 //        generalPermission = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
 //            @Override
 //            public void onActivityResult(Map<String, Boolean> result) {
@@ -103,24 +106,37 @@
                 finish();
             }
         });
+
         viewBinding.personalDataUserPortraitIl.getRoot().setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View v) {
                 //Manifest.permission.WRITE_EXTERNAL_STORAGE 璇诲啓璁惧涓婄殑鐓х墖浠ュ強鏂囦欢
                 //generalPermission.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE});
-
-                PermissionUtils.requestPermissionsResultCallback(_mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE, new PermissionUtils.PermissionState() {
-                    @Override
-                    public void Success(int value) {
-                        if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
+                //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);
-                            return;
+                                return;
+                            }
+                            changedUserAvatar();
                         }
-                        changedUserAvatar();
-                    }
-                }, true);
-
+                    }, 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);
+                }
             }
         });
 

--
Gitblit v1.8.0