From 3e3904224ff6b37c654f54cee56e9ca466f289de Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 五月 2024 19:31:55 +0800
Subject: [PATCH] Merge branch 'wjc_new' into lwj_new
---
app/src/main/res/layout/fragment_house_list.xml | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index 9ecfa9c..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"
/>
@@ -91,20 +91,23 @@
app:layout_constraintTop_toTopOf="parent">
<RelativeLayout
+ android:id="@+id/power_station_search_click_cl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_17"
android:layout_toStartOf="@+id/power_station_default_condition_iv"
- android:background="@drawable/search_bj_edeff2">
+ 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"
@@ -114,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
@@ -155,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>
@@ -190,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" />
@@ -201,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>
@@ -225,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" />
@@ -236,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>
@@ -260,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" />
@@ -271,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>
@@ -304,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" />
@@ -330,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" />
@@ -356,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" />
@@ -382,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" />
@@ -443,7 +443,7 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/search_bj_edeff2"
+ android:background="@drawable/search_bj_ff05000000"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -465,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