From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'

---
 app/src/main/res/layout/activity_home_login.xml |   36 ++++++++++++++----------------------
 1 files changed, 14 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 0d5d93b..b5fd108 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -9,34 +9,26 @@
 
     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_marginStart="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_63"
-        android:src="@drawable/region"
-        app:layout_constraintStart_toStartOf="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: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_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" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <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"
+        android:layout_marginStart="5.5dp"
+        android:src="@drawable/language_pull_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" />
@@ -61,7 +53,7 @@
         android:textColor="@color/text_E6000000"
         android:textSize="@dimen/text_28"
         android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="@+id/home_login_server_iv"
+        app:layout_constraintStart_toStartOf="@+id/home_login_language_tv"
         app:layout_constraintTop_toBottomOf="@+id/home_login_language_tv" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -69,7 +61,7 @@
         android:layout_width="wrap_content"
         android:layout_height="20dp"
         android:layout_marginTop="@dimen/dp_56"
-        app:layout_constraintStart_toStartOf="@+id/home_login_server_iv"
+        app:layout_constraintStart_toStartOf="@+id/home_login_language_tv"
         app:layout_constraintTop_toBottomOf="@+id/home_login_title_tv">
 
         <ImageView
@@ -85,7 +77,7 @@
             android:id="@+id/home_login_install_user_tv"
             android:layout_width="wrap_content"
             android:layout_height="17dp"
-            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginStart="@dimen/dp_6"
             android:text="@string/home_login_an_installer"
             android:textColor="@color/text_FF000000"
             android:textSize="@dimen/text_14"
@@ -105,7 +97,7 @@
         android:layout_marginEnd="@dimen/dp_60"
         android:background="@null"
         android:gravity="center_vertical"
-        android:hint="@string/home_login__input_phone_email"
+        android:hint="@string/home_login_input_phone_email"
         android:inputType="text"
         android:lines="1"
         android:maxLines="1"
@@ -255,16 +247,16 @@
         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:layout_marginBottom="@dimen/dp_62"
         android:background="@drawable/yesandnoselected"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />
+        app:layout_constraintBottom_toBottomOf="parent" />
 
     <TextView
         android:id="@+id/home_login_privacy_tv"
         android:layout_width="287dp"
         android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginStart="@dimen/dp_6"
         android:gravity="start|center"
         android:singleLine="false"
         android:tag="click"

--
Gitblit v1.8.0