Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

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

@@ -71,14 +71,16 @@
            <View
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_31" />

            <!--产品说硬件没做 隐藏掉 2024年05月28日13:46:53-->
            <include
                android:id="@+id/message_info_alarm_range_in"
                layout="@layout/line_message_info" />
                layout="@layout/line_message_info"
                android:visibility="gone" />

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

            <include
                android:id="@+id/message_info_power_station_location_in"