Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

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

@@ -5,20 +5,23 @@
    android:id="@+id/home_login_parent_cl"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFFFFFFF"
    android:background="@drawable/login"
    tools:context="com.hdl.photovoltaic.ui.LoginActivity">

    <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" />
    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:fillViewport="true"
        android:overScrollMode="never">

        <androidx.constraintlayout.widget.ConstraintLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent">


    <LinearLayout
        android:id="@+id/home_login_language_ll"
        android:layout_width="@dimen/dp_140"
                android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_60"
@@ -27,19 +30,30 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

                <ImageView
                    android:layout_width="13dp"
                    android:layout_height="13dp"
                    android:src="@drawable/l" />

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

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


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

@@ -72,10 +86,9 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_39"
        android:layout_marginTop="@dimen/dp_40"
        android:text="@string/home_login_hdl_stored_energy"
        android:textColor="@color/text_E6000000"
                android:text="@string/app_name"
                android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_28"
        android:textStyle="bold"
        app:layout_constraintStart_toStartOf="@+id/home_login_language_ll"
        app:layout_constraintTop_toBottomOf="@+id/home_login_language_ll" />

@@ -99,10 +112,10 @@
        <TextView
            android:id="@+id/home_login_install_user_tv"
            android:layout_width="wrap_content"
            android:layout_height="17dp"
                    android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_6"
            android:text="@string/home_login_an_installer"
            android:textColor="@color/text_FF000000"
                    android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv"
@@ -124,9 +137,9 @@
        android:inputType="text"
        android:lines="1"
        android:maxLines="1"
        android:textColor="@color/text_FF000000"
        android:textColorHint="@color/text_25000000"
        android:textSize="@dimen/text_16"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/home_login_check_b_c_cl" />
@@ -147,7 +160,7 @@
        android:layout_height="0.5dp"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@color/text_E1E1E1"
                android:background="@color/text_1AFFFFFF"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/home_login_account_et" />
@@ -178,9 +191,9 @@
        android:inputType="textPassword"
        android:lines="1"
        android:maxLines="1"
        android:textColor="@color/text_FF000000"
        android:textColorHint="@color/text_25000000"
        android:textSize="@dimen/text_16"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" />
@@ -199,7 +212,7 @@
        android:id="@+id/home_login_line2_v"
        android:layout_width="0dp"
        android:layout_height="0.5dp"
        android:background="@color/text_E1E1E1"
                android:background="@color/text_1AFFFFFF"
        app:layout_constraintEnd_toEndOf="@+id/home_login_line1_v"
        app:layout_constraintStart_toStartOf="@+id/home_login_line1_v"
        app:layout_constraintTop_toBottomOf="@+id/home_login_password_et" />
@@ -221,19 +234,18 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_20"
        android:text="@string/home_login_register"
        android:textColor="@color/text_245EC3"
                android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintStart_toStartOf="@+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:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
@@ -243,12 +255,12 @@
        android:layout_width="0dp"
        android:layout_height="52dp"
        android:layout_marginTop="44dp"
        android:background="@drawable/yesandnocheck"
                android:background="@drawable/bj_ccffff_13"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_logoin"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
                android:textColor="@color/text_66FFFFFF"
                android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
        app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
        app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />
@@ -271,13 +283,16 @@
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_20"
                android:layout_marginTop="@dimen/dp_25"
        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">
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/home_login_tv"
                app:layout_constraintVertical_bias="1">

        <ImageView
            android:id="@+id/home_login_privacy_check_iv"
@@ -286,7 +301,7 @@
            android:background="@drawable/yesandnoselected" />

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

        <TextView
@@ -294,13 +309,15 @@
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_40"
            android:layout_marginStart="@dimen/dp_6"
            android:gravity="start|center"
                    android:gravity="center"
                    android:padding="@dimen/dp_0"
            android:singleLine="false"
            android:tag="click"
            android:text="@string/home_login_consent_service_agreement"
            android:textColor="@color/text_FF000000"
            android:textSize="@dimen/text_14" />
                    android:textColor="@color/text_66FFFFFF"
                    android:textSize="@dimen/text_12" />
    </LinearLayout>

        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.core.widget.NestedScrollView>

</androidx.constraintlayout.widget.ConstraintLayout>