From 11409771024381e06173490d846bf121e6a19552 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 15 一月 2026 21:29:05 +0800
Subject: [PATCH] 2026年01月15日21:29:00

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 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..206e088 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,24 +113,27 @@
             @Override
             public void onClick(View v) {
                 //Manifest.permission.WRITE_EXTERNAL_STORAGE 璇诲啓璁惧涓婄殑鐓х墖浠ュ強鏂囦欢
-                //generalPermission.launch(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE});
-                //Android 13浠ヤ笂鐢ㄥ埆鐨勬潈闄�
+//                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) {
+//                    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);
+//                                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) {
-                            if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
+                            PermissionExplanationDialog.getInstance().dismiss();
+                            if (value == PermissionUtils.STATUS_REFUSE_PERMANENT | value == PermissionUtils.STATUS_REFUSE) {
 //                            HdlThreadLogic.toast(_mActivity, R.string.permission_open);
                                 return;
                             }
@@ -196,6 +200,15 @@
         viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
         setMemberHeadIcon();
         updateStyle();
+
+        if (UserConfigManage.getInstance().isArabicLanguage()) {
+            viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+            viewBinding.personalDataUserPortraitIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+            viewBinding.personalDataUserNameIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+            viewBinding.personalDataMailIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+            viewBinding.personalDataPhoneIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+            viewBinding.personalDataQrCodeIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+        }
     }
 
 
@@ -205,7 +218,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