From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 15 四月 2025 17:22:34 +0800 Subject: [PATCH] Merge branch '1.5.2' --- app/src/main/res/layout/activity_home_login.xml | 533 +++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 298 insertions(+), 235 deletions(-) diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml index bb74213..3674d2a 100644 --- a/app/src/main/res/layout/activity_home_login.xml +++ b/app/src/main/res/layout/activity_home_login.xml @@ -2,259 +2,322 @@ <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/home_login_parent_cl" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.Login.HomeLoginActivity"> + android:background="@drawable/login" + tools:context="com.hdl.photovoltaic.ui.LoginActivity"> - <ImageView - android:id="@+id/home_login_server_iv" - android:layout_width="@dimen/dp_13" - android:layout_height="@dimen/dp_13" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginTop="@dimen/dp_63" - android:src="@drawable/region" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <TextView - android:id="@+id/home_login_language_tv" - android:layout_width="wrap_content" - android:layout_height="@dimen/dp_20" - android:layout_marginStart="@dimen/dp_6" - android:text="@string/home_login_涓枃" - android:textColor="@color/text_FF000000" - android:textSize="@dimen/text_14" - app:layout_constraintBottom_toBottomOf="@+id/home_login_server_iv" - app:layout_constraintStart_toEndOf="@+id/home_login_server_iv" - app:layout_constraintTop_toTopOf="@+id/home_login_server_iv" /> - - <ImageView - android:id="@+id/home_login_down_iv" - android:layout_width="@dimen/dp_11" - android:layout_height="@dimen/dp_7" - android:layout_marginStart="@dimen/dp_1" - android:src="@drawable/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" - android:layout_height="@dimen/dp_20" - android:layout_marginEnd="@dimen/dp_20" - android:src="@drawable/more" - app:layout_constraintBottom_toBottomOf="@+id/home_login_language_tv" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/home_login_language_tv" /> - - <TextView - android:id="@+id/home_login_title_tv" - android:layout_width="wrap_content" - android:layout_height="@dimen/dp_39" - android:layout_marginTop="@dimen/dp_40" - android:text="@string/home_login_HDL鍏変紡鍌ㄨ兘" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_28" - android:textStyle="bold" - app:layout_constraintStart_toStartOf="@+id/home_login_server_iv" - app:layout_constraintTop_toBottomOf="@+id/home_login_language_tv" /> - - <ImageView - android:id="@+id/home_login_check_iv" - android:layout_width="@dimen/dp_20" - android:layout_height="@dimen/dp_20" - android:layout_marginTop="@dimen/dp_56" - android:background="@drawable/yesandnoselected" - app:layout_constraintStart_toStartOf="@+id/home_login_server_iv" - app:layout_constraintTop_toBottomOf="@+id/home_login_title_tv" /> - - <TextView - android:id="@+id/home_login_install_user_tv" - android:layout_width="wrap_content" - android:layout_height="@dimen/dp_20" - android:layout_marginStart="@dimen/dp_16" - android:text="@string/home_login_鎴戞槸瀹夎鍟�" - android:textColor="@color/text_FF000000" - android:textSize="@dimen/text_14" - app:layout_constraintBottom_toBottomOf="@+id/home_login_check_iv" - app:layout_constraintStart_toEndOf="@+id/home_login_check_iv" - app:layout_constraintTop_toTopOf="@+id/home_login_check_iv" /> - <!--璐﹀彿杈撳叆妗�--> - <EditText - android:id="@+id/home_login_account_et" + <androidx.core.widget.NestedScrollView android:layout_width="match_parent" - android:layout_height="@dimen/dp_45" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginTop="@dimen/dp_44" - android:layout_marginEnd="@dimen/dp_60" - android:background="@null" - android:gravity="center_vertical" - android:hint="@string/home_login_璇疯緭鍏ユ墜鏈哄彿_閭鍙�" - android:inputType="text" - android:lines="1" - android:maxLines="1" - android:textColor="@color/text_FF000000" - android:textColorHint="@color/text_25000000" - android:textSize="@dimen/text_16" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_login_install_user_tv" /> + android:layout_height="match_parent" + android:fillViewport="true" + android:overScrollMode="never"> - <ImageView - android:id="@+id/home_login_clear_contents_iv" - android:layout_width="@dimen/dp_20" - android:layout_height="@dimen/dp_20" - android:layout_marginEnd="@dimen/dp_32" - android:src="@drawable/clear" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="@+id/home_login_account_et" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/home_login_account_et" /> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> - <View - android:id="@+id/home_login_line1_v" - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginEnd="@dimen/dp_20" - android:background="@color/text_E1E1E1" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_login_account_et" /> - <TextView - android:id="@+id/home_login_account_text_error_tv" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="2dp" - android:textColor="@color/text_D34545" - android:textSize="12sp" - app:layout_constraintStart_toStartOf="@+id/home_login_line1_v" - app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" /> + <LinearLayout + android:id="@+id/home_login_language_ll" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_20" + 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"> - <!--瀵嗙爜杈撳叆妗�--> + <ImageView + android:layout_width="13dp" + android:layout_height="13dp" + android:src="@drawable/l" /> - <EditText + <View + android:layout_width="@dimen/dp_4" + android:layout_height="match_parent" /> - android:id="@+id/home_login_password_et" - android:layout_width="match_parent" - android:layout_height="@dimen/dp_45" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginTop="32dp" - android:layout_marginEnd="@dimen/dp_60" - android:background="@null" - android:gravity="center_vertical" - android:hint="@string/home_login_璇疯緭鍏ュ瘑鐮�" - android:inputType="textPassword" - android:lines="1" - android:maxLines="1" - android:textColor="@color/text_FF000000" - android:textColorHint="@color/text_25000000" - android:textSize="@dimen/text_16" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" /> + <TextView + android:id="@+id/home_login_language_tv" + 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_FFACACAC" + android:textSize="@dimen/text_14" /> - <ImageView - android:id="@+id/home_login_hide_iv" - android:layout_width="@dimen/dp_20" - android:layout_height="@dimen/dp_20" - android:layout_marginEnd="@dimen/dp_32" - android:src="@drawable/hide" - app:layout_constraintBottom_toBottomOf="@+id/home_login_password_et" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/home_login_password_et" /> - <View - android:id="@+id/home_login_line2_v" - android:layout_width="0dp" - android:layout_height="1dp" - android:background="@color/text_E1E1E1" - 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" /> + <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> - <TextView - android:id="@+id/home_login_password_text_error_tv" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="2dp" - android:textColor="@color/text_D34545" - android:textSize="12sp" - app:layout_constraintStart_toStartOf="@+id/home_login_line2_v" - app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" /> + <!-- <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" />--> - <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_娉ㄥ唽" - 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" /> + <!-- <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_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_蹇樿瀵嗙爜" - android:textColor="@color/text_245EC3" - android:textSize="@dimen/text_14" - app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v" - app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" /> - <!--鐧诲綍--> - <TextView - android:id="@+id/home_login_tv" - android:layout_width="0dp" - android:layout_height="52dp" - android:layout_marginTop="@dimen/dp_45" - android:background="@drawable/yesandnocheck" - android:gravity="center" - android:text="@string/home_login_鐧诲綍" - android:textColor="@color/text_FFFFFFFF" - android:textSize="18sp" - android:enabled="false" - 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" /> - <TextView - android:id="@+id/home_login_experience_tv" - android:layout_width="wrap_content" - android:layout_height="@dimen/dp_25" - android:layout_marginTop="@dimen/text_28" - android:text="@string/home_login_浣撻獙鐢电珯" - android:textColor="@color/text_245EC3" - android:textSize="18sp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_login_tv" /> + <TextView + android:id="@+id/home_login_title_tv" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_39" + android:layout_marginTop="@dimen/dp_40" + android:text="@string/app_name" + android:textColor="@color/text_FFACACAC" + android:textSize="@dimen/text_28" + app:layout_constraintStart_toStartOf="@+id/home_login_language_ll" + app:layout_constraintTop_toBottomOf="@+id/home_login_language_ll" /> - <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_marginTop="@dimen/dp_208" - android:background="@drawable/yesandnoselected" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_login_tv" /> + <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_ll" + app:layout_constraintTop_toBottomOf="@+id/home_login_title_tv"> - <TextView - android:id="@+id/home_login_privacy_tv" - android:layout_width="wrap_content" - android:layout_height="@dimen/dp_20" - android:layout_marginStart="@dimen/dp_16" - android:text="@string/home_login_鍚屾剰_鏈嶅姟鍗忚" - 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" /> + <ImageView + android:id="@+id/home_login_check_b_c_iv" + android:layout_width="20dp" + android:layout_height="20dp" + android:background="@drawable/yesandnoselected" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + <TextView + android:id="@+id/home_login_install_user_tv" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_20" + android:layout_marginStart="@dimen/dp_6" + android:text="@string/home_login_an_installer" + android:textColor="@color/text_FFACACAC" + android:textSize="@dimen/text_14" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv" + app:layout_constraintTop_toTopOf="parent" /> + </androidx.constraintlayout.widget.ConstraintLayout> + + + <!--璐﹀彿杈撳叆妗�--> + <EditText + android:id="@+id/home_login_account_et" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_45" + android:layout_marginStart="@dimen/dp_20" + android:layout_marginTop="@dimen/dp_44" + android:layout_marginEnd="@dimen/dp_60" + android:background="@null" + android:gravity="center_vertical" + android:hint="@string/home_login_input_phone_email" + android:inputType="text" + android:lines="1" + android:maxLines="1" + android:textColor="@color/text_FFACACAC" + android:textColorHint="@color/text_FF5B5B5B" + 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" /> + + <ImageView + android:id="@+id/home_login_clear_contents_iv" + android:layout_width="@dimen/dp_20" + android:layout_height="@dimen/dp_20" + android:layout_marginEnd="@dimen/dp_32" + android:src="@drawable/clear" + app:layout_constraintBottom_toBottomOf="@+id/home_login_account_et" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/home_login_account_et" /> + + <View + android:id="@+id/home_login_line1_v" + android:layout_width="match_parent" + android:layout_height="0.5dp" + android:layout_marginStart="@dimen/dp_20" + android:layout_marginEnd="@dimen/dp_20" + android:background="@color/text_1AFFFFFF" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_login_account_et" /> + + <TextView + android:id="@+id/home_login_account_text_error_tv" + android:layout_width="2dp" + android:layout_height="14dp" + android:layout_marginTop="2dp" + android:textColor="@color/text_D34545" + android:textSize="12sp" + app:layout_constraintStart_toStartOf="@+id/home_login_line1_v" + app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" /> + + <!--瀵嗙爜杈撳叆妗�--> + + <EditText + + android:id="@+id/home_login_password_et" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_45" + android:layout_marginStart="@dimen/dp_20" + android:layout_marginTop="32dp" + android:layout_marginEnd="@dimen/dp_60" + android:background="@null" + android:gravity="center_vertical" + android:hint="@string/home_login_input_psw" + android:inputType="textPassword" + android:lines="1" + android:maxLines="1" + android:textColor="@color/text_FFACACAC" + android:textColorHint="@color/text_FF5B5B5B" + android:textSize="@dimen/text_14" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" /> + + <ImageView + android:id="@+id/home_login_hide_iv" + android:layout_width="@dimen/dp_20" + android:layout_height="@dimen/dp_20" + android:layout_marginEnd="@dimen/dp_32" + android:src="@drawable/hide" + app:layout_constraintBottom_toBottomOf="@+id/home_login_password_et" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/home_login_password_et" /> + + <View + android:id="@+id/home_login_line2_v" + android:layout_width="0dp" + android:layout_height="0.5dp" + 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" /> + + <TextView + android:id="@+id/home_login_password_text_error_tv" + 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:text="@string/home_login_register" + android:textColor="@color/text_FFACACAC" + 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_FFACACAC" + android:textSize="@dimen/text_14" + app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v" + app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" /> + <!--鐧诲綍--> + <TextView + android:id="@+id/home_login_tv" + android:layout_width="0dp" + android:layout_height="52dp" + android:layout_marginTop="44dp" + android:background="@drawable/bj_ccffff_13" + android:enabled="false" + android:gravity="center" + android:text="@string/home_login_logoin" + android:textColor="@color/text_FF5B5B5B" + 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" /> + + <TextView + android:id="@+id/home_login_experience_tv" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_25" + android:layout_marginTop="@dimen/text_28" + android:text="@string/home_login_power_station" + android:textColor="@color/text_245EC3" + android:textSize="18sp" + android:visibility="gone" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_login_tv" /> + + + <LinearLayout + 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_constraintTop_toBottomOf="@+id/home_login_tv" + app:layout_constraintVertical_bias="1"> + + <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_8" + 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="center" + android:padding="@dimen/dp_0" + android:singleLine="false" + android:tag="click" + android:text="@string/home_login_consent_service_agreement" + android:textColor="@color/text_FF5B5B5B" + android:textSize="@dimen/text_12" /> + </LinearLayout> + </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file -- Gitblit v1.8.0