From d097db1e26632ff6a484c5e3c3eda91d9df2dabf Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 五月 2024 15:33:21 +0800
Subject: [PATCH] Merge branch 'wxw_new' into lwj_new
---
app/src/main/res/layout/activity_my_power_station.xml | 56 ++++++++++----------------------------------------------
1 files changed, 10 insertions(+), 46 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 8ff1ef7..20a2b11 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -4,55 +4,19 @@
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_home_page_fcv0"
- android:name="com.hdl.photovoltaic.ui.home.HomePageFragment"
- 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_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"
--
Gitblit v1.8.0