From cae6ff870b1e9f1278a8fa21ab1013e68569607a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 五月 2024 19:31:33 +0800
Subject: [PATCH] 2024年05月15日19:31:32

---
 app/src/main/res/layout/fragment_house_list.xml |   53 ++++++++++++++++++++++++++---------------------------
 1 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 4308a14..21bac17 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -24,7 +24,7 @@
             android:layout_centerVertical="true"
             android:gravity="center_vertical"
             android:text="Power Station"
-            android:textColor="@color/text_90000000"
+            android:textColor="@color/text_E6000000"
             android:textSize="@dimen/text_20"
             android:textStyle="bold" />
 
@@ -39,7 +39,7 @@
             android:layout_toEndOf="@+id/power_station_label"
             android:gravity="start|center_vertical"
             android:text="Equipment"
-            android:textColor="@color/text_40000000"
+            android:textColor="@color/text_66000000"
             android:textSize="@dimen/text_16"
 
             />
@@ -99,13 +99,15 @@
                     android:background="@drawable/search_bj_ff05000000">
 
                     <ImageView
+
                         android:id="@+id/power_station_search_iv"
                         android:layout_width="@dimen/dp_18"
                         android:layout_height="@dimen/dp_18"
                         android:layout_alignParentStart="true"
                         android:layout_centerVertical="true"
                         android:layout_marginStart="@dimen/dp_13"
-                        android:src="@drawable/search_path" />
+                        android:src="@drawable/search_path"
+                        />
 
                     <TextView
                         android:id="@+id/power_station_search_tv"
@@ -115,8 +117,9 @@
                         android:layout_marginStart="@dimen/dp_11"
                         android:layout_toEndOf="@+id/power_station_search_iv"
                         android:text="Search the power station"
-                        android:textColor="@color/text_40000000"
-                        android:textSize="@dimen/text_14" />
+                        android:textColor="@color/text_66000000"
+                        android:textSize="@dimen/text_14"
+                        />
                 </RelativeLayout>
 
                 <ImageView
@@ -156,19 +159,18 @@
                         android:layout_height="@dimen/dp_25"
                         android:layout_marginTop="7dp"
                         android:gravity="center"
-                        android:text="99"
-                        android:textColor="@color/text_90000000"
+                        android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_21"
                         android:textStyle="bold" />
 
                     <TextView
                         android:id="@+id/screening_condition_text1_tv"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_17"
+                        android:layout_height="17dp"
                         android:layout_marginTop="1dp"
                         android:gravity="center"
-                        android:text="state"
-                        android:textColor="@color/text_40000000"
+                        android:text="@string/message_all"
+                        android:textColor="@color/text_66000000"
                         android:textSize="@dimen/text_14" />
 
                 </LinearLayout>
@@ -191,8 +193,7 @@
                         android:layout_height="@dimen/dp_25"
                         android:layout_marginTop="7dp"
                         android:gravity="center"
-                        android:text="99"
-                        android:textColor="@color/text_90000000"
+                        android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_21"
                         android:textStyle="bold" />
 
@@ -202,8 +203,8 @@
                         android:layout_height="@dimen/dp_17"
                         android:layout_marginTop="1dp"
                         android:gravity="center"
-                        android:text="state"
-                        android:textColor="@color/text_40000000"
+                        android:text="@string/alarm_all_grade_malfunction"
+                        android:textColor="@color/text_66000000"
                         android:textSize="@dimen/text_14" />
 
                 </LinearLayout>
@@ -226,8 +227,7 @@
                         android:layout_height="@dimen/dp_25"
                         android:layout_marginTop="7dp"
                         android:gravity="center"
-                        android:text="99"
-                        android:textColor="@color/text_90000000"
+                        android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_21"
                         android:textStyle="bold" />
 
@@ -237,8 +237,8 @@
                         android:layout_height="@dimen/dp_17"
                         android:layout_marginTop="1dp"
                         android:gravity="center"
-                        android:text="state"
-                        android:textColor="@color/text_40000000"
+                        android:text="@string/my_power_station_off_line"
+                        android:textColor="@color/text_66000000"
                         android:textSize="@dimen/text_14" />
 
                 </LinearLayout>
@@ -261,8 +261,7 @@
                         android:layout_height="@dimen/dp_25"
                         android:layout_marginTop="7dp"
                         android:gravity="center"
-                        android:text="99"
-                        android:textColor="@color/text_90000000"
+                        android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_21"
                         android:textStyle="bold" />
 
@@ -272,8 +271,8 @@
                         android:layout_height="@dimen/dp_17"
                         android:layout_marginTop="1dp"
                         android:gravity="center"
-                        android:text="state"
-                        android:textColor="@color/text_40000000"
+                        android:text="@string/to_be_added"
+                        android:textColor="@color/text_66000000"
                         android:textSize="@dimen/text_14" />
 
                 </LinearLayout>
@@ -305,7 +304,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="@dimen/dp_17"
                         android:text="@string/station_name"
-                        android:textColor="@color/text_90000000"
+                        android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_12"
                         android:textStyle="bold" />
 
@@ -331,7 +330,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="@dimen/dp_17"
                         android:text="@string/generated_power"
-                        android:textColor="@color/text_90000000"
+                        android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_12"
                         android:textStyle="bold" />
 
@@ -357,7 +356,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="@dimen/dp_17"
                         android:text="@string/day_power_generation"
-                        android:textColor="@color/text_90000000"
+                        android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_12"
                         android:textStyle="bold" />
 
@@ -383,7 +382,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="@dimen/dp_17"
                         android:text="@string/month_power_generation"
-                        android:textColor="@color/text_90000000"
+                        android:textColor="@color/text_E6000000"
                         android:textSize="@dimen/text_12"
                         android:textStyle="bold" />
 
@@ -466,7 +465,7 @@
                     android:layout_marginStart="@dimen/dp_11"
                     android:layout_toEndOf="@+id/device_search_iv"
                     android:text="Search the power station"
-                    android:textColor="@color/text_40000000"
+                    android:textColor="@color/text_66000000"
                     android:textSize="@dimen/text_14" />
             </RelativeLayout>
 

--
Gitblit v1.8.0