Merge branch '1.5.1' into dev

wjc

2025-02-07 a1c880c476327032fe174af8c80d6f78a590dae9

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

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.newC.MessageCenterList">

    <include
@@ -161,7 +161,7 @@
        android:id="@+id/message_bottom_cl"
        android:layout_width="match_parent"
        android:layout_height="64dp"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF1C1C1E"
        android:orientation="vertical"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -182,13 +182,13 @@
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                android:orientation="vertical">

                <TextView
                    android:id="@+id/message_bottom_alarm_device_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:layout_gravity="center"
                    android:layout_marginTop="@dimen/dp_16"
                    android:gravity="center"
                    android:text="@string/alarm_device"
@@ -199,6 +199,7 @@
                    android:id="@+id/message_bottom_alarm_device_line_v"
                    android:layout_width="18dp"
                    android:layout_height="3dp"
                    android:layout_gravity="center"
                    android:layout_marginTop="4.5dp"
                    android:background="@drawable/line_view" />

@@ -210,13 +211,13 @@
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                android:orientation="vertical">

                <TextView
                    android:id="@+id/message_bottom_alarm_record_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:layout_gravity="center"
                    android:layout_marginTop="@dimen/dp_16"
                    android:gravity="center"
                    android:text="@string/alarm_record"
@@ -227,6 +228,7 @@
                    android:id="@+id/message_bottom_alarm_record_line_v"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="3dp"
                    android:layout_gravity="center"
                    android:layout_marginTop="4.5dp"
                    android:background="@drawable/line_view" />