From 14de918a79943e4961b09fa01ed320c6cad41f2e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 17:14:51 +0800
Subject: [PATCH] Revert "Revert "Merge branch 'hxb' into wjc""
---
app/src/main/res/layout/activity_home_login.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index bb74213..ca3341a 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -2,9 +2,10 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/home_login_parent_cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ui.Login.HomeLoginActivity">
+ tools:context="com.hdl.photovoltaic.ui.HomeLoginActivity">
<ImageView
android:id="@+id/home_login_server_iv"
@@ -213,11 +214,11 @@
android:layout_height="52dp"
android:layout_marginTop="@dimen/dp_45"
android:background="@drawable/yesandnocheck"
+ android:enabled="false"
android:gravity="center"
android:text="@string/home_login_鐧诲綍"
android:textColor="@color/text_FFFFFFFF"
android:textSize="18sp"
- android:enabled="false"
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" />
--
Gitblit v1.8.0