Merge branch 'wjc_new' into lwj_new

mac

2024-05-21 f538aef48a6eda583b88cb5d5670fd7f2ed82135

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

@@ -58,7 +58,7 @@
        android:layout_height="@dimen/dp_39"
        android:layout_marginTop="@dimen/dp_40"
        android:text="@string/home_login_hdl_stored_energy"
        android:textColor="@color/text_90000000"
        android:textColor="@color/text_E6000000"
        android:textSize="@dimen/text_28"
        android:textStyle="bold"
        app:layout_constraintStart_toStartOf="@+id/home_login_server_iv"