From 6b53595b3114b318ea30c34adfa49e3bfde3b7f9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 09 十二月 2024 11:16:13 +0800
Subject: [PATCH] 依赖最新sdk
---
app/src/main/res/layout/item_plant_details.xml | 168 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 118 insertions(+), 50 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index fcdc37b..4700d04 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -31,37 +31,43 @@
android:background="@drawable/default_user"
android:scaleType="centerCrop" />
- <TextView
- 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_21"
- android:layout_toEndOf="@+id/device_details_image_iv"
- android:background="@drawable/device_state_ff38c494" />
- <TextView
- android:id="@+id/device_details_name_tv"
+ <LinearLayout
+ android:id="@+id/home_name_ll"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_20"
- android:layout_marginStart="@dimen/dp_6"
+ android:layout_marginStart="@dimen/dp_11"
android:layout_marginTop="@dimen/dp_15"
- android:layout_marginEnd="10dp"
- android:layout_toEndOf="@+id/device_state_tv"
- android:ellipsize="end"
- android:gravity="center_vertical|start"
- android:singleLine="true"
- android:text="@string/power_station"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_14"
- />
+ android:layout_toEndOf="@+id/device_details_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/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="wrap_content"
- android:layout_below="@+id/device_details_name_tv"
- android:layout_alignStart="@+id/device_state_tv"
+ android:layout_below="@+id/home_name_ll"
+ android:layout_alignStart="@+id/home_name_ll"
android:layout_marginTop="@dimen/dp_3"
android:gravity="center_vertical"
android:text="@string/string_capacity"
@@ -72,10 +78,10 @@
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_below="@+id/home_name_ll"
android:layout_marginStart="3dp"
- android:layout_toEndOf="@+id/device_details_sn_tv"
android:layout_marginTop="1.5dp"
+ android:layout_toEndOf="@+id/device_details_sn_tv"
android:text="0.00"
android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14" />
@@ -110,14 +116,29 @@
android:layout_weight="1"
android:orientation="vertical">
- <TextView
- android:id="@+id/power_value_tv"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18"
- android:gravity="center_vertical|start"
- android:text="0"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15" />
+ android:layout_height="@dimen/dp_18">
+
+ <TextView
+ android:id="@+id/power_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/power_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/power_type_tv"
@@ -126,10 +147,16 @@
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
android:text="@string/generated_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/day_ll"
@@ -138,14 +165,32 @@
android:layout_weight="1"
android:orientation="vertical">
- <TextView
- android:id="@+id/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:gravity="center">
+
+ <TextView
+ android:id="@+id/day_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/day_type_tv"
@@ -154,10 +199,16 @@
android:layout_marginTop="3dp"
android:gravity="center"
android:text="@string/day_power_generation"
- 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/month_ll"
@@ -166,14 +217,31 @@
android:layout_weight="1"
android:orientation="vertical">
- <TextView
- android:id="@+id/month_value_tv"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_18"
- android:gravity="center_vertical|end"
- android:text="0"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15" />
+ android:layout_height="@dimen/dp_18">
+
+ <TextView
+ android:id="@+id/month_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/month_type_tv"
@@ -182,7 +250,7 @@
android:layout_marginTop="3dp"
android:gravity="center_vertical|end"
android:text="@string/month_power_generation"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -193,12 +261,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_alignStart="@+id/device_details_image_iv"
android:layout_marginTop="@dimen/dp_7"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@color/text_E1E1E1" />
+ android:background="@color/text_1AFFFFFF" />
<!--鐢电珯鍦板潃-->
<RelativeLayout
android:layout_width="match_parent"
@@ -223,7 +291,7 @@
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>
--
Gitblit v1.8.0