From 44ba605a4e850efa757020da5fb4cf02bdf6e3ab Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 08 九月 2025 10:55:18 +0800
Subject: [PATCH] 2025年09月08日10:55:15
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 127 +++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 26 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 f1c0120..bb837c1 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
@@ -3,9 +3,12 @@
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
+import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewGroup;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.alibaba.fastjson.JSONObject;
@@ -17,14 +20,17 @@
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;
@@ -90,6 +96,7 @@
mC_UserInfo = cUserInfo;
UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
+ UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
UserConfigManage.getInstance().Save();
// hideLoading();
//鑾峰彇鐢ㄦ埛澶村儚璺緞
@@ -141,9 +148,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
@@ -163,6 +176,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);
@@ -178,14 +192,25 @@
}
}
});
- //鍛樺伐绠＄悊锛堜富璐﹀彿鎵嶆樉绀猴級
- viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
+ //璁惧璋冭瘯
+ viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- String path = HDLUniMP.UNI_EVENT_OPEN_MINE_MINESTAFFMANAGER;
+ UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(2);
+ //璁惧璋冭瘯
+ String path = HDLUniMP.UNI_EVENT_OPEN_MINE_DEVICEDEBUG;
HdlUniLogic.getInstance().openUniMP(path, null);
}
});
+// //鍛樺伐绠＄悊锛堜富璐﹀彿鎵嶆樉绀猴級
+// 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() {
@Override
public void onClick(View v) {
@@ -194,21 +219,18 @@
startActivity(intent);
}
});
+ //鍏充簬
viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineCl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(AsRegardsActivity.class);
}
});
- final int[] count = {0};
- viewBinding.meTitleTv.setOnClickListener(new View.OnClickListener() {
+ //甯姪
+ viewBinding.fragmentMeLineHelpIl.fragmentMeLineCl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- count[0] = count[0] + 1;
- if (count[0] > 3) {
- count[0] = 0;
- startActivity(TestMainActivity.class);
- }
+ startActivity(HelpWebActivity.class);
}
});
@@ -219,20 +241,32 @@
* 鍒濆鍖栫晫闈�
*/
private void initView() {
-
- 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.fragmentMeLineDeviceDebugIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.device_debug);
+ viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineTitleIv.setText(R.string.device_debugging);
+ viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineV.setVisibility(View.VISIBLE);
+// //鍛樺伐绠＄悊
+// viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
+// viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management);
+// 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.fragmentMeLineSetIl.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.fragmentMeLineHelpIl.fragmentMeLineCl.setVisibility(View.GONE);//鑳″浆璇村厛闅愯棌
+ viewBinding.fragmentMeLineHelpIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.help);
+ viewBinding.fragmentMeLineHelpIl.fragmentMeLineTitleIv.setText(R.string.help);
setMemberName(UserConfigManage.getInstance().getUserName());
+ setMemberAccount(UserConfigManage.getInstance().getAccount());
// setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());
@@ -277,13 +311,30 @@
*/
private void setMemberName(String userName) {
if (TextUtils.isEmpty(userName)) {
- return;
+ viewBinding.userNameLl.setVisibility(View.GONE);
+ } else {
+ viewBinding.userNameLl.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.userNameLl.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) {
@@ -302,12 +353,35 @@
} else {
this.getCMemberInfo();
}
- // 鍙栨秷绮樻�т簨浠�
- EventBus.getDefault().removeStickyEvent(eventBus);
+// getUserRightType();
+
}
}
+ }
+
+ /**
+ * 鍛樺伐鏉冮檺绫诲瀷(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) {
+
+ }
+ });
}
/**
@@ -339,9 +413,10 @@
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�--->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ HdlLogLogic.print("鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�---" + e.getMsg() + "(" + e.getCode() + ")", true);
// HdlThreadLogic.toast(_mActivity, e);
}
});
}
+
}
--
Gitblit v1.8.0