From 4cd6e3cea73a57f9a4c73232b27c9054ac599b05 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 12 十二月 2023 14:51:03 +0800
Subject: [PATCH] 2023年12月12日14:50:56
---
app/src/main/res/layout/fragment_message.xml | 82 +++++++++++++++++++++++++++++++---------
1 files changed, 63 insertions(+), 19 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 93cb1fd..145df16 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/message_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/text_F5F7FA">
<RelativeLayout
android:id="@+id/message_rl"
- android:layout_width="match_parent"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_52"
android:background="@color/text_245EC3"
app:layout_constraintEnd_toEndOf="parent"
@@ -21,20 +22,21 @@
android:layout_marginStart="@dimen/dp_17"
android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal">
- <!--璁惧璀︽姤-->
+
+ <!--鍏ㄩ儴-->
<androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_device_alert_cl"
+ android:id="@+id/message_tab_all_cl"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
- android:id="@+id/message_tab_device_alert_title_tv"
+ android:id="@+id/message_tab_all_title_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_16"
android:gravity="center"
- android:text="@string/message_device_alert"
+ android:text="@string/message_all"
android:textColor="@color/text_FFFFFFFF"
android:textSize="@dimen/text_16"
app:layout_constraintEnd_toEndOf="parent"
@@ -48,25 +50,25 @@
android:layout_marginTop="@dimen/dp_11"
android:background="@color/text_FFFFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@+id/message_tab_device_alert_title_tv"
- app:layout_constraintStart_toStartOf="@+id/message_tab_device_alert_title_tv" />
+ app:layout_constraintEnd_toEndOf="@+id/message_tab_all_title_tv"
+ app:layout_constraintStart_toStartOf="@+id/message_tab_all_title_tv" />
</androidx.constraintlayout.widget.ConstraintLayout>
- <!--骞冲彴鎺ㄩ��-->
+ <!--鍙戠敓涓�-->
<androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_platform_push_cl"
+ android:id="@+id/message_tab_nascent_cl"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
- android:id="@+id/message_tab_platform_push_title_tv"
+ android:id="@+id/message_tab_nascent_title_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_16"
android:gravity="center"
- android:text="@string/message_platform_push"
+ android:text="@string/message_nascent"
android:textColor="@color/text_FFFFFFFF"
android:textSize="@dimen/text_16"
app:layout_constraintEnd_toEndOf="parent"
@@ -80,25 +82,25 @@
android:layout_marginTop="@dimen/dp_11"
android:background="@color/text_FFFFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@+id/message_tab_platform_push_title_tv"
- app:layout_constraintStart_toStartOf="@+id/message_tab_platform_push_title_tv" />
+ app:layout_constraintEnd_toEndOf="@+id/message_tab_nascent_title_tv"
+ app:layout_constraintStart_toStartOf="@+id/message_tab_nascent_title_tv" />
</androidx.constraintlayout.widget.ConstraintLayout>
- <!--璁惧鏃ュ織-->
+ <!--宸叉仮澶�-->
<androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_device_log_cl"
+ android:id="@+id/message_tab_recover_cl"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
- android:id="@+id/message_tab_device_log_title_tv"
+ android:id="@+id/message_tab_recover_title_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_16"
android:gravity="center"
- android:text="@string/message_device_log"
+ android:text="@string/message_recover"
android:textColor="@color/text_FFFFFFFF"
android:textSize="@dimen/text_16"
app:layout_constraintEnd_toEndOf="parent"
@@ -112,12 +114,54 @@
android:layout_marginTop="@dimen/dp_11"
android:background="@color/text_FFFFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@+id/message_tab_device_log_title_tv"
- app:layout_constraintStart_toStartOf="@+id/message_tab_device_log_title_tv" />
+ app:layout_constraintEnd_toEndOf="@+id/message_tab_recover_title_tv"
+ app:layout_constraintStart_toStartOf="@+id/message_tab_recover_title_tv" />
</androidx.constraintlayout.widget.ConstraintLayout>
+
</LinearLayout>
</RelativeLayout>
+
+ <!--鍏ㄩ儴Fragment-->
+ <androidx.fragment.app.FragmentContainerView
+ android:id="@+id/message_all_fcv"
+ android:name="com.hdl.photovoltaic.ui.message.AllMessageFragment"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:tag="message_all_rcv"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/message_rl" />
+ <!--鍙戠敓涓璅ragment-->
+ <androidx.fragment.app.FragmentContainerView
+
+ android:id="@+id/message_nascent_fcv"
+ android:name="com.hdl.photovoltaic.ui.message.NascentMessageFragment"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:tag="message_nascent_rcv"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/message_rl" />
+ <!--宸叉仮澶岶ragment-->
+ <androidx.fragment.app.FragmentContainerView
+
+ android:id="@+id/message_recover_fcv"
+ android:name="com.hdl.photovoltaic.ui.message.RecoverMessageFragment"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:tag="message_recover_rcv"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/message_rl" />
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0