From e58e66125acccbd9b79573a520f9a6140bc47506 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十一月 2024 13:23:22 +0800
Subject: [PATCH] 2024年11月05日13:23:06

---
 app/src/main/res/layout/fragment_house_list.xml                       |  105 ++++++++------
 app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java              |    1 
 app/src/main/res/layout/fragment_message.xml                          |  208 +++++++++++++----------------
 app/src/main/res/layout/activity_message_center_list.xml              |   83 +++++------
 app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java |    2 
 5 files changed, 194 insertions(+), 205 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
index 89c0804..a05b852 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
@@ -342,7 +342,7 @@
         viewBinding.messageContentRl.setLayoutManager(mLayoutManager);
         viewBinding.messageContentRl.setAdapter(messageCenterListAdapter);
         messageCenterListAdapter.setList(mList);
-        this.nullDataUpdateUi();
+//        this.nullDataUpdateUi();
     }
 
     private void initData() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 51047b1..6ceafb4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -42,6 +42,7 @@
     public final static String UNI_EVENT_REPLY_DEVICE_MODEL = "uni_device_model";//璁惧妯″潡(澶х被)
     public final static String UNI_EVENT_REPLY_DEVICE_LIST = "list";//鏈湴閫嗗彉鍣ㄨ澶囧垪琛�
     public final static String UNI_EVENT_REPLY_DEVICE_NET_LIST = "net_list";//缃戠粶閫嗗彉鍣ㄨ澶囧垪琛�
+    public final static String UNI_EVENT_REPLY_DEVICE_CLOUD_LIST = "cloud_list";//鑾峰彇浜戠閫嗗彉鍣ㄨ澶囧垪琛�
     public final static String UNI_EVENT_REPLY_DEVICE_CHILD_LIST = "child_list";//閫嗗彉鍣ㄣ�愪笅鎸傘�戣澶囧垪琛�
     public final static String UNI_EVENT_REPLY_DEVICE_ADD = "add";//璁惧娣诲姞
     public final static String UNI_EVENT_REPLY_DEVICE_ADD_All = "add_all";//娣诲姞澶氫釜璁惧
diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml
index aa607e3..d8f69b9 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -28,11 +28,11 @@
             android:layout_marginEnd="@dimen/dp_16"
             android:orientation="horizontal">
             <!--鍏ㄩ儴璁惧-->
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <LinearLayout
                 android:id="@+id/message_tab_all_device_cl"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:gravity="center">
 
                 <TextView
                     android:id="@+id/all_device_title_tv"
@@ -56,13 +56,18 @@
                     app:layout_constraintTop_toTopOf="@+id/all_device_title_tv" />
 
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
-            <!--鍏ㄩ儴绛夌骇-->
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/message_tab_all_grade_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">
 
                 <TextView
                     android:id="@+id/all_grade_title_tv"
@@ -87,13 +92,18 @@
                     app:layout_constraintTop_toTopOf="@+id/all_grade_title_tv" />
 
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
-            <!--鍏ㄩ儴鏃堕棿-->
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/message_tab_all_time_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_time_cl"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center">
 
                 <TextView
                     android:id="@+id/all_time_title_tv"
@@ -117,7 +127,7 @@
                     app:layout_constraintTop_toTopOf="@+id/all_time_title_tv" />
 
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            </LinearLayout>
         </LinearLayout>
     </RelativeLayout>
 
@@ -150,7 +160,7 @@
         app:layout_constraintTop_toBottomOf="@+id/message_rl" />
 
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:id="@+id/message_bottom_cl"
         android:layout_width="match_parent"
         android:layout_height="64dp"
@@ -162,16 +172,15 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_47"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            android:orientation="horizontal">
             <!--璁惧鎶ヨ-->
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <LinearLayout
                 android:id="@+id/message_bottom_alarm_device_cl"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/message_bottom_alarm_device_title_tv"
@@ -182,29 +191,25 @@
                     android:text="@string/alarm_device"
                     android:textColor="@color/text_191919"
                     android:textSize="@dimen/text_16"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    android:textStyle="bold" />
 
                 <View
                     android:id="@+id/message_bottom_alarm_device_line_v"
                     android:layout_width="18dp"
                     android:layout_height="3dp"
                     android:layout_marginTop="4.5dp"
-                    android:background="@drawable/line_view"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_device_title_tv"
-                    app:layout_constraintStart_toStartOf="@+id/message_bottom_alarm_device_title_tv" />
+                    android:background="@drawable/line_view" />
 
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            </LinearLayout>
             <!--鎶ヨ璁板綍-->
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <LinearLayout
                 android:id="@+id/message_bottom_alarm_record_cl"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/message_bottom_alarm_record_title_tv"
@@ -214,26 +219,20 @@
                     android:gravity="center"
                     android:text="@string/alarm_record"
                     android:textColor="@color/text_191919"
-                    android:textSize="@dimen/text_16"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    android:textSize="@dimen/text_16" />
 
                 <View
                     android:id="@+id/message_bottom_alarm_record_line_v"
                     android:layout_width="@dimen/dp_18"
                     android:layout_height="3dp"
                     android:layout_marginTop="4.5dp"
-                    android:background="@drawable/line_view"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_record_title_tv"
-                    app:layout_constraintStart_toStartOf="@+id/message_bottom_alarm_record_title_tv" />
+                    android:background="@drawable/line_view" />
 
 
-            </androidx.constraintlayout.widget.ConstraintLayout>
+            </LinearLayout>
         </LinearLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 053fc29..9f0f42b 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -63,7 +63,7 @@
 
     </RelativeLayout>
     <!--鐢电珯鏍囩-->
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/power_station_label_parent"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -77,7 +77,10 @@
             android:id="@+id/power_station_label_top_cl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_13">
+            android:layout_marginTop="@dimen/dp_13"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
             <!--鎼滅储-->
             <RelativeLayout
                 android:id="@+id/power_station_search_cl"
@@ -161,14 +164,14 @@
 
             </LinearLayout>
 
-
             <!--鍗囧簭闄嶅簭鍔熻兘-->
             <LinearLayout
                 android:id="@+id/ascending_order_descending_order_parent_ll"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="@dimen/dp_17"
                 android:layout_marginStart="@dimen/dp_16"
                 android:layout_marginTop="@dimen/dp_21"
+                android:layout_marginEnd="@dimen/dp_12"
                 android:orientation="horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -178,6 +181,7 @@
                     android:id="@+id/station_name_rl"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:gravity="start"
                     android:orientation="horizontal">
 
                     <TextView
@@ -197,17 +201,19 @@
                         android:layout_toEndOf="@+id/station_name_tv"
                         android:background="@drawable/ascending_descending_order_select" />
 
-                    <View
-                        android:layout_width="@dimen/dp_16"
-                        android:layout_height="match_parent"
-                        android:layout_toEndOf="@+id/station_name_iv" />
+
                 </RelativeLayout>
 
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1" />
 
                 <RelativeLayout
                     android:id="@+id/station_power_rl"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_gravity="center_horizontal"
                     android:orientation="horizontal">
 
                     <TextView
@@ -225,17 +231,18 @@
                         android:layout_toEndOf="@+id/station_power_tv"
                         android:background="@drawable/ascending_descending_order_select" />
 
-                    <View
-                        android:layout_width="@dimen/dp_16"
-                        android:layout_height="match_parent"
-                        android:layout_toEndOf="@+id/station_power_iv" />
                 </RelativeLayout>
 
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1" />
 
                 <RelativeLayout
                     android:id="@+id/station_day_rl"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_gravity="center_horizontal"
                     android:orientation="horizontal">
 
                     <TextView
@@ -253,17 +260,19 @@
                         android:layout_toEndOf="@+id/station_day_tv"
                         android:background="@drawable/ascending_descending_order_select" />
 
-                    <View
-                        android:layout_width="@dimen/dp_16"
-                        android:layout_height="match_parent"
-                        android:layout_toEndOf="@+id/station_day_iv" />
+
                 </RelativeLayout>
 
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1" />
 
                 <RelativeLayout
                     android:id="@+id/station_month_rl"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:gravity="end"
                     android:orientation="horizontal">
 
                     <TextView
@@ -282,7 +291,6 @@
                         android:background="@drawable/ascending_descending_order_select" />
                 </RelativeLayout>
 
-
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -290,7 +298,7 @@
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/fragment_house_srl"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:layout_marginTop="@dimen/dp_21"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -302,12 +310,23 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+        <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+        <include
+            android:id="@+id/home_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/power_station_label_top_cl" />
 
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <!--璁惧鏍囩-->
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/device_label_parent"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -322,7 +341,10 @@
             android:id="@+id/device_label_top_cl"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:layout_marginTop="@dimen/dp_13">
+            android:layout_marginTop="@dimen/dp_13"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
             <!--鎼滅储-->
             <RelativeLayout
                 android:id="@+id/device_search_cl"
@@ -362,11 +384,11 @@
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/fragment_device_srl"
             android:layout_width="match_parent"
-            android:layout_height="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/power_station_label_top_cl">
+            app:layout_constraintTop_toBottomOf="@+id/device_label_top_cl">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/fragment_device_srl_list_rc"
@@ -376,32 +398,21 @@
                 android:paddingBottom="@dimen/dp_16" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+        <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+        <include
+            android:id="@+id/device_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/device_label_top_cl"
 
-    </LinearLayout>
+            />
 
-    <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
-    <include
-        android:id="@+id/home_null_data_ic"
-        layout="@layout/null_data_view"
-        android:layout_width="match_parent"
-        android:layout_height="224dp"
-        android:layout_marginBottom="@dimen/dp_202"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
-    <include
-        android:id="@+id/device_null_data_ic"
-        layout="@layout/null_data_view"
-        android:layout_width="match_parent"
-        android:layout_height="224dp"
-        android:layout_marginBottom="229dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 20feb3f..beb5589 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -54,11 +54,12 @@
 
     </RelativeLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:id="@+id/message_cl"
         android:layout_width="match_parent"
         android:layout_height="98dp"
         android:layout_marginTop="@dimen/dp_13"
+        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/message_rl">
@@ -105,130 +106,107 @@
 
         </RelativeLayout>
         <!--鏉′欢绛涢��-->
-        <RelativeLayout
-            android:id="@+id/message_condition_screening_rl"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:id="@+id/message_tab_ll"
+            android:layout_width="match_parent"
             android:layout_height="@dimen/dp_62"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/message_search_cl">
-
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:orientation="horizontal">
+            <!--鍏ㄩ儴璁惧-->
             <LinearLayout
-                android:id="@+id/message_tab_ll"
-                android:layout_width="match_parent"
+                android:id="@+id/message_tab_all_device_cl"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/dp_16"
-                android:layout_marginEnd="@dimen/dp_16"
+                android:gravity="center_vertical"
                 android:orientation="horizontal">
-                <!--鍏ㄩ儴璁惧-->
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/message_tab_all_device_cl"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        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_E6000000"
+                    android:textSize="@dimen/text_14" />
 
-                        <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_E6000000"
-                            android:textSize="@dimen/text_14" />
+                <View
+                    android:layout_width="@dimen/dp_5"
+                    android:layout_height="match_parent" />
 
-                        <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" />
 
-                        <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>
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-                <!--鍏ㄩ儴绛夌骇-->
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/message_tab_all_grade_cl"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        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_E6000000"
-                            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>
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-                <!--鍏ㄩ儴鏃堕棿-->
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/message_tab_all_time_cl"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        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_E6000000"
-                            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>
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
             </LinearLayout>
-        </RelativeLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <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_E6000000"
+                    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_E6000000"
+                    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>
 
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout

--
Gitblit v1.8.0