Merge branch 'heads/v1.4.2'

mac

2024-10-21 8f5fe758de9464a5118bd306814c170b768fe695

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

@@ -5,44 +5,67 @@
    android:id="@+id/home_login_parent_cl"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/logo_bj"

    android:background="@color/text_FFFFFFFF"
    tools:context="com.hdl.photovoltaic.ui.LoginActivity">


    <TextView
        android:id="@+id/home_login_language_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_63"
        android:src="@drawable/language_pull_down"
        android:text="@string/home_login_chinese"
        android:textColor="@color/text_FF000000"
        android:textSize="@dimen/text_14"
    <ImageView
        android:layout_width="0dp"
        android:layout_height="612dp"
        android:background="@drawable/logo_bj"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <ImageView
        android:id="@+id/home_login_down_iv"
        android:layout_width="@dimen/dp_11"
        android:layout_height="@dimen/dp_7"
        android:layout_marginStart="5.5dp"
        android:src="@drawable/language_pull_down"
        app:layout_constraintBottom_toBottomOf="@+id/home_login_language_tv"
        app:layout_constraintStart_toEndOf="@+id/home_login_language_tv"
        app:layout_constraintTop_toTopOf="@+id/home_login_language_tv" />

    <ImageView
        android:id="@+id/home_login_more_iv"
        android:layout_width="@dimen/dp_20"
    <LinearLayout
        android:id="@+id/home_login_language_ll"
        android:layout_width="@dimen/dp_140"
        android:layout_height="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_20"
        android:src="@drawable/more"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="@+id/home_login_language_tv"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toTopOf="@+id/home_login_language_tv" />
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_60"
        android:gravity="center_vertical"
        android:orientation="horizontal"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

        <TextView
            android:id="@+id/home_login_language_tv"
            android:layout_width="@dimen/dp_58"
            android:layout_height="wrap_content"
            android:src="@drawable/language_pull_down"
            android:text="@string/home_login_chinese"
            android:textColor="@color/text_FF000000"
            android:textSize="@dimen/text_14" />

        <ImageView
            android:id="@+id/home_login_down_iv"
            android:layout_width="11dp"
            android:layout_height="7dp"
            android:src="@drawable/language_pull_down" />
    </LinearLayout>

    <!--    <TextView-->
    <!--        android:id="@+id/home_login_language_tv"-->
    <!--        android:layout_width="wrap_content"-->
    <!--        android:layout_height="@dimen/dp_20"-->
    <!--        android:layout_marginStart="@dimen/dp_20"-->
    <!--        android:layout_marginTop="@dimen/dp_63"-->
    <!--        android:src="@drawable/language_pull_down"-->
    <!--        android:text="@string/home_login_chinese"-->
    <!--        android:textColor="@color/text_FF000000"-->
    <!--        android:textSize="@dimen/text_14"-->
    <!--        app:layout_constraintStart_toStartOf="parent"-->
    <!--        app:layout_constraintTop_toTopOf="parent" />-->

    <!--    <ImageView-->
    <!--        android:id="@+id/home_login_down_iv"-->
    <!--        android:layout_width="11dp"-->
    <!--        android:layout_height="7dp"-->
    <!--        android:layout_marginStart="81.5dp"-->
    <!--        android:src="@drawable/language_pull_down"-->
    <!--        app:layout_constraintBottom_toBottomOf="@+id/home_login_language_tv"-->
    <!--        app:layout_constraintStart_toStartOf="parent"-->
    <!--        app:layout_constraintTop_toTopOf="@+id/home_login_language_tv" />-->


    <TextView
        android:id="@+id/home_login_title_tv"
@@ -53,15 +76,15 @@
        android:textColor="@color/text_E6000000"
        android:textSize="@dimen/text_28"
        android:textStyle="bold"
        app:layout_constraintStart_toStartOf="@+id/home_login_language_tv"
        app:layout_constraintTop_toBottomOf="@+id/home_login_language_tv" />
        app:layout_constraintStart_toStartOf="@+id/home_login_language_ll"
        app:layout_constraintTop_toBottomOf="@+id/home_login_language_ll" />

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/home_login_check_b_c_cl"
        android:layout_width="wrap_content"
        android:layout_height="20dp"
        android:layout_marginTop="@dimen/dp_56"
        app:layout_constraintStart_toStartOf="@+id/home_login_language_tv"
        app:layout_constraintStart_toStartOf="@+id/home_login_language_ll"
        app:layout_constraintTop_toBottomOf="@+id/home_login_title_tv">

        <ImageView
@@ -183,36 +206,38 @@

    <TextView
        android:id="@+id/home_login_password_text_error_tv"
        android:layout_width="wrap_content"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginTop="2dp"
        android:layout_marginEnd="@dimen/dp_20"
        android:textColor="@color/text_D34545"
        android:textSize="12sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />

    <!--注册-->
    <TextView
        android:id="@+id/home_login_register_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_24"
        android:text="@string/home_login_register"
        android:textColor="@color/text_245EC3"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />

        app:layout_constraintTop_toTopOf="@+id/home_login_forget_password_tv" />
    <!--忘记密码-->
    <TextView
        android:id="@+id/home_login_forget_password_tv"

        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_24"
        android:text="@string/home_login_forget_password"
        android:textColor="@color/text_245EC3"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toTopOf="@+id/home_login_register_tv" />
        app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
    <!--登录-->

    <TextView
        android:id="@+id/home_login_tv"
        android:layout_width="0dp"
@@ -225,7 +250,6 @@
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
        app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
        app:layout_constraintHorizontal_bias="0.0"
        app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />

@@ -242,30 +266,41 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/home_login_tv" />

    <ImageView
        android:id="@+id/home_login_privacy_check_iv"
        android:layout_width="@dimen/dp_20"
        android:layout_height="@dimen/dp_20"
        android:layout_marginStart="@dimen/dp_42"
        android:layout_marginBottom="@dimen/dp_62"
        android:background="@drawable/yesandnoselected"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintBottom_toBottomOf="parent" />

    <TextView
        android:id="@+id/home_login_privacy_tv"
        android:layout_width="287dp"
        android:layout_height="@dimen/dp_40"
        android:layout_marginStart="@dimen/dp_6"
        android:gravity="start|center"
        android:singleLine="false"
        android:tag="click"
        android:text="@string/home_login_consent_service_agreement"
        android:textColor="@color/text_FF000000"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="@+id/home_login_privacy_check_iv"
        app:layout_constraintStart_toEndOf="@+id/home_login_privacy_check_iv"
        app:layout_constraintTop_toTopOf="@+id/home_login_privacy_check_iv" />
    <LinearLayout
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_20"
        android:layout_marginBottom="@dimen/dp_32"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <ImageView
            android:id="@+id/home_login_privacy_check_iv"
            android:layout_width="@dimen/dp_20"
            android:layout_height="@dimen/dp_20"
            android:background="@drawable/yesandnoselected" />

        <View
            android:layout_width="@dimen/dp_6"
            android:layout_height="match_parent" />

        <TextView
            android:id="@+id/home_login_privacy_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_40"
            android:layout_marginStart="@dimen/dp_6"
            android:gravity="start|center"
            android:singleLine="false"
            android:tag="click"
            android:text="@string/home_login_consent_service_agreement"
            android:textColor="@color/text_FF000000"
            android:textSize="@dimen/text_14" />
    </LinearLayout>


</androidx.constraintlayout.widget.ConstraintLayout>