From f21dcea3e5f6fc7bfc51b3ddc6ff9764fb93bfdb Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 11 十二月 2024 11:25:37 +0800
Subject: [PATCH] 2024年12月11日11:25:28
---
app/src/main/res/layout/activity_register_account.xml | 197 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 139 insertions(+), 58 deletions(-)
diff --git a/app/src/main/res/layout/activity_register_account.xml b/app/src/main/res/layout/activity_register_account.xml
index 4f9aae0..0c25e8f 100644
--- a/app/src/main/res/layout/activity_register_account.xml
+++ b/app/src/main/res/layout/activity_register_account.xml
@@ -5,14 +5,24 @@
android:id="@+id/parent_cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@drawable/login"
tools:context=".ui.account.RegisterAccountActivity">
+
+ <!-- <ImageView-->
+ <!-- android:layout_width="0dp"-->
+ <!-- android:layout_height="0dp"-->
+ <!-- android:background="@drawable/bj"-->
+ <!-- app:layout_constraintBottom_toBottomOf="parent"-->
+ <!-- app:layout_constraintEnd_toEndOf="parent"-->
+ <!-- app:layout_constraintStart_toStartOf="parent"-->
+ <!-- app:layout_constraintTop_toTopOf="parent" />-->
<TextView
android:id="@+id/register_back_tv"
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
+ android:layout_width="@dimen/dp_30"
+ android:layout_height="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_12"
+ android:layout_marginTop="@dimen/dp_38"
android:background="@drawable/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -22,12 +32,11 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_39"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_42"
- android:text="@string/home_login_娉ㄥ唽"
+ android:layout_marginTop="@dimen/dp_39"
+ android:text="@string/home_login_register"
android:textAlignment="center"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_28"
- android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/register_back_tv" />
<!--鎵嬫満鍙�-->
@@ -36,7 +45,7 @@
layout="@layout/text_underline"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_31"
- android:layout_marginTop="@dimen/dp_52"
+ android:layout_marginTop="@dimen/dp_43"
app:layout_constraintStart_toStartOf="@+id/register_title_tv"
app:layout_constraintTop_toBottomOf="@+id/register_title_tv" />
<!--閭-->
@@ -46,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_31"
android:layout_marginStart="@dimen/dp_28"
- android:layout_marginTop="@dimen/dp_52"
+ android:layout_marginTop="@dimen/dp_43"
app:layout_constraintStart_toEndOf="@+id/register_phone_title_ic"
app:layout_constraintTop_toBottomOf="@+id/register_title_tv" />
@@ -65,20 +74,20 @@
android:layout_height="@dimen/dp_13"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_20"
- android:src="@drawable/region" />
+ android:src="@drawable/l" />
+
<TextView
android:id="@+id/region_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_10"
+ android:layout_marginStart="9dp"
android:layout_marginEnd="@dimen/dp_20"
android:layout_toEndOf="@+id/region_iv"
android:gravity="center_vertical"
android:text="HDL China"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_16" />
-
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/region_next_iv"
@@ -95,7 +104,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
@@ -114,9 +123,9 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_150"
android:gravity="center_vertical"
- android:text="涓浗澶ч檰"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_16" />
+ android:text="@string/home_chinese_mainland"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/region_account_number_tv"
@@ -127,15 +136,15 @@
android:layout_marginEnd="@dimen/dp_58"
android:gravity="center_vertical|end"
android:text="+86"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_16"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14"
/>
<ImageView
android:id="@+id/region_account_next_iv"
- android:layout_width="@dimen/dp_32"
- android:layout_height="@dimen/dp_32"
+ android:layout_width="@dimen/dp_20"
+ android:layout_height="@dimen/dp_20"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_26"
@@ -147,7 +156,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
@@ -166,13 +175,13 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_60"
android:background="@null"
- android:hint="@string/home_login_璇疯緭鍏ユ墜鏈哄彿"
+ android:hint="@string/home_login_input_phone"
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_FF000000"
- android:textColorHint="@color/text_25000000"
- android:textSize="@dimen/text_16" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14" />
<View
android:layout_width="match_parent"
@@ -180,7 +189,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
@@ -203,9 +212,9 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_FF000000"
- android:textColorHint="@color/text_25000000"
- android:textSize="@dimen/text_16" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/register_psw_hide_iv"
@@ -222,7 +231,7 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
@@ -245,9 +254,9 @@
android:inputType="textPassword"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_FF000000"
- android:textColorHint="@color/text_25000000"
- android:textSize="@dimen/text_16" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14" />
<ImageView
android:id="@+id/register_confirm_psw_hide_iv"
@@ -264,12 +273,13 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
+ <!--鎵嬫満鍙烽獙璇佺爜-->
<RelativeLayout
- android:id="@+id/register_verification_code_rl"
+ android:id="@+id/register_phone_verification_code_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_60"
app:layout_constraintEnd_toEndOf="parent"
@@ -278,40 +288,40 @@
<TextView
- android:id="@+id/register_verification_tv"
+ android:id="@+id/register_phone_verification_tv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
android:padding="@dimen/dp_16"
- android:text="@string/home_login_楠岃瘉鐮�"
- android:textColor="@color/text_245EC3"
+ android:text="@string/home_login_verification_code"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<View
- android:id="@+id/register_verification_v"
+ android:id="@+id/register_phone_verification_v"
android:layout_width="0.5dp"
android:layout_height="20dp"
- android:layout_alignStart="@+id/register_verification_tv"
+ android:layout_alignStart="@+id/register_phone_verification_tv"
android:layout_centerInParent="true"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
<EditText
- android:id="@+id/register_verification_et"
- android:layout_width="match_parent"
+ android:id="@+id/register_phone_verification_et"
+ android:layout_width="@dimen/dp_150"
android:layout_height="match_parent"
- android:layout_alignStart="@+id/register_verification_v"
+ android:layout_alignStart="@+id/register_phone_verification_v"
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_20"
android:background="@null"
- android:hint="@string/home_login_input_楠岃瘉鐮�"
+ android:hint="@string/home_login_input_verification_code"
android:inputType="text"
android:lines="1"
android:maxLines="1"
- android:textColor="@color/text_FF000000"
- android:textColorHint="@color/text_25000000"
- android:textSize="@dimen/text_16"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
/>
@@ -321,27 +331,98 @@
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
</RelativeLayout>
+ <!--閭楠岃瘉鐮�-->
+ <RelativeLayout
+ android:id="@+id/register_mail_verification_code_rl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_60"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl">
+
+
+ <TextView
+ android:id="@+id/register_mail_verification_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:gravity="center"
+ android:padding="@dimen/dp_16"
+ android:text="@string/home_login_send_mail"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+
+ <View
+ android:id="@+id/register_mail_verification_v"
+ android:layout_width="0.5dp"
+ android:layout_height="20dp"
+ android:layout_alignStart="@+id/register_mail_verification_tv"
+ android:layout_centerInParent="true"
+ android:background="@color/text_1AFFFFFF" />
+
+ <EditText
+ android:id="@+id/register_mail_verification_et"
+ android:layout_width="@dimen/dp_150"
+ android:layout_height="match_parent"
+ android:layout_alignStart="@+id/register_mail_verification_v"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="@dimen/dp_20"
+ android:background="@null"
+ android:hint="@string/home_login_input_verification_code"
+ android:inputType="text"
+ android:lines="1"
+ android:maxLines="1"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textColorHint="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
+
+ />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_alignParentBottom="true"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_20"
+ android:background="@color/text_1AFFFFFF" />
+
+
+ </RelativeLayout>
+ <!--閿欒鎻愮ず-->
<TextView
- android:id="@+id/account_title_tv"
+ android:id="@+id/text_error_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_60"
+ android:textColor="@color/text_D34545"
+ android:textSize="12sp"
+ app:layout_constraintStart_toStartOf="@+id/register_confirm_psw_rl"
+ app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />
+
+ <TextView
+ android:id="@+id/register_complete_tv"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_42"
+ android:layout_marginTop="102dp"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/yesandnocheck"
+ android:background="@drawable/bj_ccffff_13"
android:enabled="false"
android:gravity="center"
- android:text="@string/home_login_娉ㄥ唽"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="18sp"
+ android:text="@string/home_login_register"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/register_verification_code_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/register_confirm_psw_rl" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0