From 32af30cdbb9e750a1bd059cacf2d8c8c37776dad Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:48:57 +0800
Subject: [PATCH] 2025年07月31日14:48:56

---
 app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 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 e3807de..b4a9ca8 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
@@ -112,6 +112,23 @@
                             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 (mMessageBean.getStatus().equals(MessageStateType.processed)) {
                             //宸茬粡瑙e喅鎺夌殑闅愯棌
                             viewBinding.messageInfoBackTv.setVisibility(View.GONE);
@@ -229,16 +246,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());
@@ -283,6 +300,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);
+        }
     }
 
 

--
Gitblit v1.8.0