Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,73 +4,99 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_F5F7FA"
    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_13"
        android:background="@color/text_FFFFFFFF"
        android:layout_marginTop="@dimen/dp_10"
        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_home_name_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_21"
        <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="@dimen/dp_13"
            android:gravity="center"
            android:textColor="@color/text_030D1C"
            android:textSize="@dimen/text_15"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/message_info_alarm_state_tv"
            android:layout_width="wrap_content"
            android:layout_height="32.5dp"
            android:background="@drawable/alarm_ffb300"
            android:gravity="center"
            android:paddingStart="@dimen/dp_12"
            android:paddingEnd="@dimen/dp_12"
            android:text="@string/message_alarm"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_12"
            android:layout_marginTop="@dimen/dp_16"
            android:gravity="center_vertical"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            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"
                layout="@layout/line_message_info" />

            <View
            <!--隔间+间隔线¬-->
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_31" />
                android:layout_height="@dimen/dp_32"
                android:gravity="center">

                <View
                    android:layout_width="match_parent"
                    android:layout_height="0.5dp"
                    android:background="@color/text_1AFFFFFF" />
            </LinearLayout>

            <include
                android:id="@+id/message_info_alarm_device_in"
                layout="@layout/line_message_info" />

            <View
            <!--隔间+间隔线¬-->
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_31" />
                android:layout_height="@dimen/dp_32"
                android:gravity="center">

                <View
                    android:layout_width="match_parent"
                    android:layout_height="0.5dp"
                    android:background="@color/text_1AFFFFFF" />
            </LinearLayout>
            <!--产品说硬件没做 隐藏掉 2024年05月28日13:46:53-->
            <include
                android:id="@+id/message_info_alarm_range_in"
@@ -79,16 +105,23 @@

            <View
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_31"
                android:layout_height="@dimen/dp_33"
                android:visibility="gone" />

            <include
                android:id="@+id/message_info_power_station_location_in"
                layout="@layout/line_message_info" />

            <View
            <!--隔间+间隔线¬-->
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_31" />
                android:layout_height="@dimen/dp_32"
                android:gravity="center">

                <View
                    android:layout_width="match_parent"
                    android:layout_height="0.5dp"
                    android:background="@color/text_1AFFFFFF" />
            </LinearLayout>

            <include
                android:id="@+id/message_info_alarm_time_in"
@@ -96,41 +129,50 @@

            <View
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_31" />
                android:layout_height="@dimen/dp_16" />

        </LinearLayout>


    </androidx.constraintlayout.widget.ConstraintLayout>


    <TextView
        android:id="@+id/message_info_back_tv"
        android:layout_width="157.5dp"
        android:layout_height="@dimen/dp_52"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginBottom="54.5dp"
        android:background="@drawable/fillet_line_00000000"
    <LinearLayout
        android:id="@+id/message_info_work_out"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:gravity="center"
        android:text="@string/message_alarm_details_back"
        android:textColor="@color/text_FF245EC3"
        android:textSize="@dimen/text_18"
        android:orientation="horizontal"
        android:paddingStart="@dimen/dp_20"
        android:paddingEnd="@dimen/dp_20"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent" />
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

    <TextView
        android:id="@+id/message_info_solve_tv"
        android:layout_width="157.5dp"
        android:layout_height="@dimen/dp_52"
        android:layout_marginEnd="@dimen/dp_20"
        android:layout_marginBottom="54.5dp"
        android:background="@drawable/checked"
        android:gravity="center"
        android:text="@string/message_alarm_details_resolved"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="@dimen/text_18"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent" />
        <TextView
            android:id="@+id/message_info_back_tv"
            android:layout_width="157.5dp"
            android:layout_height="@dimen/dp_52"
            android:background="@drawable/bj_ff555859_no"
            android:gravity="center"
            android:text="@string/message_alarm_details_back"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />

        <View
            android:layout_width="@dimen/dp_20"
            android:layout_height="match_parent" />

        <TextView
            android:id="@+id/message_info_solve_tv"
            android:layout_width="157.5dp"
            android:layout_height="@dimen/dp_52"
            android:background="@drawable/bj_ff39383d"
            android:gravity="center"
            android:text="@string/message_alarm_details_resolved"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />
    </LinearLayout>


</androidx.constraintlayout.widget.ConstraintLayout>