Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/res/layout/activity_message_center_list.xml

@@ -39,7 +39,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_device"
                    android:textColor="@color/text_90000000"
                    android:textColor="@color/text_E6000000"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
@@ -69,7 +69,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_grade"
                    android:textColor="@color/text_90000000"
                    android:textColor="@color/text_E6000000"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
@@ -81,7 +81,7 @@
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_10"
                    android:layout_marginStart="@dimen/dp_7"
                    android:background="@drawable/up"
                    android:background="@drawable/down"
                    app:layout_constraintBottom_toBottomOf="@+id/all_grade_title_tv"
                    app:layout_constraintStart_toEndOf="@+id/all_grade_title_tv"
                    app:layout_constraintTop_toTopOf="@+id/all_grade_title_tv" />
@@ -101,7 +101,7 @@
                    android:layout_height="@dimen/dp_20"
                    android:layout_marginEnd="@dimen/dp_7"
                    android:text="@string/alarm_all_time"
                    android:textColor="@color/text_90000000"
                    android:textColor="@color/text_E6000000"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toStartOf="@+id/all_time_title_iv"
@@ -111,7 +111,7 @@
                    android:id="@+id/all_time_title_iv"
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_10"
                    android:background="@drawable/up"
                    android:background="@drawable/down"
                    app:layout_constraintBottom_toBottomOf="@+id/all_time_title_tv"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintTop_toTopOf="@+id/all_time_title_tv" />