From 2f5411b86c59706d31f6ec7de629d8f860725e46 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 十一月 2025 19:56:56 +0800
Subject: [PATCH] 2025年11月26日19:56:45 集成谷歌推送
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 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 4add5e0..b38c25d 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,7 +17,6 @@
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;
@@ -28,7 +27,6 @@
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;
@@ -36,6 +34,7 @@
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+
/**
* 鎴戠殑-鐣岄潰
@@ -193,19 +192,20 @@
viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ 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.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
@@ -220,9 +220,16 @@
@Override
public void onClick(View v) {
startActivity(AsRegardsActivity.class);
+
}
});
-
+ //甯姪
+ viewBinding.fragmentMeLineHelpIl.fragmentMeLineCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(HelpWebActivity.class);
+ }
+ });
}
@@ -234,18 +241,25 @@
//璁惧璋冭瘯
viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.device_debug);
viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineTitleIv.setText(R.string.device_debugging);
- //鍛樺伐绠＄悊
- viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
- viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management);
- viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);//鍏堥殣钘�,璇诲彇鍒版湁闄愭潈鍦ㄦ樉绀�
+ 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());
@@ -294,11 +308,9 @@
*/
private void setMemberName(String userName) {
if (TextUtils.isEmpty(userName)) {
- viewBinding.fragmentMeUserNameTv.setVisibility(View.GONE);
- viewBinding.fragmentMeUserNameNextIv.setVisibility(View.GONE);
+ viewBinding.userNameLl.setVisibility(View.GONE);
} else {
- viewBinding.fragmentMeUserNameTv.setVisibility(View.VISIBLE);
- viewBinding.fragmentMeUserNameNextIv.setVisibility(View.VISIBLE);
+ viewBinding.userNameLl.setVisibility(View.VISIBLE);
viewBinding.fragmentMeUserNameTv.setText(userName);
}
@@ -309,17 +321,15 @@
* 鏄剧ず璐﹀彿
*/
private void setMemberAccount(String userAccount) {
- if (viewBinding.fragmentMeUserNameTv.getVisibility() == View.VISIBLE) {
+ 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);
-
}
@@ -340,7 +350,7 @@
} else {
this.getCMemberInfo();
}
- getUserRightType();
+// getUserRightType();
}
@@ -357,11 +367,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
@@ -400,9 +410,12 @@
@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