From b2d2e6dcf6ec38a2f24721f2bc925d634a6eb78d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十二月 2023 18:31:01 +0800
Subject: [PATCH] 2023年12月05日18:30:40
---
app/src/main/res/layout/activity_home_login.xml | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index ca3341a..b9c52ce 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -5,6 +5,7 @@
android:id="@+id/home_login_parent_cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_FFFFFFFF"
tools:context="com.hdl.photovoltaic.ui.HomeLoginActivity">
<ImageView
@@ -22,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_6"
- android:text="@string/home_login_涓枃"
+ 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"
@@ -54,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_39"
android:layout_marginTop="@dimen/dp_40"
- android:text="@string/home_login_HDL鍏変紡鍌ㄨ兘"
+ android:text="@string/home_login_hdl_stored_energy"
android:textColor="@color/text_90000000"
android:textSize="@dimen/text_28"
android:textStyle="bold"
@@ -62,7 +63,7 @@
app:layout_constraintTop_toBottomOf="@+id/home_login_language_tv" />
<ImageView
- android:id="@+id/home_login_check_iv"
+ 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"
@@ -75,12 +76,12 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_16"
- android:text="@string/home_login_鎴戞槸瀹夎鍟�"
+ 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_iv"
- app:layout_constraintStart_toEndOf="@+id/home_login_check_iv"
- app:layout_constraintTop_toTopOf="@+id/home_login_check_iv" />
+ 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" />
<!--璐﹀彿杈撳叆妗�-->
<EditText
android:id="@+id/home_login_account_et"
@@ -91,7 +92,7 @@
android:layout_marginEnd="@dimen/dp_60"
android:background="@null"
android:gravity="center_vertical"
- android:hint="@string/home_login_璇疯緭鍏ユ墜鏈哄彿_閭鍙�"
+ android:hint="@string/home_login__input_phone_email"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -116,7 +117,7 @@
<View
android:id="@+id/home_login_line1_v"
android:layout_width="match_parent"
- android:layout_height="1dp"
+ android:layout_height="0.5dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
android:background="@color/text_E1E1E1"
@@ -126,8 +127,8 @@
<TextView
android:id="@+id/home_login_account_text_error_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="2dp"
+ android:layout_height="14dp"
android:layout_marginTop="2dp"
android:textColor="@color/text_D34545"
android:textSize="12sp"
@@ -146,7 +147,7 @@
android:layout_marginEnd="@dimen/dp_60"
android:background="@null"
android:gravity="center_vertical"
- android:hint="@string/home_login_璇疯緭鍏ュ瘑鐮�"
+ android:hint="@string/home_login_input_psw"
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
@@ -170,7 +171,7 @@
<View
android:id="@+id/home_login_line2_v"
android:layout_width="0dp"
- android:layout_height="1dp"
+ 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"
@@ -188,10 +189,10 @@
<TextView
android:id="@+id/home_login_register_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
+ android:layout_width="32dp"
+ android:layout_height="17dp"
android:layout_marginTop="@dimen/dp_24"
- android:text="@string/home_login_娉ㄥ唽"
+ 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"
@@ -202,24 +203,26 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_24"
- android:text="@string/home_login_蹇樿瀵嗙爜"
+ 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="@dimen/dp_45"
+ android:layout_marginTop="44dp"
android:background="@drawable/yesandnocheck"
android:enabled="false"
android:gravity="center"
- android:text="@string/home_login_鐧诲綍"
+ 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_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />
@@ -228,7 +231,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
android:layout_marginTop="@dimen/text_28"
- android:text="@string/home_login_浣撻獙鐢电珯"
+ android:text="@string/home_login_power_station"
android:textColor="@color/text_245EC3"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
@@ -243,16 +246,17 @@
android:layout_marginTop="@dimen/dp_208"
android:background="@drawable/yesandnoselected"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/home_login_tv" />
+ app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_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:text="@string/home_login_consent_service_agreement"
android:textColor="@color/text_FF000000"
android:textSize="@dimen/text_14"
+ android:tag="click"
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" />
--
Gitblit v1.8.0