From 0287b5d20f7d57f5352248175733b99d5a99959b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 28 八月 2025 17:42:27 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev

---
 app/src/main/res/layout/activity_bind_mail.xml |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/layout/activity_bind_mail.xml b/app/src/main/res/layout/activity_bind_mail.xml
index 6d1677a..2e2d144 100644
--- a/app/src/main/res/layout/activity_bind_mail.xml
+++ b/app/src/main/res/layout/activity_bind_mail.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/text_FF161616"
+    android:background="@color/text_FF000000"
     tools:context=".ui.me.BindMailActivity">
 
 
@@ -22,8 +22,8 @@
     <RelativeLayout
         android:id="@+id/bind_mail_parent_rl"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_100"
-        android:layout_marginTop="@dimen/dp_20"
+        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_rl">
@@ -33,15 +33,14 @@
             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_email"
-            android:textColor="@color/text_E6FFFFFF"
+            android:textColor="@color/text_FFACACAC"
             android:textSize="@dimen/text_14" />
 
         <RelativeLayout
             android:id="@+id/bind_mail_rl"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_52"
+            android:layout_height="@dimen/dp_50"
             android:layout_below="@+id/bind_mail_title_tv"
             android:layout_marginStart="@dimen/dp_20"
             android:layout_marginTop="@dimen/dp_8"
@@ -62,8 +61,8 @@
                 android:inputType="text"
                 android:lines="1"
                 android:maxLines="1"
-                android:textColor="@color/text_E6FFFFFF"
-                android:textColorHint="@color/text_66FFFFFF"
+                android:textColor="@color/text_FFACACAC"
+                android:textColorHint="@color/text_FF5B5B5B"
                 android:textSize="@dimen/text_14" />
 
             <ImageView
@@ -93,8 +92,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_mail_parent_rl">
@@ -105,14 +104,14 @@
             android:layout_height="@dimen/dp_20"
             android:layout_marginStart="@dimen/dp_20"
             android:text="@string/verification"
-            android:textColor="@color/text_E6FFFFFF"
+            android:textColor="@color/text_FFACACAC"
             android:textSize="@dimen/text_14" />
 
         <!--閭鑾峰彇楠岃瘉鐮�-->
         <RelativeLayout
             android:id="@+id/bind_mail_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_mail_verification_title_tv"
             android:layout_marginStart="@dimen/dp_20"
             android:layout_marginTop="@dimen/dp_8"
@@ -129,7 +128,7 @@
                 android:paddingStart="@dimen/dp_16"
                 android:paddingEnd="@dimen/dp_0"
                 android:text="@string/home_login_verification_code"
-                android:textColor="@color/text_E6FFFFFF"
+                android:textColor="@color/text_FFACACAC"
                 android:textSize="@dimen/text_14" />
 
             <View
@@ -146,15 +145,15 @@
                 android:layout_height="match_parent"
                 android:layout_alignStart="@+id/bind_phone_verification_v"
                 android:layout_alignParentStart="true"
-                android:layout_marginStart="@dimen/dp_20"
+                android:layout_marginStart="@dimen/dp_16"
                 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_16"
+                android:textColor="@color/text_FFACACAC"
+                android:textColorHint="@color/text_FF5B5B5B"
+                android:textSize="@dimen/text_14"
 
                 />
 
@@ -180,13 +179,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/bj_ff555859"
+        android:background="@drawable/bj_ff39383d"
         android:gravity="center"
         android:text="@string/home_login_affirm"
-        android:textColor="@color/text_E6FFFFFF"
-        android:textSize="18sp"
+        android:enabled="false"
+        android:textColor="@color/text_FF5B5B5B"
+        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