Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -5,7 +5,7 @@
    android:id="@+id/house_list_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/bj">
    android:background="@color/text_FF000000">
    <!--头部标签-->
    <RelativeLayout
        android:id="@+id/title_cl"
@@ -23,23 +23,22 @@
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_centerVertical="true"
            android:gravity="center_vertical"
            android:gravity="center"
            android:text="@string/power_station"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_20"
            android:textStyle="bold" />
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_18" />

        <TextView
            android:id="@+id/device_label"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_centerVertical="true"
            android:layout_marginStart="17dp"
            android:layout_marginEnd="-339dp"
            android:layout_toEndOf="@+id/power_station_label"
            android:gravity="start|center_vertical"
            android:gravity="center"
            android:text="@string/device"
            android:textColor="@color/text_66000000"
            android:textSize="@dimen/text_16"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"

            />

@@ -84,7 +83,7 @@
            <!--搜索-->
            <RelativeLayout
                android:id="@+id/power_station_search_cl"
                android:layout_width="match_parent"
                android:layout_width="0dp"
                android:layout_height="@dimen/dp_35"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginEnd="@dimen/dp_16"
@@ -98,7 +97,7 @@
                    android:layout_height="match_parent"
                    android:layout_marginEnd="@dimen/dp_17"
                    android:layout_toStartOf="@+id/power_station_default_condition_iv"
                    android:background="@drawable/search_bj_ff05000000">
                    android:background="@drawable/search_bj_ff1c1c1e">

                    <ImageView

@@ -113,12 +112,12 @@
                    <TextView
                        android:id="@+id/power_station_search_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="@dimen/dp_17"
                        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_66000000"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_14" />
                </RelativeLayout>

@@ -128,39 +127,165 @@
                    android:layout_height="@dimen/dp_31"
                    android:layout_alignParentEnd="true"
                    android:layout_centerVertical="true"
                    android:src="@drawable/default_condition" />
                    android:src="@drawable/condition_screening" />


            </RelativeLayout>

            <!--条件筛选-->
            <!--条件筛选 全部，故障，离线，待接入-->
            <LinearLayout
                android:id="@+id/screening_condition_ll"
                android:layout_width="match_parent"
                android:layout_width="0dp"
                android:layout_height="@dimen/dp_56"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginTop="@dimen/dp_21"
                android:layout_marginTop="@dimen/dp_20"
                android:layout_marginEnd="@dimen/dp_16"
                android:orientation="horizontal"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
                <!--全部-->
                <LinearLayout
                    android:id="@+id/all_ll"
                    android:layout_width="@dimen/dp_74"
                    android:layout_height="match_parent"
                    android:background="@drawable/station_status_no_ffffff"
                    android:orientation="vertical">

                <include
                    android:id="@+id/power_station_all_il"
                    layout="@layout/item_station" />
                    <TextView
                        android:id="@+id/all_total_tv"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="8.5dp"
                        android:gravity="center"
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="0"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_16" />

                <include
                    android:id="@+id/power_station_faults_il"
                    layout="@layout/item_station" />
                    <TextView
                        android:id="@+id/all_des_tv"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:gravity="center"
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="@string/message_all"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />
                </LinearLayout>

                <include
                    android:id="@+id/power_station_offline_il"
                    layout="@layout/item_station" />
                <View
                    android:id="@+id/v1"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1" />
                <!--故障-->
                <LinearLayout
                    android:id="@+id/faults_ll"
                    android:layout_width="@dimen/dp_74"
                    android:layout_height="match_parent"
                    android:background="@drawable/station_status_no_ffffff"
                    android:orientation="vertical">

                <include
                    android:id="@+id/power_station_connected_il"
                    layout="@layout/item_station" />
                    <TextView
                        android:id="@+id/faults_total_tv"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="8.5dp"
                        android:gravity="center"
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="0"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_16" />

                    <TextView
                        android:id="@+id/faults_des_tv"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:gravity="center"
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="@string/my_power_station_malfunction"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />
                </LinearLayout>

                <View
                    android:id="@+id/v2"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1" />
                <!--离线-->
                <LinearLayout
                    android:id="@+id/offline_ll"
                    android:layout_width="@dimen/dp_74"
                    android:layout_height="match_parent"
                    android:background="@drawable/station_status_no_ffffff"
                    android:orientation="vertical">

                    <TextView
                        android:id="@+id/offline_total_tv"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="8.5dp"
                        android:gravity="center"
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="0"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_16" />

                    <TextView
                        android:id="@+id/offline_des_tv"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:gravity="center"
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="@string/my_power_station_off_line"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />
                </LinearLayout>

                <View
                    android:id="@+id/v3"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1" />
                <!--待接入-->
                <LinearLayout
                    android:id="@+id/connected_ll"
                    android:layout_width="@dimen/dp_74"
                    android:layout_height="match_parent"
                    android:background="@drawable/station_status_no_ffffff"
                    android:orientation="vertical">

                    <TextView
                        android:id="@+id/connected_total_tv"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="8.5dp"
                        android:gravity="center"
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="0"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_16" />

                    <TextView
                        android:id="@+id/connected_des_tv"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
                        android:gravity="center"
                        android:paddingStart="@dimen/dp_2"
                        android:paddingEnd="@dimen/dp_2"
                        android:text="@string/to_be_added"
                        android:textColor="@color/text_66FFFFFF"
                        android:textSize="@dimen/text_12" />
                </LinearLayout>

            </LinearLayout>

@@ -168,10 +293,10 @@
            <LinearLayout
                android:id="@+id/ascending_order_descending_order_parent_ll"
                android:layout_width="0dp"
                android:layout_height="@dimen/dp_17"
                android:layout_height="@dimen/dp_20"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginTop="@dimen/dp_21"
                android:layout_marginEnd="@dimen/dp_12"
                android:layout_marginTop="@dimen/dp_19"
                android:layout_marginEnd="@dimen/dp_16"
                android:orientation="horizontal"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -187,10 +312,10 @@
                    <TextView
                        android:id="@+id/station_name_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="@dimen/dp_17"
                        android:layout_height="match_parent"
                        android:text="@string/station_name"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14"

                        />

@@ -198,6 +323,7 @@
                        android:id="@+id/station_name_iv"
                        android:layout_width="@dimen/dp_18"
                        android:layout_height="@dimen/dp_18"
                        android:layout_centerVertical="true"
                        android:layout_toEndOf="@+id/station_name_tv"
                        android:background="@drawable/ascending_descending_order_select" />

@@ -219,10 +345,10 @@
                    <TextView
                        android:id="@+id/station_power_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="@dimen/dp_17"
                        android:layout_height="match_parent"
                        android:text="@string/generated_power"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12" />
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14" />

                    <ImageView
                        android:id="@+id/station_power_iv"
@@ -248,10 +374,10 @@
                    <TextView
                        android:id="@+id/station_day_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="@dimen/dp_17"
                        android:layout_height="match_parent"
                        android:text="@string/day_power_generation"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12" />
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14" />

                    <ImageView
                        android:id="@+id/station_day_iv"
@@ -278,10 +404,10 @@
                    <TextView
                        android:id="@+id/station_month_tv"
                        android:layout_width="wrap_content"
                        android:layout_height="@dimen/dp_17"
                        android:text="@string/month_power_generation"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12" />
                        android:layout_height="match_parent"
                        android:text="@string/battery_capacity_indicator"
                        android:textColor="@color/text_E6FFFFFF"
                        android:textSize="@dimen/text_14" />

                    <ImageView
                        android:id="@+id/station_month_iv"
@@ -299,7 +425,7 @@
            android:id="@+id/fragment_house_srl"
            android:layout_width="match_parent"
            android:layout_height="0dp"
            android:layout_marginTop="@dimen/dp_21"
            android:layout_marginTop="18.5dp"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@@ -352,7 +478,7 @@
                android:layout_height="@dimen/dp_35"
                android:layout_marginStart="@dimen/dp_13"
                android:layout_marginEnd="@dimen/dp_16"
                android:background="@drawable/search_bj_ff05000000"
                android:background="@drawable/search_bj_ff1c1c1e"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent">
@@ -369,12 +495,12 @@
                <TextView
                    android:id="@+id/device_search_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_17"
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/device_search_iv"
                    android:text="@string/enter_the_device_sn_and_device_name"
                    android:textColor="@color/text_66000000"
                    android:textColor="@color/text_66FFFFFF"
                    android:textSize="@dimen/text_14" />
            </RelativeLayout>

@@ -395,7 +521,7 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:clipToPadding="false"
                android:paddingBottom="@dimen/dp_16" />
                android:paddingBottom="@dimen/dp_10" />
        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

        <!--没有数据显示样式-->
@@ -415,9 +541,4 @@
    </androidx.constraintlayout.widget.ConstraintLayout>


</androidx.constraintlayout.widget.ConstraintLayout>





</androidx.constraintlayout.widget.ConstraintLayout>