From 30859ca8f2175475d2c666353bc27f3b2ceede53 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 22 八月 2024 13:43:47 +0800 Subject: [PATCH] 2024年08月22日13:43:45 --- app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 59 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 45 insertions(+), 14 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 678f93d..b9f25f8 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(); //鑾峰彇鐢ㄦ埛澶村儚璺緞 @@ -144,9 +145,15 @@ HdlAccountLogic.getInstance().getUserInfo_B(new CloudCallBeak<BUserInfo>() { @Override public void onSuccess(BUserInfo bUserInfo) { + 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 @@ -166,6 +173,7 @@ viewBinding.fragmentMeIconParentCl.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + if (UserConfigManage.getInstance().isBAccount()) { Intent intent = new Intent(); intent.setClass(_mActivity, BPersonalDataActivity.class); @@ -225,17 +233,19 @@ viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management); viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management); - viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE); - - viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards); - viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard); - viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineV.setVisibility(View.VISIBLE); + viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);//鍏堥殣钘�,璇诲彇鍒版湁闄愭潈鍦ㄦ樉绀� +// 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); + setMemberName(UserConfigManage.getInstance().getUserName()); + setMemberAccount(UserConfigManage.getInstance().getAccount()); // setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl()); @@ -280,13 +290,34 @@ */ private void setMemberName(String userName) { if (TextUtils.isEmpty(userName)) { - return; + 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) { @@ -322,11 +353,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