From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/activity_my_power_station.xml | 53 +++++++++--------------------------------------------
1 files changed, 9 insertions(+), 44 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 dbfaefd..1380c78 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -7,57 +7,22 @@
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="0dp"
- 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="0dp"
- 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="0dp"
- 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="0dp"
- 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"
--
Gitblit v1.8.0