From c1859d8a6f8f20b4369b5d72ad030f3496b1417c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 12 八月 2024 14:04:45 +0800
Subject: [PATCH] 2024年08月12日14:04:43
---
app/src/main/res/layout/activity_home_login.xml | 239 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 141 insertions(+), 98 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..52680a5 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -2,84 +2,111 @@
<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">
+ 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_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/logo_bj"
+ android:scaleType="centerCrop" />
+
+ <LinearLayout
+ android:id="@+id/home_login_language_ll"
+ android:layout_width="@dimen/dp_140"
+ android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_63"
- android:src="@drawable/region"
+ android:layout_marginTop="@dimen/dp_60"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="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" />
+ <TextView
+ android:id="@+id/home_login_language_tv"
+ android:layout_width="@dimen/dp_58"
+ 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="@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_down_iv"
+ android:layout_width="11dp"
+ android:layout_height="7dp"
+ android:src="@drawable/language_pull_down" />
+ </LinearLayout>
- <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_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/home_login_HDL鍏変紡鍌ㄨ兘"
- android:textColor="@color/text_90000000"
+ android:text="@string/home_login_hdl_stored_energy"
+ android:textColor="@color/text_E6000000"
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" />
+ app:layout_constraintStart_toStartOf="@+id/home_login_language_ll"
+ app:layout_constraintTop_toBottomOf="@+id/home_login_language_ll" />
- <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"
+ <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_鎴戞槸瀹夎鍟�"
- 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" />
+ 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="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"
@@ -90,7 +117,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"
@@ -99,7 +126,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"
@@ -107,7 +134,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" />
@@ -115,7 +141,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"
@@ -125,8 +151,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"
@@ -145,7 +171,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"
@@ -169,7 +195,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"
@@ -177,31 +203,33 @@
<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_娉ㄥ唽"
+ 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_蹇樿瀵嗙爜"
+ 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"
@@ -211,13 +239,13 @@
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"
- 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" />
@@ -227,34 +255,49 @@
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"
+ android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_login_tv" />
- <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" />
- <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" />
+ <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_62"
+ 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>
\ No newline at end of file
--
Gitblit v1.8.0