From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/activity_cpower_station.xml | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/app/src/main/res/layout/activity_cpower_station.xml b/app/src/main/res/layout/activity_cpower_station.xml
index 70c3bc8..bdc9b73 100644
--- a/app/src/main/res/layout/activity_cpower_station.xml
+++ b/app/src/main/res/layout/activity_cpower_station.xml
@@ -4,23 +4,23 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_FFFFFFFF"
+ android:background="@color/text_FF000000"
tools:context=".ui.CPowerStationActivity">
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- 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"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.496"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.093" />
+ <!-- <TextView-->
+ <!-- android:layout_width="match_parent"-->
+ <!-- android:layout_height="wrap_content"-->
+ <!-- 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"-->
+ <!-- app:layout_constraintEnd_toEndOf="parent"-->
+ <!-- app:layout_constraintHorizontal_bias="0.496"-->
+ <!-- app:layout_constraintStart_toStartOf="parent"-->
+ <!-- app:layout_constraintTop_toTopOf="parent"-->
+ <!-- app:layout_constraintVertical_bias="0.093" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0