Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

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

@@ -3,7 +3,7 @@
<com.hdl.photovoltaic.widget.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/item_parent_swipeLayout"
    android:layout_width="match_parent"
    android:layout_height="wrap_content">
    android:layout_height="@dimen/dp_164">

    <include
        android:id="@+id/swipe_layout_il"
@@ -17,9 +17,8 @@
        <RelativeLayout
            android:id="@+id/device_details_info_rl"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_height="@dimen/dp_148"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
            android:background="@drawable/ffffff_13">

@@ -34,16 +33,18 @@

            <TextView
                android:id="@+id/device_details_name_tv"
                android:layout_width="170dp"
                android:layout_width="0dp"
                android:layout_height="@dimen/dp_19"
                android:layout_marginStart="@dimen/dp_11"
                android:layout_marginTop="@dimen/dp_15"
                android:layout_marginEnd="10dp"
                android:layout_toStartOf="@+id/fragment_house_list_line_state_tv"
                android:layout_toEndOf="@+id/device_details_image_iv"
                android:ellipsize="end"
                android:gravity="center_vertical|start"
                android:singleLine="true"
                android:text="@string/power_station"
                android:textColor="@color/text_90000000"
                android:textColor="@color/text_E6000000"
                android:textSize="@dimen/text_16"
                android:textStyle="bold" />

@@ -55,17 +56,30 @@
                android:layout_alignStart="@+id/device_details_name_tv"
                android:layout_marginTop="@dimen/dp_3"
                android:gravity="center_vertical"
                android:text="@string/installed_capacity"
                android:textColor="@color/text_40000000"
                android:text="@string/string_capacity"
                android:textColor="@color/text_66000000"
                android:textSize="@dimen/text_12" />

            <TextView
                android:id="@+id/fragment_house_list_line_state_tv"
                android:layout_width="69dp"
                android:layout_height="@dimen/dp_33"
                android:layout_alignParentTop="true"
                android:layout_alignParentEnd="true"
                android:background="@drawable/state_ffb300"
                android:gravity="center"
                android:text="@string/my_power_station_connecting"
                android:textColor="@color/text_FFFFFFFF"
                android:textSize="@dimen/text_12" />

            <LinearLayout
                android:id="@+id/screening_condition_ll"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_36"
                android:layout_height="@dimen/dp_37"
                android:layout_below="@+id/device_details_image_iv"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_alignStart="@+id/device_details_image_iv"
                android:layout_marginTop="@dimen/dp_17"
                android:layout_marginEnd="@dimen/dp_16"
                android:orientation="horizontal">

                <LinearLayout
@@ -79,20 +93,19 @@
                        android:id="@+id/power_value_tv"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_18"
                        android:gravity="center"
                        android:text="99"
                        android:textColor="@color/text_90000000"
                        android:textSize="@dimen/text_15"
                        android:textStyle="bold" />
                        android:gravity="center_vertical|start"
                        android:text="0"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_15" />

                    <TextView
                        android:id="@+id/power_type_tv"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_15"
                        android:layout_marginTop="3dp"
                        android:gravity="center"
                        android:gravity="center_vertical|start"
                        android:text="@string/generated_power"
                        android:textColor="@color/text_40000000"
                        android:textColor="@color/text_66000000"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>
@@ -109,10 +122,9 @@
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_18"
                        android:gravity="center"
                        android:text="99"
                        android:textColor="@color/text_90000000"
                        android:textSize="@dimen/text_15"
                        android:textStyle="bold" />
                        android:text="0"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_15" />

                    <TextView
                        android:id="@+id/day_type_tv"
@@ -121,7 +133,7 @@
                        android:layout_marginTop="3dp"
                        android:gravity="center"
                        android:text="@string/day_power_generation"
                        android:textColor="@color/text_40000000"
                        android:textColor="@color/text_66000000"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>
@@ -137,20 +149,19 @@
                        android:id="@+id/month_value_tv"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_18"
                        android:gravity="center"
                        android:text="99"
                        android:textColor="@color/text_90000000"
                        android:textSize="@dimen/text_15"
                        android:textStyle="bold" />
                        android:gravity="center_vertical|end"
                        android:text="0"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_15" />

                    <TextView
                        android:id="@+id/month_type_tv"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_15"
                        android:layout_marginTop="3dp"
                        android:gravity="center"
                        android:gravity="center_vertical|end"
                        android:text="@string/month_power_generation"
                        android:textColor="@color/text_40000000"
                        android:textColor="@color/text_66000000"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>
@@ -163,46 +174,38 @@
                android:layout_width="match_parent"
                android:layout_height="1dp"
                android:layout_below="@+id/screening_condition_ll"
                android:layout_marginStart="@dimen/dp_17"
                android:layout_marginTop="@dimen/dp_8"
                android:layout_alignStart="@+id/device_details_image_iv"
                android:layout_marginTop="@dimen/dp_7"
                android:layout_marginEnd="@dimen/dp_16"
                android:background="@color/text_E1E1E1" />

            <ImageView
                android:id="@+id/plant_details_location_iv"
                android:layout_width="@dimen/dp_19"
                android:layout_height="@dimen/dp_19"
                android:layout_below="@+id/line"
                android:layout_marginStart="@dimen/dp_11"
                android:layout_marginTop="@dimen/dp_7"
                android:src="@drawable/location" />

            <TextView
                android:id="@+id/plant_details_location_tv"
                android:layout_width="290dp"
                android:layout_height="@dimen/dp_19"
                android:layout_below="@+id/line"
                android:layout_marginStart="@dimen/dp_3"
                android:layout_marginTop="@dimen/dp_8"
                android:layout_toEndOf="@+id/plant_details_location_iv"
                android:ellipsize="end"
                android:gravity="center_vertical|start"
                android:singleLine="true"
                android:text="@string/power_station"
                android:textColor="@color/text_40000000"
                android:textSize="@dimen/text_12" />

            <TextView
                android:id="@+id/fragment_house_list_line_state_tv"
                android:layout_width="69dp"
            <!--电站地址-->
            <RelativeLayout
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_33"
                android:layout_alignParentTop="true"
                android:layout_alignParentEnd="true"
                android:background="@drawable/state_ffb300"
                android:gravity="center"
                android:text="@string/my_power_station_connecting"
                android:textColor="@color/text_FFFFFFFF"
                android:textSize="@dimen/text_12" />
                android:layout_below="@+id/line"
                android:layout_marginStart="11dp">

                <ImageView
                    android:id="@+id/plant_details_location_iv"
                    android:layout_width="@dimen/dp_19"
                    android:layout_height="@dimen/dp_19"
                    android:layout_centerVertical="true"
                    android:src="@drawable/location" />

                <TextView
                    android:id="@+id/plant_details_location_tv"
                    android:layout_width="290dp"
                    android:layout_height="@dimen/dp_17"
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_5"
                    android:layout_toEndOf="@+id/plant_details_location_iv"
                    android:ellipsize="end"
                    android:gravity="center_vertical|start"
                    android:singleLine="true"
                    android:text="@string/power_station"
                    android:textColor="@color/text_66000000"
                    android:textSize="@dimen/text_12" />
            </RelativeLayout>


        </RelativeLayout>