From 07ef58effb8a570cd8a917e5a0c4d2b57e0fd5d3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 20 三月 2024 13:43:29 +0800
Subject: [PATCH] 2024年03月20日13:43:24
---
app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 bb7c02f..8d0a4d9 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
@@ -4,6 +4,7 @@
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
@@ -59,7 +60,7 @@
public void onBindView(Bundle savedInstanceState) {
setNotificationBarBackgroundColor(CustomColor.white);
setStatusBarTextColor();
- mMemberHeadIconUrl = getIntent().getStringExtra("memberHeadIcon");
+ mMemberHeadIconUrl = UserConfigManage.getInstance().getUserImageUrl();
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -96,7 +97,7 @@
viewBinding.toolbarTopFragmentMeRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- backPressedData();
+// backPressedData();
finish();
}
});
@@ -168,19 +169,23 @@
public void onSuccess(Boolean obj) {
mMemberHeadIconUrl = imageKey.getUrl();
setMemberHeadIcon();
+ backPressedData();
}
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("uploadUserHeadImage error:" + e.getMsg());
+
+ HdlThreadLogic.toast(_mActivity, e);
+// HdlLogLogic.print("uploadUserHeadImage error:" + error.getMsg());
// hideLoading();
}
});
}
@Override
- public void onFailure(HDLException error) {
- HdlLogLogic.print("uploadUserHeadImage error:" + error.getMsg());
+ public void onFailure(HDLException e) {
+// HdlThreadLogic.tipFlashingBox(_mActivity, false, e.getMsg(), e.getCode());
+ HdlThreadLogic.toast(_mActivity, e);
}
});
}
@@ -214,6 +219,7 @@
viewBinding.personalDataUserNameIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getUserName());
confirmationInputDialog.dismiss();
HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_change_name_succeed), 0);
+ backPressedData();
}
@Override
@@ -238,7 +244,12 @@
* 鏄剧ず鐢ㄦ埛澶村儚
*/
private void setMemberHeadIcon() {
- GlideUtils.getRoundedCornersImage(_mActivity, mMemberHeadIconUrl, viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv, new RoundedCorners(4));
+ if (UserConfigManage.getInstance().isBAccount()) {
+ GlideUtils.getRoundedCornersImage(_mActivity, mMemberHeadIconUrl, viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv, new RoundedCorners(4), true);
+ } else {
+ GlideUtils.getCircleCropImage(_mActivity, mMemberHeadIconUrl, viewBinding.personalDataUserPortraitIl.sllLlRlRightContentIv, true);
+
+ }
}
@@ -280,7 +291,7 @@
*/
@Override
public void onBackPressed() {
- backPressedData();
+// backPressedData();
super.onBackPressed();
}
@@ -295,9 +306,17 @@
intent.putExtra("memberName", UserConfigManage.getInstance().getUserName());
setResult(10, intent);
} else {
- //閫氱煡缁欏皬绋嬪簭鏇存柊鍥惧儚鎴栬�呯敤鎴峰悕
+ //閫氱煡缁欏皬绋嬪簭鏇存柊澶村儚鎴栬�呯敤鎴峰悕
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ JsonObject jsonObject = new JsonObject();
+ if (!TextUtils.isEmpty(mMemberHeadIconUrl)) {
+ jsonObject.addProperty("memberHeadIcon", mMemberHeadIconUrl);
+ }
+ if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserName())) {
+ jsonObject.addProperty("memberName", UserConfigManage.getInstance().getUserName());
+ }
uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO);
+ uniCallBackBaseBean.setData(jsonObject);
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
}
}
--
Gitblit v1.8.0