From b8209d15d915f72d9abe3a68b76e1f4cfd21eac3 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期六, 23 九月 2023 14:37:00 +0800 Subject: [PATCH] 2023年09月23日14:36:51 --- app/src/main/res/layout/activity_my_power_station.xml | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 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 566b68c..a11ac27 100644 --- a/app/src/main/res/layout/activity_my_power_station.xml +++ b/app/src/main/res/layout/activity_my_power_station.xml @@ -7,7 +7,7 @@ android:background="@color/text_F9FAFB" tools:context="com.hdl.photovoltaic.ui.MyPowerStationActivity"> - <!--鎴戠殑鐢电珯-Fragment--> + <!--鐢电珯鍒楄〃-Fragment--> <androidx.fragment.app.FragmentContainerView android:id="@+id/my_power_station_fcv1" @@ -19,9 +19,21 @@ 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_power_station_fcv2" + android:id="@+id/my_me_fcv3" android:name="com.hdl.photovoltaic.ui.me.MeFragment" android:layout_width="match_parent" android:layout_height="0dp" @@ -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