From 4f9fab221268ca32efb1ebd59dd7dd2ced81f89b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 30 七月 2024 16:14:52 +0800
Subject: [PATCH] 2024年07月30日16:14:51

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 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..c760944 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
@@ -232,15 +235,16 @@
         viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management);
 //        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE);
 
+        viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
+        viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
+
         viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
         viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
 //        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineV.setVisibility(View.VISIBLE);
 
-        viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
-        viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
-
 
         setMemberName(UserConfigManage.getInstance().getUserName());
+        setMemberAccount(UserConfigManage.getInstance().getAccount());
 //        setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());
 
 
@@ -285,13 +289,34 @@
      */
     private void setMemberName(String userName) {
         if (TextUtils.isEmpty(userName)) {
-            userName = "--";
+            viewBinding.fragmentMeUserNameTv.setVisibility(View.GONE);
+            viewBinding.fragmentMeUserNameNextIv.setVisibility(View.GONE);
+        } else {
+            viewBinding.fragmentMeUserNameTv.setVisibility(View.VISIBLE);
+            viewBinding.fragmentMeUserNameNextIv.setVisibility(View.VISIBLE);
+            viewBinding.fragmentMeUserNameTv.setText(userName);
         }
-        viewBinding.fragmentMeUserNameTv.setText(userName);
-        UserConfigManage.getInstance().setUserName(userName);
-        UserConfigManage.getInstance().Save();
+
 
     }
+
+    /**
+     * 鏄剧ず璐﹀彿
+     */
+    private void setMemberAccount(String userAccount) {
+        if (viewBinding.fragmentMeUserNameTv.getVisibility() == View.VISIBLE) {
+            viewBinding.fragmentMeUserRoleNextIv.setVisibility(View.GONE);
+        } else {
+            viewBinding.fragmentMeUserRoleNextIv.setVisibility(View.VISIBLE);
+        }
+
+        if (TextUtils.isEmpty(userAccount)) {
+            userAccount = "--";
+        }
+        viewBinding.fragmentMeUserRoleTv.setText(userAccount);
+
+    }
+
 
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     public void onEventMessage(BaseEventBus eventBus) {
@@ -327,11 +352,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