From 572e05ea7dc60efc7721809b5155c1e01a78913a Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 22 十月 2024 18:07:24 +0800 Subject: [PATCH] 三星折叠屏显示界面不全修复 --- app/src/main/res/layout/activity_home_login.xml | 587 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 300 insertions(+), 287 deletions(-) diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml index 2ae91c1..eff598d 100644 --- a/app/src/main/res/layout/activity_home_login.xml +++ b/app/src/main/res/layout/activity_home_login.xml @@ -8,301 +8,314 @@ android:background="@color/text_FFFFFFFF" 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" /> - - <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"> - - <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_FF000000" - 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> - - <!-- <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" - 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_E6000000" - 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" /> - - <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"> - - <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_FF000000" - 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" + <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_input_phone_email" - 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_check_b_c_cl" /> + 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" - 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_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="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_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" /> - - <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_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" /> - - <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_245EC3" - 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: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/yesandnocheck" - android:enabled="false" - android:gravity="center" - android:text="@string/home_login_logoin" - android:textColor="@color/text_FFFFFFFF" - android:textSize="18sp" - 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" /> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> - <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: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_privacy_check_iv" - android:layout_width="@dimen/dp_20" - android:layout_height="@dimen/dp_20" - android:background="@drawable/yesandnoselected" /> + <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"> - <View - android:layout_width="@dimen/dp_6" - android:layout_height="match_parent" /> + <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_FF000000" + android:textSize="@dimen/text_14" /> - <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> + <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_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" + 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_E6000000" + 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" /> + + <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"> + + <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_FF000000" + 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_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_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_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="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_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" /> + + <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_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" /> + + <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_245EC3" + 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: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/yesandnocheck" + android:enabled="false" + android:gravity="center" + android:text="@string/home_login_logoin" + android:textColor="@color/text_FFFFFFFF" + android:textSize="18sp" + 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_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> + </androidx.core.widget.NestedScrollView> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file -- Gitblit v1.8.0