From d830fef6a2bc2ab061e6ac2b423c4a49dda3cf21 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 06 十二月 2023 18:08:26 +0800
Subject: [PATCH] 2023年12月06日18:08:20
---
app/src/main/res/layout/fragment_message.xml | 127 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 44 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 93cb1fd..d2d84c8 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -21,52 +21,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_nascent_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_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_device_alert"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_16"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <View
- android:id="@+id/line1_v"
- android:layout_width="0dp"
- android:layout_height="3dp"
- 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" />
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
- <!--骞冲彴鎺ㄩ��-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_platform_push_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: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 +49,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 +81,82 @@
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>
+ <!--鍏ㄩ儴-->
+ <androidx.constraintlayout.widget.ConstraintLayout
+ 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_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_all"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:id="@+id/line1_v"
+ android:layout_width="0dp"
+ android:layout_height="3dp"
+ android:layout_marginTop="@dimen/dp_11"
+ android:background="@color/text_FFFFFFFF"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="@+id/message_tab_all_title_tv"
+ app:layout_constraintStart_toStartOf="@+id/message_tab_all_title_tv" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</RelativeLayout>
+
+ <!--鍙戠敓涓璅ragment-->
+ <androidx.fragment.app.FragmentContainerView
+
+ android:id="@+id/message_nascent_fcv"
+ android:name="com.hdl.photovoltaic.ui.message.NascentMessageFragment"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ 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="match_parent"
+ android:layout_height="0dp"
+ 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" />
+ <!--鍏ㄩ儴Fragment-->
+ <androidx.fragment.app.FragmentContainerView
+
+ android:id="@+id/message_all_fcv"
+ android:name="com.hdl.photovoltaic.ui.message.AllMessageFragment"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ 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