Merge branch 'master' into google

wjc

昨天 f151e203da870dbe281defcb1daf84a1a38ecac1

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

New file
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FF000000">
    <!--搜索-->
    <RelativeLayout
        android:id="@+id/power_station_search_cl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_48"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">

        <RelativeLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="4.5dp"
            android:layout_marginEnd="@dimen/dp_16"
            android:layout_marginBottom="4.5dp"
            android:layout_toStartOf="@+id/power_station_read_iv"
            android:background="@drawable/search_bj_ff1c1c1e">

            <ImageView
                android:id="@+id/power_station_search_iv"
                android:layout_width="@dimen/dp_18"
                android:layout_height="@dimen/dp_18"
                android:layout_alignParentStart="true"
                android:layout_centerVertical="true"
                android:layout_marginStart="@dimen/dp_13"
                android:src="@drawable/search_path" />

            <TextView
                android:id="@+id/power_station_search_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_centerVertical="true"
                android:layout_marginStart="@dimen/dp_11"
                android:layout_toEndOf="@+id/power_station_search_iv"
                android:text="@string/search_station"
                android:textColor="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14" />
        </RelativeLayout>

        <ImageView
            android:id="@+id/power_station_read_iv"
            android:layout_width="@dimen/dp_33"
            android:layout_height="@dimen/dp_33"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_21"
            android:src="@drawable/clear_all" />


    </RelativeLayout>
    <!--住宅列表消息-->

    <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
        android:id="@+id/house_list_rbl"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_marginTop="10dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">

        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/house_list_rcv"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:clipToPadding="false"
            android:paddingTop="@dimen/dp_10" />

    </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>
    <!--没有数据显示样式-->
    <include
        android:id="@+id/device_null_data_ic"
        layout="@layout/null_data_view"
        android:layout_width="match_parent"
        android:layout_height="224dp"
        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl" />
</androidx.constraintlayout.widget.ConstraintLayout>