From d1ebb94e1a17b7c25d4fcf73d85345d92cc86b5c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 一月 2024 18:41:34 +0800
Subject: [PATCH] 2024年01月02日18:41:32
---
app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
index ab42849..4a99cb1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
@@ -7,9 +7,13 @@
import android.view.Gravity;
import android.view.View;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.core.app.ActivityCompat;
+
+
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.google.gson.JsonObject;
-import com.hdl.linkpm.sdk.core.callback.IDefaultCallBack;
import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
@@ -40,6 +44,7 @@
private CameraAlbumPopWindow cameraAlbumPopWindow;
//澶村儚鍦板潃
private String mMemberHeadIconUrl;
+ private ActivityResultLauncher<String[]> generalPermission;
@Override
@@ -62,6 +67,25 @@
}
private void initData() {
+// generalPermission = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
+// @Override
+// public void onActivityResult(Map<String, Boolean> result) {
+//
+// }
+// });
+// generalPermission.launch(new String[]{});
+
+// generalPermission = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
+// @Override
+// public void onActivityResult(Map<String, Boolean> result) {
+//
+//// if (value == PermissionUtils.STATUS_REFUSE_PERMANENT) {
+//// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
+//// return;
+//// }
+// changedUserAvatar();
+// }
+// });
}
@@ -70,29 +94,27 @@
viewBinding.toolbarTopFragmentMeRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- //鏁版嵁鏄娇鐢↖ntent杩斿洖
- Intent intent = new Intent();
- //鎶婅繑鍥炴暟鎹瓨鍏ntent
- intent.putExtra("memberHeadIcon", mMemberHeadIconUrl);
- //璁剧疆杩斿洖鏁版嵁
- setResult(10, intent);
+ backPressedData();
finish();
}
});
viewBinding.personalDataUserPortraitIl.getRoot().setOnClickListener(new View.OnClickListener() {
+
@Override
public void onClick(View v) {
//Manifest.permission.WRITE_EXTERNAL_STORAGE 璇诲啓璁惧涓婄殑鐓х墖浠ュ強鏂囦欢
- PermissionUtils.applyForRight(_mActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE, new PermissionUtils.PermissionState() {
+ //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) {
- HdlThreadLogic.toast(_mActivity, R.string.permission_open);
+// HdlThreadLogic.toast(_mActivity, R.string.permission_open);
return;
}
changedUserAvatar();
}
- });
+ }, true);
}
});
@@ -132,21 +154,23 @@
cameraAlbumPopWindow = new CameraAlbumPopWindow(_mActivity, new CameraAlbumPopWindow.CameraAlbumListener() {
@Override
public void successCallBack(final File a) {
+ //涓婁紶澶村儚鏂囦欢
HDLLinkPMUser.getInstance().uploadUserHeadImage(a, new IResponseCallBack<ImageSubmitInfo>() {
@Override
public void onSuccess(ImageSubmitInfo imageKey) {
JsonObject imageInfo = new JsonObject();
imageInfo.addProperty("memberHeadIcon", imageKey.getUrl());
- HDLLinkPMUser.getInstance().updateMemberInfo(imageInfo, new IDefaultCallBack() {
+ //涓婁紶澶村儚鍦板潃
+ HdlAccountLogic.getInstance().updateMemberHeadIcon_C(imageKey.getUrl(), new CloudCallBeak<Boolean>() {
@Override
- public void onSuccess() {
+ public void onSuccess(Boolean obj) {
mMemberHeadIconUrl = imageKey.getUrl();
setMemberHeadIcon();
}
@Override
- public void onFailure(HDLException error) {
- HdlLogLogic.print("uploadUserHeadImage error:" + error.getMsg());
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("uploadUserHeadImage error:" + e.getMsg());
// hideLoading();
}
});
@@ -180,7 +204,7 @@
confirmationInputDialog.setYesOnclickListener(new ConfirmationInputDialog.onYesOnclickListener() {
@Override
public void Confirm(String str) {
- HdlAccountLogic.getInstance().updateMemberInfo_C("", str, "", "", "", "", new CloudCallBeak<Boolean>() {
+ HdlAccountLogic.getInstance().updateMemberName_C(str, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
UserConfigManage.getInstance().setUserName(str);
@@ -192,7 +216,7 @@
@Override
public void onFailure(HDLException e) {
- HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMessage(), e.getCode());
+ HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
}
});
@@ -249,4 +273,24 @@
}
}
+ /**
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ */
+ @Override
+ public void onBackPressed() {
+ backPressedData();
+ super.onBackPressed();
+ }
+
+ /**
+ * 杩斿洖缁欎笂涓�绾х晫闈㈡暟鎹�
+ */
+ private void backPressedData() {
+ Intent intent = new Intent();
+ intent.putExtra("memberHeadIcon", mMemberHeadIconUrl);
+ intent.putExtra("memberName", UserConfigManage.getInstance().getUserName());
+ setResult(10, intent);
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0