Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -4,60 +4,68 @@
    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.message.MessageInfoActivity">

    <include

        android:id="@+id/toolbar_top_in"
        layout="@layout/toolbar_top_view_52" />
        android:id="@+id/toolbar_top_rl"
        layout="@layout/toolbar_top_view_44"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/message_info_cl"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_10"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF1C1C1E"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_in">
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">


        <TextView
            android:id="@+id/message_info_alarm_state_tv"
            android:layout_width="7dp"
            android:layout_height="7dp"
        <LinearLayout
            android:id="@+id/ll"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="22.5dp"
            android:background="@drawable/device_state_ff38c494"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/message_info_home_name_tv"
            android:layout_width="0dp"
            android:layout_height="22.5dp"
            android:layout_marginStart="6dp"
            android:layout_marginTop="16dp"
            android:layout_marginEnd="@dimen/dp_5"
            android:ellipsize="end"
            android:layout_marginTop="@dimen/dp_16"
            android:gravity="center_vertical"
            android:singleLine="true"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_16"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toEndOf="@+id/message_info_alarm_state_tv"
            app:layout_constraintTop_toTopOf="parent" />
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent">

            <TextView
                android:id="@+id/message_info_alarm_state_tv"
                android:layout_width="7dp"
                android:layout_height="7dp"
                android:background="@drawable/device_state_ffb9b9b9" />

            <TextView
                android:id="@+id/message_info_home_name_tv"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:ellipsize="end"
                android:gravity="center_vertical|start"
                android:paddingStart="@dimen/dp_6"
                android:paddingEnd="@dimen/dp_20"
                android:singleLine="true"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_16" />
        </LinearLayout>

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="@dimen/dp_32"
            android:layout_marginTop="@dimen/dp_20"
            android:orientation="vertical"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/message_info_alarm_state_tv">
            app:layout_constraintTop_toBottomOf="@+id/ll">

            <include
                android:id="@+id/message_info_alarm_content_in"
@@ -132,7 +140,6 @@
        android:id="@+id/message_info_work_out"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:background="@color/ffffff"
        android:gravity="center"
        android:orientation="horizontal"
        android:paddingStart="@dimen/dp_20"
@@ -146,11 +153,11 @@
            android:id="@+id/message_info_back_tv"
            android:layout_width="157.5dp"
            android:layout_height="@dimen/dp_52"
            android:background="@drawable/fillet_line_00000000"
            android:background="@drawable/bj_ff555859_no"
            android:gravity="center"
            android:text="@string/message_alarm_details_back"
            android:textColor="@color/text_FF245EC3"
            android:textSize="@dimen/text_18" />
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />

        <View
            android:layout_width="@dimen/dp_20"
@@ -160,11 +167,11 @@
            android:id="@+id/message_info_solve_tv"
            android:layout_width="157.5dp"
            android:layout_height="@dimen/dp_52"
            android:background="@drawable/checked"
            android:background="@drawable/bj_ff39383d"
            android:gravity="center"
            android:text="@string/message_alarm_details_resolved"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_18" />
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />
    </LinearLayout>