From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/item_device_details.xml | 208 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 140 insertions(+), 68 deletions(-)
diff --git a/app/src/main/res/layout/item_device_details.xml b/app/src/main/res/layout/item_device_details.xml
index 8a7ce61..b5da7ad 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/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,11 +21,11 @@
<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"
@@ -34,48 +34,77 @@
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_marginTop="14.5dp"
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: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/device_details_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_E6FFFFFF"
+ 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_66FFFFFF"
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_E6FFFFFF"
+ 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_height="@dimen/dp_37"
android:layout_below="@+id/device_details_image_iv"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_17"
- android:layout_marginEnd="@dimen/dp_16"
+ 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
@@ -84,73 +113,129 @@
android:layout_height="@dimen/dp_18"
android:gravity="start"
android:text="0"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
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="start"
android:text="@string/device_run_state"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
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: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_E6FFFFFF"
+ 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_66FFFFFF"
+ 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_66FFFFFF"
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="end"
- android:text="0"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15" />
+ 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_E6FFFFFF"
+ 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_66FFFFFF"
+ 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="end"
+ android:gravity="start"
android:text="@string/day_power_generation"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -161,16 +246,16 @@
<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" />
+ android:background="@color/text_1AFFFFFF" />
<!--鐢电珯鍦板潃-->
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_33"
+ android:layout_height="@dimen/dp_35"
android:layout_below="@+id/line"
android:layout_marginStart="11dp">
@@ -191,22 +276,9 @@
android:gravity="center_vertical|start"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</RelativeLayout>
-
-
- <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" />
</RelativeLayout>
--
Gitblit v1.8.0