Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

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

@@ -4,35 +4,18 @@
    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:id="@+id/start_tv"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        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"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.496"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintVertical_bias="0.093" />

    <ImageView
        android:id="@+id/as_regards_icon_iv"
        android:layout_width="53.5dp"
        android:layout_height="53.5dp"
        android:layout_marginTop="@dimen/dp_29"
        android:src="@drawable/logo"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/start_tv" />
    <!--    <ImageView-->
    <!--        android:id="@+id/as_regards_icon_iv"-->
    <!--        android:layout_width="72dp"-->
    <!--        android:layout_height="43dp"-->
    <!--        android:src="@drawable/start_icon"-->
    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
    <!--        app:layout_constraintEnd_toEndOf="parent"-->
    <!--        app:layout_constraintStart_toStartOf="parent"-->
    <!--        app:layout_constraintTop_toTopOf="parent" />-->


</androidx.constraintlayout.widget.ConstraintLayout>