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_my_power_station.xml | 58 ++++++++++++++++++++--------------------------------------
1 files changed, 20 insertions(+), 38 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 50ed6b0..1380c78 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -4,60 +4,42 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F9FAFB"
- tools:context="com.hdl.photovoltaic.ui.MyPowerStationActivity">
+ android:background="@drawable/bj"
+ tools:context="com.hdl.photovoltaic.ui.BPowerStationActivity">
- <!--鐢电珯鍒楄〃-Fragment-->
+ <!--锛堥椤�-鐢电珯-娑堟伅-鎴戠殑锛�-Fragment-->
<androidx.fragment.app.FragmentContainerView
+ 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_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
- android:id="@+id/my_power_station_fcv1"
- android:name="com.hdl.photovoltaic.ui.powerstation.HouseListFragment"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:visibility="gone"
- app:layout_constraintBottom_toTopOf="@+id/my_power_station_bottom_ll"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
- <!--娑堟伅-Fragment-->
- <androidx.fragment.app.FragmentContainerView
- android:id="@+id/my_message_fcv2"
- android:name="com.hdl.photovoltaic.ui.message.MessageFragment"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:visibility="gone"
- app:layout_constraintBottom_toTopOf="@+id/my_power_station_bottom_ll"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
- <!--鎴戠殑-Fragment-->
- <androidx.fragment.app.FragmentContainerView
- android:id="@+id/my_me_fcv3"
- android:name="com.hdl.photovoltaic.ui.me.MeFragment"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:visibility="gone"
- app:layout_constraintBottom_toTopOf="@+id/my_power_station_bottom_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:layout_width="match_parent"
android:layout_height="@dimen/dp_49"
- android:background="@color/text_FFFFFFFF"
+ android:background="@drawable/module_13_ffffff"
android:orientation="horizontal"
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"
/>
- <!--娑堟伅-->
+ <!--鎶ヨ-妯″潡-->
<include
android:id="@+id/my_message_bottom_il2"
layout="@layout/home_bottom_line" />
@@ -66,7 +48,7 @@
<!-- 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" />
--
Gitblit v1.8.0