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 | 63 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 20 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 abb933a..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
@@ -1,5 +1,6 @@
package com.hdl.photovoltaic.ui.me;
+
import android.Manifest;
import android.content.Intent;
import android.os.Build;
@@ -35,9 +36,11 @@
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;
+import java.util.Objects;
/**
@@ -60,8 +63,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
mMemberHeadIconUrl = UserConfigManage.getInstance().getUserImageUrl();
//鍒濆鍖�
initView();
@@ -72,6 +75,7 @@
}
private void initData() {
+
// generalPermission = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
// @Override
// public void onActivityResult(Map<String, Boolean> result) {
@@ -96,31 +100,47 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentMeRl.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// backPressedData();
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) {
+// 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);
- return;
+// 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();
}
- changedUserAvatar();
- }
- }, true);
-
+ }, true);
+ }
}
});
@@ -160,20 +180,21 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me_personal_data);
- viewBinding.toolbarTopFragmentMeRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentMeRl.topLeftIv.setImageResource(R.drawable.back_c);
- viewBinding.toolbarTopFragmentMeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_personal_data);
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);
viewBinding.personalDataUserNameIl.sllLlRlNameTv.setText(R.string.me_personal_data_user_name);
viewBinding.personalDataMailIl.sllLlRlNameTv.setText(R.string.home_login_email);
viewBinding.personalDataPhoneIl.sllLlRlNameTv.setText(R.string.home_login_phone);
viewBinding.personalDataQrCodeIl.sllLlRlNameTv.setText(R.string.qr_code_business_card);
viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
+ viewBinding.personalDataUserPortraitIl.lineV.setVisibility(View.VISIBLE);
viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.personalDataUserNameIl.lineV.setVisibility(View.VISIBLE);
viewBinding.personalDataMailIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.personalDataMailIl.lineV.setVisibility(View.VISIBLE);
viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
+ viewBinding.personalDataPhoneIl.lineV.setVisibility(View.VISIBLE);
viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setVisibility(View.VISIBLE);
viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
@@ -188,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