From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/activity_bind_phone.xml | 87 +++++++++++++++++++++++--------------------
1 files changed, 46 insertions(+), 41 deletions(-)
diff --git a/app/src/main/res/layout/activity_bind_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml
index 9220f5f..76345ad 100644
--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/app/src/main/res/layout/activity_bind_phone.xml
@@ -4,35 +4,41 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FF000000"
tools:context=".ui.me.BindPhoneActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_44" />
+ android:id="@+id/toolbar_top_rl"
+ layout="@layout/toolbar_top_view_44"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginTop="@dimen/dp_38"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<RelativeLayout
android:id="@+id/bind_area_parent_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_100"
+ android:layout_height="78dp"
+ android:layout_marginTop="@dimen/dp_10"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
<TextView
android:id="@+id/bind_area_title_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_24"
android:text="@string/home_phone_number"
- android:textColor="@color/text_65000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<RelativeLayout
android:id="@+id/bind_area_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_52"
+ android:layout_height="@dimen/dp_50"
android:layout_below="@+id/bind_area_title_tv"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_8"
@@ -47,8 +53,8 @@
android:layout_marginEnd="@dimen/dp_150"
android:gravity="center_vertical"
android:text="@string/home_chinese_mainland"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_16" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
<TextView
android:id="@+id/bind_area_number_tv"
@@ -59,15 +65,15 @@
android:layout_marginEnd="@dimen/dp_43"
android:gravity="center_vertical|end"
android:text="+86"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_16"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
/>
<ImageView
android:id="@+id/bind_area_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_6"
@@ -81,7 +87,8 @@
<RelativeLayout
android:id="@+id/bind_phone_parent_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_100"
+ android:layout_height="78dp"
+ android:layout_marginTop="@dimen/dp_25"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bind_area_parent_rl">
@@ -91,22 +98,19 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_24"
android:text="@string/home_login_phone"
- android:textColor="@color/text_65000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<RelativeLayout
android:id="@+id/bind_phone_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_52"
+ android:layout_height="@dimen/dp_50"
android:layout_below="@+id/bind_phone_title_tv"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/me_change_psw_bj"
-
- >
+ android:background="@drawable/me_change_psw_bj">
<EditText
android:id="@+id/bind_phone_et"
@@ -117,12 +121,12 @@
android:layout_marginEnd="@dimen/dp_60"
android:background="@null"
android:hint="@string/home_login_input_phone"
- android:inputType="number"
+ android:inputType="phone"
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/bind_phone_clear_iv"
@@ -140,7 +144,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"
android:visibility="gone"
/>
@@ -151,8 +155,8 @@
<RelativeLayout
android:id="@+id/bind_phone_verification_parent_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_100"
- android:layout_marginTop="@dimen/dp_24"
+ android:layout_height="78dp"
+ android:layout_marginTop="@dimen/dp_25"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bind_phone_parent_rl">
@@ -163,14 +167,14 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_20"
android:text="@string/verification"
- android:textColor="@color/text_65000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<!--鎵嬫満鑾峰彇楠岃瘉鐮�-->
<RelativeLayout
android:id="@+id/bind_phone_verification_code_rl"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_52"
+ android:layout_height="@dimen/dp_50"
android:layout_below="@+id/bind_phone_verification_title_tv"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_8"
@@ -187,7 +191,7 @@
android:paddingStart="@dimen/dp_16"
android:paddingEnd="@dimen/dp_0"
android:text="@string/home_login_verification_code"
- android:textColor="@color/text_245EC3"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
<View
@@ -196,7 +200,7 @@
android:layout_height="20dp"
android:layout_alignStart="@+id/bind_phone_verification_tv"
android:layout_centerInParent="true"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
<EditText
android:id="@+id/change_phone_verification_et"
@@ -207,12 +211,12 @@
android:layout_marginStart="@dimen/dp_20"
android:background="@null"
android:hint="@string/home_login_input_verification_code"
- android:inputType="text"
+ android:inputType="phone"
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"
/>
@@ -222,7 +226,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"
android:visibility="gone"
/>
@@ -238,13 +242,14 @@
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="73dp"
+ android:layout_marginTop="50dp"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@drawable/yesandnocheck"
+ android:background="@drawable/bj_ff39383d"
+ android:enabled="false"
android:gravity="center"
android:text="@string/home_login_affirm"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="18sp"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bind_phone_verification_parent_rl" />
--
Gitblit v1.8.0