Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -13,7 +13,7 @@
    <RelativeLayout
        android:id="@+id/item_parent_rl"
        android:layout_width="0dp"
        android:layout_height="164dp"
        android:layout_height="160.5dp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
@@ -21,137 +21,221 @@
        <RelativeLayout
            android:id="@+id/device_details_info_rl"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_height="150.5dp"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_10"
            android:layout_marginEnd="@dimen/dp_16"
            android:background="@drawable/ffffff_13">
            android:background="@drawable/bj_ff1c1c1e">

            <ImageView
                android:id="@+id/device_details_image_iv"
                android:id="@+id/home_image_iv"
                android:layout_width="44dp"
                android:layout_height="42dp"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginTop="@dimen/dp_13"
                android:background="@drawable/device_image"
                android:scaleType="centerCrop" />
                android:scaleType="matrix" />

            <TextView
                android:id="@+id/device_details_name_tv"
                android:layout_width="170dp"
                android:layout_height="@dimen/dp_19"

            <LinearLayout
                android:id="@+id/home_name_ll"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_20"
                android:layout_marginStart="@dimen/dp_11"
                android:layout_marginTop="@dimen/dp_15"
                android:layout_toEndOf="@+id/device_details_image_iv"
                android:ellipsize="end"
                android:gravity="center_vertical|start"
                android:singleLine="true"
                android:textColor="@color/text_E6000000"
                android:textSize="@dimen/text_16"
                android:textStyle="bold" />
                android:layout_marginTop="14.5dp"
                android:layout_toEndOf="@+id/home_image_iv"
                android:gravity="center_vertical"
                android:orientation="horizontal">

                <TextView
                    android:id="@+id/device_state_tv"
                    android:layout_width="7dp"
                    android:layout_height="7dp"
                    android:background="@drawable/device_state_ff38c494" />

                <TextView
                    android:id="@+id/home_name_tv"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:ellipsize="end"
                    android:gravity="center_vertical|start"
                    android:paddingStart="@dimen/dp_6"
                    android:paddingEnd="@dimen/dp_20"
                    android:singleLine="true"
                    android:text="@string/power_station"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />
            </LinearLayout>


            <TextView
                android:id="@+id/device_details_sn_tv"
                android:layout_width="wrap_content"
                android:layout_height="@dimen/dp_17"
                android:layout_below="@+id/device_details_name_tv"
                android:layout_alignStart="@+id/device_details_name_tv"
                android:layout_marginTop="@dimen/dp_3"
                android:layout_height="wrap_content"
                android:layout_below="@+id/home_name_ll"
                android:layout_alignStart="@+id/home_name_ll"
                android:layout_marginTop="2.5dp"
                android:gravity="center_vertical"
                android:textColor="@color/text_66000000"
                android:text="SN:"
                android:textColor="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_12" />

            <TextView
                android:id="@+id/device_details_value_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_below="@+id/home_name_ll"
                android:layout_marginStart="3dp"
                android:layout_marginTop="1.5dp"
                android:layout_toEndOf="@+id/device_details_sn_tv"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_14" />

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

                <LinearLayout
                    android:id="@+id/device_label_run_state_ll"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:orientation="vertical">

                    <TextView
                        android:id="@+id/device_label_run_state_value_tv"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_18"
                        android:gravity="center"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_15"
                        android:textStyle="bold" />
                        android:gravity="start"
                        android:text="0"
                        android:textColor="@color/text_FFACACAC"
                        android:textSize="@dimen/text_15" />

                    <TextView
                        android:id="@+id/device_label_run_state_type_tv"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_17"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="3dp"
                        android:gravity="center"
                        android:gravity="start"
                        android:text="@string/device_run_state"
                        android:textColor="@color/text_66000000"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>

                <LinearLayout
                    android:id="@+id/device_label_power_ll"
                    android:layout_width="0dp"
                    android:layout_width="@dimen/dp_0"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center">

                    <View
                        android:layout_width="0.5dp"
                        android:layout_height="17.5dp"
                        android:layout_gravity="center"
                        android:background="@color/text_1AFFFFFF" />
                </LinearLayout>

                <LinearLayout
                    android:id="@+id/device_label_power_ll"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:orientation="vertical">

                    <TextView
                        android:id="@+id/device_label_power_value_tv"

                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_18"
                        android:gravity="center"
                        android:text="0"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_15"
                        android:textStyle="bold" />
                        android:layout_height="@dimen/dp_18">

                        <TextView
                            android:id="@+id/device_label_power_value_tv"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_gravity="center_horizontal"
                            android:text="0"
                            android:textColor="@color/text_FFACACAC"
                            android:textSize="@dimen/text_14" />

                        <TextView
                            android:id="@+id/device_label_power_unit"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_marginStart="3dp"
                            android:gravity="bottom"
                            android:text="kW"
                            android:textColor="@color/text_FF5B5B5B"
                            android:textSize="@dimen/text_10" />
                    </LinearLayout>

                    <TextView
                        android:id="@+id/device_label_power_type_tv"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_17"
                        android:layout_marginTop="3dp"
                        android:gravity="center"
                        android:gravity="start|center_horizontal"
                        android:text="@string/active_power"
                        android:textColor="@color/text_66000000"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>

                <LinearLayout
                    android:id="@+id/device_label_day_ll"
                    android:layout_width="0dp"
                    android:layout_width="@dimen/dp_0"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center">

                    <View
                        android:layout_width="0.5dp"
                        android:layout_height="17.5dp"
                        android:layout_gravity="center"
                        android:background="@color/text_1AFFFFFF" />
                </LinearLayout>

                <LinearLayout
                    android:id="@+id/device_label_day_ll"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:orientation="vertical">

                    <TextView
                        android:id="@+id/device_label_day_value_tv"
                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_18"
                        android:gravity="center"
                        android:text="0"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_15"
                        android:textStyle="bold" />
                        android:layout_height="@dimen/dp_18">

                        <TextView
                            android:id="@+id/device_label_day_value_tv"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:gravity="center_vertical|start"
                            android:text="0"
                            android:textColor="@color/text_FFACACAC"
                            android:textSize="@dimen/text_14" />

                        <TextView
                            android:id="@+id/device_label_day_unit"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_marginStart="3dp"
                            android:gravity="bottom"
                            android:text="kW"
                            android:textColor="@color/text_FF5B5B5B"
                            android:textSize="@dimen/text_10" />
                    </LinearLayout>


                    <TextView
                        android:id="@+id/device_label_day_type_tv"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_17"
                        android:layout_marginTop="3dp"
                        android:gravity="center"
                        android:gravity="start"
                        android:text="@string/day_power_generation"
                        android:textColor="@color/text_66000000"
                        android:textColor="@color/text_FF5B5B5B"
                        android:textSize="@dimen/text_12" />

                </LinearLayout>
@@ -162,48 +246,39 @@
            <View
                android:id="@+id/line"
                android:layout_width="match_parent"
                android:layout_height="1dp"
                android:layout_height="0.5dp"
                android:layout_below="@+id/screening_condition_ll"
                android:layout_marginStart="@dimen/dp_17"
                android:layout_marginTop="@dimen/dp_8"
                android:layout_marginEnd="@dimen/dp_16"
                android:background="@color/text_E1E1E1" />

            <ImageView
                android:id="@+id/device_label_location_iv"
                android:layout_width="@dimen/dp_19"
                android:layout_height="@dimen/dp_19"
                android:background="@color/text_1AFFFFFF" />
            <!--电站地址-->
            <RelativeLayout
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_35"
                android:layout_below="@+id/line"
                android:layout_marginStart="@dimen/dp_11"
                android:layout_marginTop="@dimen/dp_7"
                android:src="@drawable/location" />
                android:layout_marginStart="11dp">

            <TextView
                android:id="@+id/device_label_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/device_label_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" />
                <ImageView
                    android:id="@+id/device_label_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/device_label_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" />
                <TextView
                    android:id="@+id/device_label_location_tv"
                    android:layout_width="290dp"
                    android:layout_height="@dimen/dp_17"
                    android:layout_centerVertical="true"
                    android:layout_toEndOf="@+id/device_label_location_iv"
                    android:ellipsize="end"
                    android:gravity="center_vertical|start"
                    android:singleLine="true"
                    android:text="@string/power_station"
                    android:textColor="@color/text_FF5B5B5B"
                    android:textSize="@dimen/text_12" />
            </RelativeLayout>


        </RelativeLayout>