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_my_power_station.xml | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/app/src/main/res/layout/activity_my_power_station.xml b/app/src/main/res/layout/activity_my_power_station.xml
index 719fb3c..e5035f0 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/bj"
+ android:background="@color/text_FF000000"
tools:context="com.hdl.photovoltaic.ui.BPowerStationActivity">
<!--锛堥椤�-鐢电珯-娑堟伅-鎴戠殑锛�-Fragment-->
@@ -12,48 +12,62 @@
android:id="@+id/module_fcv"
android:layout_width="0dp"
android:layout_height="0dp"
- app:layout_constraintBottom_toTopOf="@+id/my_power_station_bottom_ll"
+ app:layout_constraintBottom_toTopOf="@+id/ll"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
- android:id="@+id/my_power_station_bottom_ll"
+ android:id="@+id/ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_64"
- android:background="@drawable/ffffff_18"
- android:orientation="horizontal"
+ android:background="@color/text_FF1C1C1E"
+ android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
- <!--棣栭〉-妯″潡-->
- <include
- android:id="@+id/my_power_station_bottom_il0"
- layout="@layout/home_bottom_line"
- />
- <!--鐢电珯-妯″潡-->
- <include
- android:id="@+id/my_power_station_bottom_il1"
- layout="@layout/home_bottom_line"
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:background="@color/text_1AFFFFFF" />
- />
- <!--鎶ヨ-妯″潡-->
- <include
- android:id="@+id/my_message_bottom_il2"
- layout="@layout/home_bottom_line" />
+ <LinearLayout
+ android:id="@+id/my_power_station_bottom_ll"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:orientation="horizontal">
- <!-- <View-->
- <!-- android:layout_width="@dimen/dp_1"-->
- <!-- android:layout_height="@dimen/dp_17"-->
- <!-- android:background="@color/text_CBCDD1" />-->
- <!--鎴戠殑-妯″潡-->
- <include
- android:id="@+id/my_me_bottom_il3"
- layout="@layout/home_bottom_line" />
+ <!--棣栭〉-妯″潡-->
+ <include
+ android:id="@+id/my_power_station_bottom_il0"
+ layout="@layout/home_bottom_line"
+
+ />
+ <!--鐢电珯-妯″潡-->
+ <include
+ android:id="@+id/my_power_station_bottom_il1"
+ layout="@layout/home_bottom_line"
+
+ />
+ <!--鎶ヨ-妯″潡-->
+ <include
+ android:id="@+id/my_message_bottom_il2"
+ layout="@layout/home_bottom_line" />
+
+ <!-- <View-->
+ <!-- android:layout_width="@dimen/dp_1"-->
+ <!-- android:layout_height="@dimen/dp_17"-->
+ <!-- android:background="@color/text_CBCDD1" />-->
+ <!--鎴戠殑-妯″潡-->
+ <include
+ android:id="@+id/my_me_bottom_il3"
+ layout="@layout/home_bottom_line" />
+ </LinearLayout>
</LinearLayout>
--
Gitblit v1.8.0