From cf761dbce02ea1da7682265853354ca74dc2c31f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 26 八月 2025 17:30:42 +0800
Subject: [PATCH] 2025年08月26日17:30:41
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 129 ++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 56 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 b4a9ca8..f3f0371 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);
@@ -257,64 +273,65 @@
viewBinding.messageInfoPowerStationLocationIn.leftTitleTv.setText(R.string.message_alarm_detailspower_station_location);
viewBinding.messageInfoAlarmTimeIn.leftTitleTv.setText(R.string.event_time);
viewBinding.messageInfoAlarmTreatmentOptionsIn.leftTitleTv.setText(R.string.treatment_options);
-
- viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());
- viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle());
- viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription());
- viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark());
- viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc());
- viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress());
- String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime());
- viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date);
- viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan());
- stateStyle(viewBinding.messageInfoAlarmStateTv);
+ try {
+ viewBinding.messageInfoHomeNameTv.setText(mMessageBean.getHomeName());
+ viewBinding.messageInfoEventTitleIn.rightContentTv.setText(mMessageBean.getTitle());
+ viewBinding.messageInfoEventContentIn.rightContentTv.setText(mMessageBean.getDescription());
+ viewBinding.messageInfoRemarkIn.rightContentTv.setText(mMessageBean.getRemark());
+ viewBinding.messageInfoAlarmDeviceIn.rightContentTv.setText(mMessageBean.getDeviceDesc());
+ viewBinding.messageInfoPowerStationLocationIn.rightContentTv.setText(mMessageBean.getLocationAddress());
+ String date = TimeUtils.getTimeFromTimestamp(mMessageBean.getCreateTime());
+ viewBinding.messageInfoAlarmTimeIn.rightContentTv.setText(date);
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.rightContentTv.setText(mMessageBean.getPlan());
+ stateStyle(viewBinding.messageInfoAlarmStateTv);
- if (mMessageBean.getStatus().equals(MessageStateType.untreated) && mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
- //鍙戠敓涓殑娑堟伅涓旀槸鏁呴殰鎵嶈鏄剧ず
- viewBinding.messageInfoWorkOut.setVisibility(View.VISIBLE);
- }
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated) && mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
+ //鍙戠敓涓殑娑堟伅涓旀槸鏁呴殰鎵嶈鏄剧ず
+ viewBinding.messageInfoWorkOut.setVisibility(View.VISIBLE);
+ }
- if (UserConfigManage.getInstance().isBAccount()) {
- viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE);
+ if (UserConfigManage.getInstance().isBAccount()) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE);
+ } else {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
+ }
+
+ if (TextUtils.isEmpty(mMessageBean.getTitle())) {
+ viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDescription())) {
+ viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getRemark())) {
+ viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
+ viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
+ viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
+ }
+ if (TextUtils.isEmpty(mMessageBean.getPlan())) {
+ viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
+ }
+//
+// if (!TextUtils.isEmpty(mMessageBean.getPlan())) {
// viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
- } else {
+// } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) {
// viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);
- }
-
- if (TextUtils.isEmpty(mMessageBean.getTitle())) {
- viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
- }
- if (TextUtils.isEmpty(mMessageBean.getDescription())) {
- viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
- }
- if (TextUtils.isEmpty(mMessageBean.getRemark())) {
- viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
- }
- if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
- viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
- }
- if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
- viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
- }
- 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);
+// } 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);
+// }
+ } catch (Exception e) {
}
}
--
Gitblit v1.8.0