From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'
---
app/src/main/res/layout/fragment_message.xml | 243 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 239 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index fc3fa41..e181a31 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -1,9 +1,244 @@
<?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">
-<!-- <include-->
-<!-- android:id="@+id/toolbar_top_fragment_me_rl"-->
-<!-- layout="@layout/toolbar_top_view_52" />-->
+ android:layout_height="match_parent"
+ android:background="@color/text_FF000000">
+ <!--澶撮儴鏍囩-->
+ <RelativeLayout
+ android:id="@+id/message_rl"
+ 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="77dp"
+ 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="@dimen/dp_22"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:orientation="horizontal">
+ <!--鍏ㄩ儴璁惧-->
+ <LinearLayout
+ android:id="@+id/message_tab_all_device_cl"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/all_device_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_device"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <View
+ 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" />
+
+ </LinearLayout>
+
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ 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/all_grade_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_grade"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <View
+ 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>
+
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ 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/all_time_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_time"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+
+ <View
+ android:layout_width="@dimen/dp_5"
+ android:layout_height="match_parent" />
+
+ <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>
+
+ </LinearLayout>
+
+
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
+ android:id="@+id/message_srl"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginTop="@dimen/dp_10"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ 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"
+ android:clipToPadding="false"
+ android:paddingBottom="@dimen/dp_10"
+ />
+ </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
+
+ <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+ <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