From c870de9e4207c7af37229cb24b9ca0e2d1e1215f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 09 十二月 2024 15:09:00 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0
---
app/src/main/res/layout/fragment_house_list.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml
index ff005f0..dc2bfe4 100644
--- a/app/src/main/res/layout/fragment_house_list.xml
+++ b/app/src/main/res/layout/fragment_house_list.xml
@@ -5,7 +5,7 @@
android:id="@+id/house_list_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/bj">
+ android:background="@color/text_FF161616">
<!--澶撮儴鏍囩-->
<RelativeLayout
android:id="@+id/title_cl"
@@ -97,7 +97,7 @@
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_ff05000000">
+ android:background="@drawable/search_bj_ff333738">
<ImageView
@@ -112,7 +112,7 @@
<TextView
android:id="@+id/power_station_search_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/power_station_search_iv"
@@ -478,7 +478,7 @@
android:layout_height="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/search_bj_ff05000000"
+ android:background="@drawable/search_bj_ff333738"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -495,12 +495,12 @@
<TextView
android:id="@+id/device_search_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_11"
android:layout_toEndOf="@+id/device_search_iv"
android:text="@string/enter_the_device_sn_and_device_name"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_14" />
</RelativeLayout>
--
Gitblit v1.8.0