From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/res/layout/activity_home_login.xml | 125 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 42 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index cb5cdd9..d8bb7a2 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -5,7 +5,7 @@
android:id="@+id/home_login_parent_cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_FFFFFFFF"
+ android:background="@drawable/login"
tools:context="com.hdl.photovoltaic.ui.LoginActivity">
<androidx.core.widget.NestedScrollView
@@ -19,14 +19,6 @@
android:layout_height="match_parent">
- <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" />
-
<LinearLayout
android:id="@+id/home_login_language_ll"
android:layout_width="wrap_content"
@@ -38,13 +30,22 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
+ <ImageView
+ android:layout_width="13dp"
+ android:layout_height="13dp"
+ android:src="@drawable/l" />
+
+ <View
+ android:layout_width="@dimen/dp_4"
+ android:layout_height="match_parent" />
+
<TextView
android:id="@+id/home_login_language_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/language_pull_down"
android:text="@string/home_login_chinese"
- android:textColor="@color/text_FF000000"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
@@ -86,13 +87,12 @@
android:layout_height="@dimen/dp_39"
android:layout_marginTop="@dimen/dp_40"
android:text="@string/app_name"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_28"
- android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/home_login_language_ll"
app:layout_constraintTop_toBottomOf="@+id/home_login_language_ll" />
- <androidx.constraintlayout.widget.ConstraintLayout
+ <LinearLayout
android:id="@+id/home_login_check_b_c_cl"
android:layout_width="wrap_content"
android:layout_height="20dp"
@@ -104,10 +104,7 @@
android:id="@+id/home_login_check_b_c_iv"
android:layout_width="20dp"
android:layout_height="20dp"
- android:background="@drawable/yesandnoselected"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ android:background="@drawable/yesandnoselected" />
<TextView
android:id="@+id/home_login_install_user_tv"
@@ -115,12 +112,9 @@
android:layout_height="@dimen/dp_20"
android:layout_marginStart="@dimen/dp_6"
android:text="@string/home_login_an_installer"
- android:textColor="@color/text_FF000000"
- android:textSize="@dimen/text_14"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/home_login_check_b_c_iv"
- app:layout_constraintTop_toTopOf="parent" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_14" />
+ </LinearLayout>
<!--璐﹀彿杈撳叆妗�-->
@@ -137,9 +131,9 @@
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_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_login_check_b_c_cl" />
@@ -160,7 +154,7 @@
android:layout_height="0.5dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_20"
- android:background="@color/text_E1E1E1"
+ android:background="@color/text_1AFFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_login_account_et" />
@@ -191,9 +185,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_FFACACAC"
+ android:textColorHint="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_login_line1_v" />
@@ -212,7 +206,7 @@
android:id="@+id/home_login_line2_v"
android:layout_width="0dp"
android:layout_height="0.5dp"
- android:background="@color/text_E1E1E1"
+ android:background="@color/text_1AFFFFFF"
app:layout_constraintEnd_toEndOf="@+id/home_login_line1_v"
app:layout_constraintStart_toStartOf="@+id/home_login_line1_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_password_et" />
@@ -234,19 +228,18 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/home_login_register"
- android:textColor="@color/text_245EC3"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
app:layout_constraintTop_toTopOf="@+id/home_login_forget_password_tv" />
<!--蹇樿瀵嗙爜-->
<TextView
android:id="@+id/home_login_forget_password_tv"
-
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_24"
android:text="@string/home_login_forget_password"
- android:textColor="@color/text_245EC3"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_line2_v" />
@@ -256,12 +249,12 @@
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginTop="44dp"
- android:background="@drawable/yesandnocheck"
+ android:background="@drawable/bj_ccffff_13"
android:enabled="false"
android:gravity="center"
android:text="@string/home_login_logoin"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="18sp"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14"
app:layout_constraintEnd_toEndOf="@+id/home_login_line2_v"
app:layout_constraintStart_toStartOf="@+id/home_login_line2_v"
app:layout_constraintTop_toBottomOf="@+id/home_login_forget_password_tv" />
@@ -279,18 +272,65 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/home_login_tv" />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_21"
+ android:gravity="center"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/home_login_tv">
+
+ <View
+ android:layout_width="@dimen/dp_49"
+ android:layout_height="1dp"
+ android:background="@color/text_10FFFFFF" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="@dimen/dp_16"
+ android:paddingEnd="@dimen/dp_16"
+ android:text="OR"
+ android:textAlignment="center"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/sp_14" />
+
+ <View
+ android:layout_width="@dimen/dp_49"
+ android:layout_height="1dp"
+ android:background="@color/text_10FFFFFF" />
+ </LinearLayout>
+ <!--鏃犵綉妯″紡鐧诲綍-->
+ <TextView
+ android:id="@+id/home_no_network_mode_login_tv"
+ android:layout_width="0dp"
+ android:layout_height="52dp"
+ android:layout_marginTop="62dp"
+ android:background="@drawable/no_work_mode_border"
+ android:gravity="center"
+ android:text="@string/no_network_mode"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14"
+ app:layout_constraintEnd_toEndOf="@+id/home_login_tv"
+ app:layout_constraintStart_toStartOf="@+id/home_login_tv"
+ app:layout_constraintTop_toBottomOf="@+id/home_login_tv" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_25"
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_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/home_no_network_mode_login_tv"
+ app:layout_constraintVertical_bias="1">
<ImageView
android:id="@+id/home_login_privacy_check_iv"
@@ -299,7 +339,7 @@
android:background="@drawable/yesandnoselected" />
<View
- android:layout_width="@dimen/dp_6"
+ android:layout_width="@dimen/dp_8"
android:layout_height="match_parent" />
<TextView
@@ -307,12 +347,13 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_6"
- android:gravity="start|center"
+ android:gravity="center"
+ android:padding="@dimen/dp_0"
android:singleLine="false"
android:tag="click"
android:text="@string/home_login_consent_service_agreement"
- android:textColor="@color/text_FF000000"
- android:textSize="@dimen/text_14" />
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_12" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
--
Gitblit v1.8.0