From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/res/layout/activity_start.xml | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml
index 0c6519e..58b31b6 100644
--- a/app/src/main/res/layout/activity_start.xml
+++ b/app/src/main/res/layout/activity_start.xml
@@ -4,12 +4,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ui.StartActivity">
+ android:background="@color/text_FFFFFFFF"
+ tools:context="com.hdl.photovoltaic.ui.StartActivity">
<TextView
- android:layout_width="wrap_content"
+ android:id="@+id/start_tv"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="娆㈣繋鎵撳紑鏅烘収鑳芥簮APP"
+ android:layout_marginStart="@dimen/dp_5"
+ android:layout_marginEnd="@dimen/dp_5"
+ android:gravity="center"
+ android:text="@string/welcome_to_the_smart_energy_app"
android:textColor="@color/text_245EC3"
android:textSize="@dimen/text_28"
app:layout_constraintBottom_toBottomOf="parent"
@@ -19,4 +24,15 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.093" />
+ <ImageView
+ android:id="@+id/as_regards_icon_iv"
+ android:layout_width="53.5dp"
+ android:layout_height="53.5dp"
+ android:layout_marginTop="@dimen/dp_29"
+ android:src="@drawable/logo"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/start_tv" />
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0