Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

 app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java

@@ -113,34 +113,34 @@
            @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 {
                // 未授权 如果应用程序没有所需的权限，则显示解释说明
                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) {
                } 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;
                                return;
                            }
                            changedUserAvatar();
                        }
                        changedUserAvatar();
                    }
                }, true);
//                }
                    }, true);
                }
            }
        });

@@ -209,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