From 048f5bd35c260e999b24af49bee7879ccb5790f9 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 25 十月 2024 14:29:38 +0800
Subject: [PATCH] 2024年10月25日14:29:36
---
app/src/main/res/layout/activity_message_info.xml | 4 +++-
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 13 +++----------
2 files changed, 6 insertions(+), 11 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 0fd7c11..f6a0433 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
@@ -232,16 +232,9 @@
stateStyle(viewBinding.messageInfoAlarmStateTv);
- if (mMessageBean.getStatus().equals(MessageStateType.processed)) {
- //宸茬粡瑙ｅ喅鎺夌殑闅愯棌
- viewBinding.messageInfoBackTv.setVisibility(View.GONE);
- viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
- } else {
- if (mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
- return;
- }
- viewBinding.messageInfoBackTv.setVisibility(View.GONE);
- viewBinding.messageInfoSolveTv.setVisibility(View.GONE);
+ if (mMessageBean.getStatus().equals(MessageStateType.untreated) && mMessageBean.getType().equals(MessageAlarmStateType.fault)) {
+ //鍙戠敓涓殑娑堟伅涓旀槸鏁呴殰鎵嶈鏄剧ず
+ viewBinding.messageInfoWorkOut.setVisibility(View.VISIBLE);
}
}
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index 1af0794..389d701 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -104,13 +104,15 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
+ android:id="@+id/message_info_work_out"
android:layout_width="match_parent"
android:layout_height="82dp"
+ android:background="@color/ffffff"
android:gravity="center"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
- android:background="@color/ffffff"
+ android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
--
Gitblit v1.8.0