From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/item_plant_details.xml | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 2682a41..52c25a4 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/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">
@@ -43,7 +42,7 @@
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" />
@@ -56,7 +55,7 @@
android:layout_marginTop="@dimen/dp_3"
android:gravity="center_vertical"
android:text="@string/installed_capacity"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
<LinearLayout
@@ -80,8 +79,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
+ android:text="0"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_15"
android:textStyle="bold" />
@@ -92,7 +91,7 @@
android:layout_marginTop="3dp"
android:gravity="center"
android:text="@string/generated_power"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -109,8 +108,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
+ android:text="0"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_15"
android:textStyle="bold" />
@@ -121,7 +120,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>
@@ -138,8 +137,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
+ android:text="0"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_15"
android:textStyle="bold" />
@@ -150,7 +149,7 @@
android:layout_marginTop="3dp"
android:gravity="center"
android:text="@string/month_power_generation"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -189,7 +188,7 @@
android:gravity="center_vertical|start"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_40000000"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
<TextView
--
Gitblit v1.8.0