Merge branch 'feature/hxb' into develop_new

hxb

2024-05-22 2c62031554742600f735baf74ea6a5776a1093a9

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

@@ -101,7 +101,7 @@
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/power_station_search_iv"
                    android:text="Search the message"
                    android:text="@string/enter_alarm_name"
                    android:textColor="@color/text_66000000"
                    android:textSize="@dimen/text_14" />
            </RelativeLayout>