From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 338dc5d..75b4d57 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
@@ -93,6 +93,7 @@
mC_UserInfo = cUserInfo;
UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
+ UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
UserConfigManage.getInstance().Save();
// hideLoading();
//鑾峰彇鐢ㄦ埛澶村儚璺緞
@@ -148,9 +149,11 @@
mB_UserInfo = bUserInfo;
UserConfigManage.getInstance().setBingPhone(bUserInfo.getUserPhone());
UserConfigManage.getInstance().setBingEmail(bUserInfo.getUserEmail());
+ UserConfigManage.getInstance().setUserName(bUserInfo.getUserName());
UserConfigManage.getInstance().Save();
// hideLoading();
setMemberName(bUserInfo.getUserName());
+ setMemberAccount(TextUtils.isEmpty(bUserInfo.getUserPhone()) ? bUserInfo.getUserEmail() : bUserInfo.getUserPhone());
}
@Override
@@ -241,6 +244,7 @@
setMemberName(UserConfigManage.getInstance().getUserName());
+ setMemberAccount(UserConfigManage.getInstance().getAccount());
// setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());
@@ -288,10 +292,21 @@
userName = "--";
}
viewBinding.fragmentMeUserNameTv.setText(userName);
- UserConfigManage.getInstance().setUserName(userName);
- UserConfigManage.getInstance().Save();
+
}
+
+ /**
+ * 鏄剧ず璐﹀彿
+ */
+ private void setMemberAccount(String userAccount) {
+ if (TextUtils.isEmpty(userAccount)) {
+ userAccount = "--";
+ }
+ viewBinding.fragmentMeUserRoleTv.setText(userAccount);
+
+ }
+
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
public void onEventMessage(BaseEventBus eventBus) {
@@ -327,11 +342,11 @@
HdlMemberLogic.getInstance().getUserRightType(new CloudCallBeak<UserRightTypeBean>() {
@Override
public void onSuccess(UserRightTypeBean obj) {
-// if (obj.getUserRightType().equals(UserRightType.MANAGER)) {
-// viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.VISIBLE);
-// } else {
-// viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);
-// }
+ if (obj.getUserRightType().equals(UserRightType.MANAGER)) {
+ viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.VISIBLE);
+ } else {
+ viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);
+ }
}
@Override
--
Gitblit v1.8.0