mac
2024-08-01 e6a72a0269edcecab7a455487a90a2e50f74826e
app/src/main/res/layout/fragment_house_list.xml
@@ -4,12 +4,13 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/house_list_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:background="@drawable/bj">
    <!--头部标签-->
    <RelativeLayout
        android:id="@+id/title_cl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_31"
        android:layout_height="@dimen/dp_44"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_44"
        android:layout_marginEnd="@dimen/dp_16"
@@ -32,9 +33,8 @@
            android:id="@+id/device_label"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_marginStart="19dp"
            android:layout_marginEnd="7dp"
            android:layout_toStartOf="@+id/edit_iv"
            android:layout_marginStart="17dp"
            android:layout_marginEnd="-339dp"
            android:layout_toEndOf="@+id/power_station_label"
            android:gravity="start|center_vertical"
            android:text="@string/device"
@@ -50,14 +50,14 @@
            android:layout_marginEnd="@dimen/dp_13"
            android:layout_toStartOf="@+id/add_iv"
            android:src="@drawable/edit"
            />
            android:visibility="gone" />
        <ImageView
            android:id="@+id/add_iv"
            android:layout_width="@dimen/dp_31"
            android:layout_height="@dimen/dp_31"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:src="@drawable/add" />
@@ -77,7 +77,7 @@
            android:id="@+id/power_station_label_top_cl"
            android:layout_width="match_parent"
            android:layout_height="174dp"
            android:layout_marginTop="@dimen/dp_21">
            android:layout_marginTop="@dimen/dp_13">
            <!--搜索-->
            <RelativeLayout
                android:id="@+id/power_station_search_cl"
@@ -169,7 +169,6 @@
                android:layout_height="@dimen/dp_17"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginTop="@dimen/dp_21"
                android:layout_marginEnd="@dimen/dp_12"
                android:orientation="horizontal"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -177,10 +176,8 @@
                <RelativeLayout
                    android:id="@+id/station_name_rl"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center"
                    android:orientation="horizontal">
                    <TextView
@@ -190,7 +187,8 @@
                        android:text="@string/station_name"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        />
                    <ImageView
                        android:id="@+id/station_name_iv"
@@ -198,15 +196,18 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_name_tv"
                        android:background="@drawable/ascending_descending_order_select" />
                    <View
                        android:layout_width="@dimen/dp_16"
                        android:layout_height="match_parent"
                        android:layout_toEndOf="@+id/station_name_iv" />
                </RelativeLayout>
                <RelativeLayout
                    android:id="@+id/station_power_rl"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center"
                    android:orientation="horizontal">
                    <TextView
@@ -215,8 +216,7 @@
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/generated_power"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textSize="@dimen/text_12" />
                    <ImageView
                        android:id="@+id/station_power_iv"
@@ -224,15 +224,18 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_power_tv"
                        android:background="@drawable/ascending_descending_order_select" />
                    <View
                        android:layout_width="@dimen/dp_16"
                        android:layout_height="match_parent"
                        android:layout_toEndOf="@+id/station_power_iv" />
                </RelativeLayout>
                <RelativeLayout
                    android:id="@+id/station_day_rl"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center"
                    android:orientation="horizontal">
                    <TextView
@@ -241,8 +244,7 @@
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/day_power_generation"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textSize="@dimen/text_12" />
                    <ImageView
                        android:id="@+id/station_day_iv"
@@ -250,15 +252,18 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_day_tv"
                        android:background="@drawable/ascending_descending_order_select" />
                    <View
                        android:layout_width="@dimen/dp_16"
                        android:layout_height="match_parent"
                        android:layout_toEndOf="@+id/station_day_iv" />
                </RelativeLayout>
                <RelativeLayout
                    android:id="@+id/station_month_rl"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center"
                    android:orientation="horizontal">
                    <TextView
@@ -267,8 +272,7 @@
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/month_power_generation"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textSize="@dimen/text_12" />
                    <ImageView
                        android:id="@+id/station_month_iv"
@@ -319,7 +323,7 @@
            android:id="@+id/device_label_top_cl"
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_marginTop="@dimen/dp_21">
            android:layout_marginTop="@dimen/dp_13">
            <!--搜索-->
            <RelativeLayout
                android:id="@+id/device_search_cl"