From a77dcb0250488ca6567490ed9fb5ce969bf41db7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 29 五月 2024 14:55:03 +0800
Subject: [PATCH] Merge branch 'wjc_new' into feature/hxb
---
app/src/main/res/layout/activity_home_login.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index 21e841a..0d5d93b 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:background="@drawable/logo_bj"
- tools:context="com.hdl.photovoltaic.ui.HomeLoginActivity">
+ tools:context="com.hdl.photovoltaic.ui.LoginActivity">
<ImageView
android:id="@+id/home_login_server_iv"
@@ -58,7 +58,7 @@
android:layout_height="@dimen/dp_39"
android:layout_marginTop="@dimen/dp_40"
android:text="@string/home_login_hdl_stored_energy"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_28"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/home_login_server_iv"
@@ -122,7 +122,6 @@
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_32"
android:src="@drawable/clear"
- android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/home_login_account_et"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/home_login_account_et" />
--
Gitblit v1.8.0