Merge branch '1.4.4'

wjc

2 天以前 5b06b2b9917fbe0c35d21d1b2b54a7de1ec3da29

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

@@ -17,15 +17,21 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <ScrollView
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_marginTop="@dimen/dp_10"
        android:overScrollMode="never"
        app:layout_constraintBottom_toTopOf="@+id/message_info_work_out"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">

    <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_FF1C1C1E"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
            android:background="@color/text_FF1C1C1E">

        <LinearLayout
            android:id="@+id/ll"
@@ -66,75 +72,42 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/ll">

                <!--事件标题-->
            <include
                android:id="@+id/message_info_alarm_content_in"
                    android:id="@+id/message_info_event_title_in"
                layout="@layout/line_message_info" />
            <!--隔间+间隔线¬-->
            <LinearLayout
                android:layout_width="match_parent"
                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_event_content_in"
                    layout="@layout/line_message_info" />
                <!--备注-->
                <include
                    android:id="@+id/message_info_remark_in"
                    layout="@layout/line_message_info" />
                <!--报警设备-->
            <include
                android:id="@+id/message_info_alarm_device_in"
                layout="@layout/line_message_info" />

            <!--隔间+间隔线¬-->
            <LinearLayout
                android:layout_width="match_parent"
                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"
                layout="@layout/line_message_info"
                android:visibility="gone" />

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

                <!--电站位置-->
            <include
                android:id="@+id/message_info_power_station_location_in"
                layout="@layout/line_message_info" />
            <!--隔间+间隔线¬-->
            <LinearLayout
                android:layout_width="match_parent"
                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"
                layout="@layout/line_message_info" />

            <View
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_16" />
                <!--处理方案-->
                <include
                    android:id="@+id/message_info_alarm_treatment_options_in"
                    layout="@layout/line_message_info"
                    android:visibility="gone" />

        </LinearLayout>


    </androidx.constraintlayout.widget.ConstraintLayout>
    </ScrollView>

    <LinearLayout
        android:id="@+id/message_info_work_out"