Merge branch 'wjc' into dev-hxb

mac

2024-02-20 dc8ae12444d1d887394eb525e2b80dd120dc4c87

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

@@ -4,12 +4,16 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFFFFFFF"
    tools:context="com.hdl.photovoltaic.ui.StartActivity">

    <TextView
        android:layout_width="wrap_content"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:text="欢迎打开智慧能源APP"
        android:layout_marginStart="@dimen/dp_5"
        android:layout_marginEnd="@dimen/dp_5"
        android:gravity="center"
        android:text="@string/welcome_to_the_smart_energy_app"
        android:textColor="@color/text_245EC3"
        android:textSize="@dimen/text_28"
        app:layout_constraintBottom_toBottomOf="parent"