From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/res/layout/activity_cpower_station.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_cpower_station.xml b/app/src/main/res/layout/activity_cpower_station.xml
index cb6ae59..bdc9b73 100644
--- a/app/src/main/res/layout/activity_cpower_station.xml
+++ b/app/src/main/res/layout/activity_cpower_station.xml
@@ -4,10 +4,10 @@
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-->
+ <!-- <TextView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="@dimen/dp_5"-->
--
Gitblit v1.8.0