From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google
---
app/src/main/res/layout/activity_home_login.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 3674d2a..d8bb7a2 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -92,7 +92,7 @@
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"
@@ -116,11 +113,8 @@
android:layout_marginStart="@dimen/dp_6"
android:text="@string/home_login_an_installer"
android:textColor="@color/text_FFACACAC"
- 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:textSize="@dimen/text_14" />
+ </LinearLayout>
<!--璐﹀彿杈撳叆妗�-->
@@ -278,6 +272,50 @@
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"
@@ -291,7 +329,7 @@
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_constraintTop_toBottomOf="@+id/home_no_network_mode_login_tv"
app:layout_constraintVertical_bias="1">
<ImageView
--
Gitblit v1.8.0