From b2d2e6dcf6ec38a2f24721f2bc925d634a6eb78d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十二月 2023 18:31:01 +0800
Subject: [PATCH] 2023年12月05日18:30:40
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 85 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index a1d776b..817490e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -68,22 +68,37 @@
HdlAccountLogic.getInstance().getMemberInfo_C(new CloudCallBeak<CUserInfo>() {
@Override
public void onSuccess(CUserInfo cUserInfo) {
+ if (cUserInfo == null) {
+ return;
+ }
mC_UserInfo = cUserInfo;
+ UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
+ UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
+ UserConfigManage.getInstance().Save();
// hideLoading();
//鑾峰彇鐢ㄦ埛澶村儚璺緞
if (cUserInfo.getMemberHeadIcon().contains("http")) {
- updateView(null, cUserInfo);
+ //鏇存柊鐢ㄦ埛澶村儚
+ setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(cUserInfo.getMemberName());
} else {
HdlAccountLogic.getInstance().getImageKey_C(cUserInfo.getMemberHeadIcon(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String url) {
cUserInfo.setMemberHeadIcon(url);
- updateView(null, cUserInfo);
+ //鏇存柊鐢ㄦ埛澶村儚
+ setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(cUserInfo.getMemberName());
}
@Override
public void onFailure(HDLException e) {
- updateView(null, cUserInfo);
+// //鏇存柊鐢ㄦ埛澶村儚
+// setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(cUserInfo.getMemberName());
HdlThreadLogic.toast(_mActivity, e);
}
});
@@ -110,7 +125,8 @@
public void onSuccess(BUserInfo bUserInfo) {
mB_UserInfo = bUserInfo;
// hideLoading();
- updateView(bUserInfo, null);
+
+ setMemberName(bUserInfo.getUserName());
}
@Override
@@ -150,46 +166,19 @@
startActivity(AsRegardsActivity.class);
}
});
+ final int[] count = {0};
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(TestMainActivity.class);
+ count[0] = count[0] + 1;
+ if (count[0] > 3) {
+ count[0] = 0;
+ startActivity(TestMainActivity.class);
+ }
}
});
- }
-
- /**
- * 鏇存柊ui
- *
- * @param bUserInfo B绔釜浜轰俊鎭�
- * @param cUserInfo C绔釜浜轰俊鎭�
- */
- private void updateView(BUserInfo bUserInfo, CUserInfo cUserInfo) {
- if (viewBinding == null) {
- return;
- }
- String userName = UserConfigManage.getInstance().getUserName();
- if (bUserInfo != null) {
- //B绔�
- userName = bUserInfo.getUserName();
- }
- if (cUserInfo != null) {
- //C绔�
- userName = cUserInfo.getMemberName();
- setMemberHeadIcon(cUserInfo.getMemberHeadIcon());
- }
- viewBinding.fragmentMeUserNameIv.setText(userName);
- UserConfigManage.getInstance().setUserName(userName);
- UserConfigManage.getInstance().Save();
- }
-
- @Override
- public void onResume() {
- super.onResume();
- //鏇存柊鐢ㄦ埛鍚嶇О
- updateView(null, null);
}
/**
@@ -199,8 +188,8 @@
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me);
- viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);
+// viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
+// viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);
viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.message_center);
viewBinding.fragmentMeLineMessageCenterIl.fragmentMeLineTitleIv.setText(R.string.set_message_center);
@@ -228,8 +217,12 @@
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10 && resultCode == 10) {
if (data != null) {
- String url = data.getStringExtra("memberHeadIcon");
- setMemberHeadIcon(url);
+ String iconUrl = data.getStringExtra("memberHeadIcon");
+ String memberName = data.getStringExtra("memberName");
+ //鏇存柊鐢ㄦ埛澶村儚
+ setMemberHeadIcon(iconUrl);
+ //鏇存柊鐢ㄦ埛鍚嶇О
+ setMemberName(memberName);
}
}
@@ -245,4 +238,14 @@
GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4));
}
+
+ /**
+ * 鏄剧ず鐢ㄦ埛鍚嶇О
+ */
+ private void setMemberName(String userName) {
+ viewBinding.fragmentMeUserNameIv.setText(userName);
+ UserConfigManage.getInstance().setUserName(userName);
+ UserConfigManage.getInstance().Save();
+
+ }
}
--
Gitblit v1.8.0