Merge branch 'wjc_new' into wxw_new

mac

2024-05-21 b73aeebc90267339a4851a68a6ebd396b7c66aea

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

@@ -61,7 +61,7 @@
                android:layout_toEndOf="@+id/message_search_iv"
                android:background="@null"
                android:gravity="start|center_vertical"
                android:hint="Search the power station"
                android:hint="@string/enter_alarm_name"
                android:textColor="@color/text_E6000000"
                android:textColorHint="@color/text_66000000"
                android:textSize="@dimen/text_14" />