From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 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 b9f25f8..a8d9705 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
@@ -189,6 +189,16 @@
}
}
});
+ //璁惧璋冭瘯
+ 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
@@ -197,6 +207,7 @@
HdlUniLogic.getInstance().openUniMP(path, null);
}
});
+ //璁剧疆
viewBinding.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -205,21 +216,11 @@
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() {
- @Override
- public void onClick(View v) {
- count[0] = count[0] + 1;
- if (count[0] > 3) {
- count[0] = 0;
- startActivity(TestMainActivity.class);
- }
}
});
@@ -230,15 +231,20 @@
* 鍒濆鍖栫晫闈�
*/
private void initView() {
-
+ //璁惧璋冭瘯
+ 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.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);
@@ -290,11 +296,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);
}
@@ -305,17 +309,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);
-
}
--
Gitblit v1.8.0