Merge branch 'wjc'

wjc

2023-06-05 57e16d05ef4924a480a5895cdb485556cc820e9b

 app/src/main/res/layout/activity_my_power_station.xml

@@ -5,13 +5,13 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_F9FAFB"
    tools:context=".ui.home.MyPowerStationActivity">
    tools:context="com.hdl.photovoltaic.ui.MyPowerStationActivity">

    <!--我的电站-Fragment-->
    <androidx.fragment.app.FragmentContainerView

        android:id="@+id/my_power_station_fcv1"
        android:name="com.example.photovoltaic.ui.home.HouseListFragment"
        android:name="com.hdl.photovoltaic.ui.powerstation.HouseListFragment"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:visibility="gone"
@@ -22,7 +22,7 @@
    <!--我的-Fragment-->
    <androidx.fragment.app.FragmentContainerView
        android:id="@+id/my_power_station_fcv2"
        android:name="com.example.photovoltaic.ui.home.MeFragment"
        android:name="com.hdl.photovoltaic.ui.me.MeFragment"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:visibility="gone"