Merge branch '1.5.1'

wjc

2025-01-07 90d5f028ccdaaaf64286f9d632cb335a4d0544b9

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

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

    <!--（首页-电站-消息-我的）-Fragment-->
@@ -12,48 +12,62 @@
        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_constraintBottom_toTopOf="@+id/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:id="@+id/ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_64"
        android:background="@drawable/ffffff_18"
        android:orientation="horizontal"
        android:background="@color/text_FF1C1C1E"
        android:orientation="vertical"
        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"
        <View
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:background="@color/text_1AFFFFFF" />

            />
        <!--报警-模块-->
        <include
            android:id="@+id/my_message_bottom_il2"
            layout="@layout/home_bottom_line" />
        <LinearLayout
            android:id="@+id/my_power_station_bottom_ll"
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_weight="1"
            android:orientation="horizontal">

        <!--        <View-->
        <!--            android:layout_width="@dimen/dp_1"-->
        <!--            android:layout_height="@dimen/dp_17"-->
        <!--            android:background="@color/text_CBCDD1" />-->
        <!--我的-模块-->
        <include
            android:id="@+id/my_me_bottom_il3"
            layout="@layout/home_bottom_line" />
            <!--首页-模块-->
            <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" />-->
            <!--我的-模块-->
            <include
                android:id="@+id/my_me_bottom_il3"
                layout="@layout/home_bottom_line" />


        </LinearLayout>
    </LinearLayout>