From 30b7d526263abf634ee1003a572930822e81c8a2 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 24 七月 2024 19:26:46 +0800
Subject: [PATCH] 2024年07月24日19:26:40
---
app/src/main/res/layout/activity_home_login.xml | 109 ++++++++++++++++++++++++++++--------------------------
1 files changed, 56 insertions(+), 53 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 0aa4d0a..7caa412 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -7,36 +7,28 @@
android:layout_height="match_parent"
android:background="@drawable/logo_bj"
- tools:context="com.hdl.photovoltaic.ui.HomeLoginActivity">
+ 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: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_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" />
+ 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="@dimen/dp_1"
- android:src="@drawable/down"
+ 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" />
@@ -58,32 +50,43 @@
android:layout_height="@dimen/dp_39"
android:layout_marginTop="@dimen/dp_40"
android:text="@string/home_login_hdl_stored_energy"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_28"
android:textStyle="bold"
- app:layout_constraintStart_toStartOf="@+id/home_login_server_iv"
+ app:layout_constraintStart_toStartOf="@+id/home_login_language_tv"
app:layout_constraintTop_toBottomOf="@+id/home_login_language_tv" />
- <ImageView
- android:id="@+id/home_login_check_b_c_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"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/home_login_check_b_c_cl"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:layout_marginStart="@dimen/dp_16"
- android:text="@string/home_login_an_installer"
- android:textColor="@color/text_FF000000"
- android:textSize="@dimen/text_14"
- app:layout_constraintBottom_toBottomOf="@+id/home_login_check_b_c_iv"
- app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv"
- app:layout_constraintTop_toTopOf="@+id/home_login_check_b_c_iv" />
+ android:layout_height="20dp"
+ android:layout_marginTop="@dimen/dp_56"
+ app:layout_constraintStart_toStartOf="@+id/home_login_language_tv"
+ 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="17dp"
+ 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"
@@ -94,7 +97,7 @@
android:layout_marginEnd="@dimen/dp_60"
android:background="@null"
android:gravity="center_vertical"
- android:hint="@string/home_login__input_phone_email"
+ android:hint="@string/home_login_input_phone_email"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -103,7 +106,7 @@
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" />
+ app:layout_constraintTop_toBottomOf="@+id/home_login_check_b_c_cl" />
<ImageView
android:id="@+id/home_login_clear_contents_iv"
@@ -111,7 +114,6 @@
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" />
@@ -181,36 +183,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"
@@ -223,7 +227,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" />
@@ -245,16 +248,16 @@
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:layout_marginBottom="@dimen/dp_62"
android:background="@drawable/yesandnoselected"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/home_login_privacy_tv"
- android:layout_width="wrap_content"
+ android:layout_width="287dp"
android:layout_height="@dimen/dp_40"
- android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginStart="@dimen/dp_6"
android:gravity="start|center"
android:singleLine="false"
android:tag="click"
--
Gitblit v1.8.0