From 36487596c9951571f376e3d181d46ee11174f8e2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 27 十一月 2024 18:46:31 +0800
Subject: [PATCH] 2024年11月27日18:46:26
---
app/src/main/res/layout/item_device_details.xml | 143 +++++++++++++++++++++++++++++++++--------------
1 files changed, 99 insertions(+), 44 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..2913a84 100644
--- a/app/src/main/res/layout/item_device_details.xml
+++ b/app/src/main/res/layout/item_device_details.xml
@@ -25,7 +25,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/ffffff_13">
+ android:background="@drawable/bj_ff333738">
<ImageView
android:id="@+id/device_details_image_iv"
@@ -37,29 +37,51 @@
android:scaleType="centerCrop" />
<TextView
- android:id="@+id/device_details_name_tv"
- android:layout_width="170dp"
- android:layout_height="@dimen/dp_19"
+ android:id="@+id/device_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
android:layout_marginStart="@dimen/dp_11"
- android:layout_marginTop="@dimen/dp_15"
+ android:layout_marginTop="@dimen/dp_21"
android:layout_toEndOf="@+id/device_details_image_iv"
+ android:background="@drawable/device_state_ff38c494" />
+
+ <TextView
+ android:id="@+id/device_details_name_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_19"
+ android:layout_marginStart="@dimen/dp_6"
+ android:layout_marginTop="@dimen/dp_15"
+ android:layout_marginEnd="@dimen/dp_6"
+ android:layout_toEndOf="@+id/device_state_tv"
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:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+
<TextView
android:id="@+id/device_details_sn_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="wrap_content"
android:layout_below="@+id/device_details_name_tv"
- android:layout_alignStart="@+id/device_details_name_tv"
+ android:layout_alignStart="@+id/device_state_tv"
android:layout_marginTop="@dimen/dp_3"
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/device_details_name_tv"
+ 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"
@@ -84,7 +106,7 @@
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
@@ -94,10 +116,16 @@
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>
+
+ <View
+ android:layout_width="0.5dp"
+ android:layout_height="17.5dp"
+ android:layout_gravity="center"
+ android:background="@color/text_1AFFFFFF" />
<LinearLayout
android:id="@+id/device_label_power_ll"
@@ -106,14 +134,31 @@
android:layout_weight="1"
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:gravity="center">
+
+ <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/day_kwp_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"
@@ -122,10 +167,16 @@
android:layout_marginTop="3dp"
android:gravity="center"
android:text="@string/active_power"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</LinearLayout>
+
+ <View
+ android:layout_width="0.5dp"
+ android:layout_height="17.5dp"
+ android:layout_gravity="center"
+ android:background="@color/text_1AFFFFFF" />
<LinearLayout
android:id="@+id/device_label_day_ll"
@@ -134,14 +185,31 @@
android:layout_weight="1"
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="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center_vertical|end"
+ android:text="0"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+
+ <TextView
+ android:id="@+id/month_kwp_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"
@@ -150,7 +218,7 @@
android:layout_marginTop="3dp"
android:gravity="end"
android:text="@string/day_power_generation"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -161,12 +229,12 @@
<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"
@@ -191,22 +259,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