Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

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

@@ -4,56 +4,53 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_F9FAFB"
    tools:context=".ui.home.MyPowerStationActivity">
    android:background="@drawable/bj"
    tools:context="com.hdl.photovoltaic.ui.BPowerStationActivity">

    <!--我的电站-Fragment-->
    <!--（首页-电站-消息-我的）-Fragment-->
    <androidx.fragment.app.FragmentContainerView

        android:id="@+id/my_power_station_fcv1"
        android:name="com.example.photovoltaic.ui.home.HouseListFragment"
        android:layout_width="match_parent"
        android:id="@+id/module_fcv"
        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_fcv2"
        android:name="com.example.photovoltaic.ui.home.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"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_49"
        android:background="@color/text_FFFFFFFF"
        android:gravity="center"
        android:layout_height="@dimen/dp_64"
        android:background="@drawable/module_13_ffffff"
        android:orientation="horizontal"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">
        <!--电站-标签-->
        <!--首页-模块-->
        <include
            android:id="@+id/my_power_station_bottom_il0"
            layout="@layout/home_bottom_line"

            />
        <!--电站-模块-->
        <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" />