From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
app/src/main/res/layout/fragment_house_list.xml | 204 ++++++++++++--------------------------------------
1 files changed, 51 insertions(+), 153 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..72e15a0 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/house_list_parent"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@drawable/bj">
<!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/title_cl"
@@ -23,8 +24,8 @@
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:gravity="center_vertical"
- android:text="Power Station"
- android:textColor="@color/text_90000000"
+ android:text="@string/power_station"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_20"
android:textStyle="bold" />
@@ -32,14 +33,13 @@
android:id="@+id/device_label"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/dp_21"
- android:layout_marginEnd="@dimen/dp_4"
+ android:layout_marginStart="19dp"
+ android:layout_marginEnd="7dp"
android:layout_toStartOf="@+id/edit_iv"
android:layout_toEndOf="@+id/power_station_label"
android:gravity="start|center_vertical"
- android:text="Equipment"
- android:textColor="@color/text_40000000"
+ android:text="@string/device"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_16"
/>
@@ -91,13 +91,15 @@
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"
@@ -113,8 +115,8 @@
android:layout_centerVertical="true"
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:text="@string/search_station"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -128,6 +130,7 @@
</RelativeLayout>
+
<!--鏉′欢绛涢��-->
<LinearLayout
android:id="@+id/screening_condition_ll"
@@ -141,143 +144,25 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/power_station_search_cl">
- <LinearLayout
- android:id="@+id/screening_condition_1"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
+ <include
+ android:id="@+id/power_station_all_il"
+ layout="@layout/item_station" />
- <TextView
- android:id="@+id/screening_condition_number1_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
+ <include
+ android:id="@+id/power_station_faults_il"
+ layout="@layout/item_station" />
- <TextView
- android:id="@+id/screening_condition_text1_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
+ <include
+ android:id="@+id/power_station_offline_il"
+ layout="@layout/item_station" />
- </LinearLayout>
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:id="@+id/screening_condition_2"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number2_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text2_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:id="@+id/screening_condition_3"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number3_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text3_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
-
- <View
- android:layout_width="@dimen/dp_16"
- android:layout_height="match_parent" />
-
- <LinearLayout
- android:id="@+id/screening_condition_4"
- android:layout_width="@dimen/dp_74"
- android:layout_height="@dimen/dp_56"
- android:layout_gravity="center_vertical"
- android:background="@drawable/station_status_no_ffffff"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/screening_condition_number4_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:gravity="center"
- android:text="99"
- android:textColor="@color/text_90000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/screening_condition_text4_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:gravity="center"
- android:text="state"
- android:textColor="@color/text_40000000"
- android:textSize="@dimen/text_14" />
-
- </LinearLayout>
+ <include
+ android:id="@+id/power_station_connected_il"
+ layout="@layout/item_station" />
</LinearLayout>
+
+
<!--鍗囧簭闄嶅簭鍔熻兘-->
<LinearLayout
android:id="@+id/ascending_order_descending_order_parent_ll"
@@ -304,7 +189,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 +215,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 +241,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 +267,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 +328,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">
@@ -464,8 +349,8 @@
android:layout_centerVertical="true"
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:text="@string/enter_the_device_sn_and_device_name"
+ android:textColor="@color/text_66000000"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -494,15 +379,28 @@
<!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
<include
- android:id="@+id/null_data_ic"
+ android:id="@+id/home_null_data_ic"
layout="@layout/null_data_view"
android:layout_width="match_parent"
android:layout_height="224dp"
+ android:layout_marginBottom="@dimen/dp_202"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintStart_toStartOf="parent" />
+
+ <!--娌℃湁鏁版嵁鏄剧ず鏍峰紡-->
+ <include
+ android:id="@+id/device_null_data_ic"
+ layout="@layout/null_data_view"
+ android:layout_width="match_parent"
+ android:layout_height="224dp"
+ android:layout_marginBottom="229dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
--
Gitblit v1.8.0