From 9a1e7275b9afc3b2f06c26864991b10ea046b465 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 14 八月 2024 19:50:48 +0800
Subject: [PATCH] 2024年08月14日19:50:45
---
app/src/main/res/layout/activity_home_login.xml | 97 ++++++++++++++++++++++++++++++------------------
1 files changed, 60 insertions(+), 37 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 8c2b73f..ccb4863 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -5,44 +5,67 @@
android:id="@+id/home_login_parent_cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/logo_bj"
- android:scaleType="centerCrop"
+ android:background="@color/text_FFFFFFFF"
tools:context="com.hdl.photovoltaic.ui.LoginActivity">
-
- <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"
+ <ImageView
+ android:layout_width="0dp"
+ android:layout_height="612dp"
+ android:background="@drawable/logo_bj"
+ app:layout_constraintEnd_toEndOf="parent"
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="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" />
-
- <ImageView
- android:id="@+id/home_login_more_iv"
- android:layout_width="@dimen/dp_20"
+ <LinearLayout
+ android:id="@+id/home_login_language_ll"
+ android:layout_width="@dimen/dp_140"
android:layout_height="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
- android:src="@drawable/more"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="@+id/home_login_language_tv"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="@+id/home_login_language_tv" />
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_60"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <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="11dp"
+ android:layout_height="7dp"
+ android:src="@drawable/language_pull_down" />
+ </LinearLayout>
+
+ <!-- <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"
@@ -53,15 +76,15 @@
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_28"
android:textStyle="bold"
- app:layout_constraintStart_toStartOf="@+id/home_login_language_tv"
- 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" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/home_login_check_b_c_cl"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginTop="@dimen/dp_56"
- app:layout_constraintStart_toStartOf="@+id/home_login_language_tv"
+ app:layout_constraintStart_toStartOf="@+id/home_login_language_ll"
app:layout_constraintTop_toBottomOf="@+id/home_login_title_tv">
<ImageView
@@ -249,12 +272,12 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
+ android:layout_marginBottom="@dimen/dp_32"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/home_login_tv">
+ app:layout_constraintStart_toStartOf="parent">
<ImageView
android:id="@+id/home_login_privacy_check_iv"
--
Gitblit v1.8.0