From 59340c0b9107c813d6b3a5c953d693212485ad11 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 20 八月 2025 13:31:22 +0800
Subject: [PATCH] 2025年08月20日13:31:14
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
index 75c641e..5e181eb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
@@ -95,24 +95,40 @@
if (TextUtils.isEmpty(mMessageBean.getTitle())) {
viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
+ } else {
+ viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.VISIBLE);
}
if (TextUtils.isEmpty(mMessageBean.getDescription())) {
viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
+ } else {
+ viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.VISIBLE);
}
if (TextUtils.isEmpty(mMessageBean.getRemark())) {
viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
+ } else {
+ viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.VISIBLE);
}
if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
+ } else {
+ viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.VISIBLE);
}
if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
+ } else {
+ viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.VISIBLE);
}
- if (TextUtils.isEmpty(mMessageBean.getPlan())) {
+ if (UserConfigManage.getInstance().isBAccount()) {
+ if (TextUtils.isEmpty(mMessageBean.getPlan())) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
+ } else {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE);
+ }
+ } else {
+ //C绔殣钘�
viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
}
-
- if (!TextUtils.isEmpty(mMessageBean.getPlan())) {
+ if (!TextUtils.isEmpty(mMessageBean.getPlan()) && UserConfigManage.getInstance().isBAccount()) {
viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
} else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) {
viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
@@ -246,16 +262,16 @@
private void initView() {
- viewBinding.toolbarTopRl.topTitleTv.setText(R.string.message_alarm_info);
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.event_details);
viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.messageInfoEventTitleIn.leftTitleTv.setText(R.string.event_title);
viewBinding.messageInfoEventContentIn.leftTitleTv.setText(R.string.event_content);
viewBinding.messageInfoRemarkIn.leftTitleTv.setText(R.string.remark);
- viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.messagealarm_details_device);
+ viewBinding.messageInfoAlarmDeviceIn.leftTitleTv.setText(R.string.event_device);
viewBinding.messageInfoPowerStationLocationIn.leftTitleTv.setText(R.string.message_alarm_detailspower_station_location);
- viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.message_alarm_details_time);
+ viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.event_time);
viewBinding.messageInfoAlarmTreatmentOptionsIn.leftTitleTv.setText(R.string.treatment_options);
viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());
@@ -277,9 +293,8 @@
if (UserConfigManage.getInstance().isBAccount()) {
viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE);
-// viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
} else {
-// viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
}
if (TextUtils.isEmpty(mMessageBean.getTitle())) {
@@ -300,22 +315,22 @@
if (TextUtils.isEmpty(mMessageBean.getPlan())) {
viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
}
-
- if (!TextUtils.isEmpty(mMessageBean.getPlan())) {
- viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
- } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) {
- viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
- } else if (!TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
- viewBinding.messageInfoPowerStationLocationIn.lineV.setVisibility(View.GONE);
- } else if (!TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
- viewBinding.messageInfoAlarmDeviceIn.lineV.setVisibility(View.GONE);
- } else if (!TextUtils.isEmpty(mMessageBean.getRemark())) {
- viewBinding.messageInfoRemarkIn.lineV.setVisibility(View.GONE);
- } else if (!TextUtils.isEmpty(mMessageBean.getDescription())) {
- viewBinding.messageInfoEventContentIn.lineV.setVisibility(View.GONE);
- } else if (!TextUtils.isEmpty(mMessageBean.getTitle())) {
- viewBinding.messageInfoEventTitleIn.lineV.setVisibility(View.GONE);
- }
+//
+// if (!TextUtils.isEmpty(mMessageBean.getPlan())) {
+// viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
+// } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) {
+// viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
+// } else if (!TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
+// viewBinding.messageInfoPowerStationLocationIn.lineV.setVisibility(View.GONE);
+// } else if (!TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
+// viewBinding.messageInfoAlarmDeviceIn.lineV.setVisibility(View.GONE);
+// } else if (!TextUtils.isEmpty(mMessageBean.getRemark())) {
+// viewBinding.messageInfoRemarkIn.lineV.setVisibility(View.GONE);
+// } else if (!TextUtils.isEmpty(mMessageBean.getDescription())) {
+// viewBinding.messageInfoEventContentIn.lineV.setVisibility(View.GONE);
+// } else if (!TextUtils.isEmpty(mMessageBean.getTitle())) {
+// viewBinding.messageInfoEventTitleIn.lineV.setVisibility(View.GONE);
+// }
}
--
Gitblit v1.8.0