From 24a59bc611c38ec3c01987cd5bb33984aa9731b2 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 24 六月 2024 16:48:51 +0800
Subject: [PATCH] 2024年06月24日16:48:45
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 80 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 17 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 65e4f84..678f93d 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
@@ -17,14 +17,19 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentMeBinding;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
+import com.hdl.photovoltaic.enums.UserRightType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlMemberLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
+import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -162,17 +167,26 @@
@Override
public void onClick(View v) {
if (UserConfigManage.getInstance().isBAccount()) {
- //todo B绔笉鏀寔鏇存敼鏄电О
- HdlThreadLogic.toast(_mActivity, R.string.loading_not_supported);
- return;
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, BPersonalDataActivity.class);
+ startActivity(intent);
+ } else {
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, CPersonalDataActivity.class);
+ if (mC_UserInfo == null) {
+ mC_UserInfo = new CUserInfo();
+ }
+ intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
+ startActivityForResult(intent, 10);
}
- Intent intent = new Intent();
- intent.setClass(_mActivity, PersonalDataActivity.class);
- if (mC_UserInfo == null) {
- mC_UserInfo = new CUserInfo();
- }
- intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
- startActivityForResult(intent, 10);
+ }
+ });
+ //鍛樺伐绠＄悊锛堜富璐﹀彿鎵嶆樉绀猴級
+ viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String path = HDLUniMP.UNI_EVENT_OPEN_MINE_MINESTAFFMANAGER;
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
});
viewBinding.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
@@ -209,13 +223,18 @@
*/
private void initView() {
-
- viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
- viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
- viewBinding.fragmentMeLineSetIl.fragmentMeLineV.setVisibility(View.VISIBLE);
+ 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.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
+ viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
+
+
setMemberName(UserConfigManage.getInstance().getUserName());
// setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());
@@ -224,6 +243,10 @@
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ //B绔笉闇�瑕佹洿鏂�
+ return;
+ }
if (requestCode == 10 && resultCode == 10) {
if (data != null) {
String iconUrl = data.getStringExtra("memberHeadIcon");
@@ -259,7 +282,7 @@
if (TextUtils.isEmpty(userName)) {
return;
}
- viewBinding.fragmentMeUserNameIv.setText(userName);
+ viewBinding.fragmentMeUserNameTv.setText(userName);
UserConfigManage.getInstance().setUserName(userName);
UserConfigManage.getInstance().Save();
@@ -282,8 +305,8 @@
} else {
this.getCMemberInfo();
}
- // 鍙栨秷绮樻�т簨浠�
- EventBus.getDefault().removeStickyEvent(eventBus);
+ getUserRightType();
+
}
}
@@ -291,6 +314,29 @@
}
/**
+ * 鍛樺伐鏉冮檺绫诲瀷(B绔�)
+ * MANAGER : 鍏徃绠＄悊鍛�
+ * USER 锛� 鏅�氬憳宸�
+ */
+ private void getUserRightType() {
+ 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);
+// }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
+ }
+
+ /**
* 鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�(app鍚姩鐨勬椂鍊欒鑾峰彇)
*/
private void getResidenceTemperatureUnit() {
--
Gitblit v1.8.0