From b2d2e6dcf6ec38a2f24721f2bc925d634a6eb78d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十二月 2023 18:31:01 +0800
Subject: [PATCH] 2023年12月05日18:30:40
---
app/src/main/res/layout/activity_my_power_station.xml | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 5410ff4..a11ac27 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -5,13 +5,25 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/text_F9FAFB"
- tools:context="com.hdl.photovoltaic.ui.home.MyPowerStationActivity">
+ tools:context="com.hdl.photovoltaic.ui.MyPowerStationActivity">
- <!--鎴戠殑鐢电珯-Fragment-->
+ <!--鐢电珯鍒楄〃-Fragment-->
<androidx.fragment.app.FragmentContainerView
android:id="@+id/my_power_station_fcv1"
- android:name="com.hdl.photovoltaic.ui.home.powerstation.HouseListFragment"
+ 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"
@@ -21,8 +33,8 @@
app:layout_constraintTop_toTopOf="parent" />
<!--鎴戠殑-Fragment-->
<androidx.fragment.app.FragmentContainerView
- android:id="@+id/my_power_station_fcv2"
- android:name="com.hdl.photovoltaic.ui.home.me.MeFragment"
+ 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"
@@ -36,7 +48,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_49"
android:background="@color/text_FFFFFFFF"
- android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -44,16 +55,21 @@
<!--鐢电珯-鏍囩-->
<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" />
+ <!-- <View-->
+ <!-- android:layout_width="@dimen/dp_1"-->
+ <!-- android:layout_height="@dimen/dp_17"-->
+ <!-- android:background="@color/text_CBCDD1" />-->
<!--鎴戠殑-鏍囩-->
<include
- android:id="@+id/my_power_station_bottom_il2"
+ android:id="@+id/my_me_bottom_il3"
layout="@layout/home_bottom_line" />
--
Gitblit v1.8.0