From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/fragment_message.xml | 272 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 188 insertions(+), 84 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 1bca954..f73f310 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -4,132 +4,236 @@
android:id="@+id/message_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA">
-
+ android:background="@color/text_FF000000">
+ <!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/message_rl"
- android:layout_width="0dp"
- android:layout_height="@dimen/dp_52"
- android:background="@color/text_245EC3"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_38"
+ android:layout_marginEnd="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
+ <TextView
+ android:id="@+id/message_tab_nascent_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:text="@string/message_nascent"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_18" />
+
+ <TextView
+ android:id="@+id/message_tab_recover_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="36dp"
+ android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
+ android:text="@string/alarm_record"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14" />
+
+ <ImageView
+ android:id="@+id/all_clear_iv"
+ android:layout_width="@dimen/dp_33"
+ android:layout_height="@dimen/dp_33"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="@dimen/dp_5"
+ android:src="@drawable/clear_all" />
+
+
+ </RelativeLayout>
+
+ <LinearLayout
+ android:id="@+id/message_cl"
+ android:layout_width="match_parent"
+ android:layout_height="98dp"
+ android:layout_marginTop="@dimen/dp_10"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/message_rl">
+ <!--鎼滅储-->
+ <RelativeLayout
+ android:id="@+id/message_search_cl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_35"
+ android:layout_marginStart="@dimen/dp_13"
+ android:layout_marginEnd="@dimen/dp_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <RelativeLayout
+ android:id="@+id/message_search_click_cl"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="@dimen/dp_17"
+ android:background="@drawable/search_bj_ff1c1c1e">
+
+ <ImageView
+ android:id="@+id/power_station_search_iv"
+ android:layout_width="@dimen/dp_18"
+ android:layout_height="@dimen/dp_18"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_13"
+ android:src="@drawable/search_path" />
+
+ <TextView
+ android:id="@+id/power_station_search_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="@dimen/dp_11"
+ android:layout_toEndOf="@+id/power_station_search_iv"
+ android:text="@string/enter_alarm_name"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14" />
+ </RelativeLayout>
+
+
+ </RelativeLayout>
+ <!--鏉′欢绛涢��-->
<LinearLayout
android:id="@+id/message_tab_ll"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_17"
+ android:layout_height="@dimen/dp_62"
+ android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal">
- <!--鍙戠敓涓�-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_nascent_cl"
- android:layout_width="0dp"
+ <!--鍏ㄩ儴璁惧-->
+ <LinearLayout
+ android:id="@+id/message_tab_all_device_cl"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1">
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
<TextView
- android:id="@+id/message_tab_nascent_title_tv"
+ android:id="@+id/all_device_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_nascent"
- 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" />
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_device"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
<View
- android:id="@+id/line2_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_nascent_title_tv"
- app:layout_constraintStart_toStartOf="@+id/message_tab_nascent_title_tv" />
+ android:layout_width="@dimen/dp_5"
+ android:layout_height="match_parent" />
+ <ImageView
+ android:id="@+id/all_device_title_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
+ android:layout_marginStart="@dimen/dp_0"
+ android:background="@drawable/down" />
- </androidx.constraintlayout.widget.ConstraintLayout>
- <!--宸叉仮澶�-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_recover_cl"
+ </LinearLayout>
+
+ <View
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1">
+ android:layout_weight="1" />
+ <!--鍏ㄩ儴绛夌骇-->
+ <LinearLayout
+ android:id="@+id/message_tab_all_grade_cl"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="horizontal">
<TextView
- android:id="@+id/message_tab_recover_title_tv"
+ android:id="@+id/all_grade_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_recover"
- 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" />
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_grade"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
<View
- android:id="@+id/line3_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_recover_title_tv"
- app:layout_constraintStart_toStartOf="@+id/message_tab_recover_title_tv" />
+ android:layout_width="5dp"
+ android:layout_height="match_parent" />
+ <ImageView
+ android:id="@+id/all_grade_title_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
+ android:layout_marginStart="@dimen/dp_0"
+ android:background="@drawable/down" />
+ </LinearLayout>
- </androidx.constraintlayout.widget.ConstraintLayout>
- <!--鍏ㄩ儴-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_all_cl"
+ <View
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1">
+ android:layout_weight="1" />
+ <!--鍏ㄩ儴鏃堕棿-->
+ <LinearLayout
+ android:id="@+id/message_tab_all_time_cl"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical|end"
+ android:orientation="horizontal">
<TextView
- android:id="@+id/message_tab_all_title_tv"
+ android:id="@+id/all_time_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" />
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_time"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
<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" />
+ android:layout_width="@dimen/dp_5"
+ android:layout_height="match_parent" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
+ <ImageView
+ android:id="@+id/all_time_title_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
+ android:background="@drawable/down" />
+ </LinearLayout>
</LinearLayout>
- </RelativeLayout>
- <!--Fragment-->
- <androidx.fragment.app.FragmentContainerView
- android:id="@+id/message_fcv"
- android:layout_width="0dp"
+ </LinearLayout>
+
+
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ android:id="@+id/message_srl"
+ android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/message_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/message_cl">
+ <!-- android:clipToPadding="false"
+ android:paddingBottom="@dimen/dp_16"
+ 搴曢儴闂磋窛
+ -->
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/message_rcv"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+ <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+ <include
+ android:id="@+id/null_data_ic"
+ layout="@layout/null_data_view"
+ android:layout_width="match_parent"
+ android:layout_height="224dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/message_cl" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0