From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/item_search_device.xml | 56 ++++++++++++++++++++++++++------------------------------
1 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/app/src/main/res/layout/item_search_device.xml b/app/src/main/res/layout/item_search_device.xml
index 546a585..458aeb4 100644
--- a/app/src/main/res/layout/item_search_device.xml
+++ b/app/src/main/res/layout/item_search_device.xml
@@ -2,7 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_127">
+ android:layout_height="@dimen/dp_117">
<!-- <ImageView-->
<!-- android:id="@+id/power_station_search_iv"-->
@@ -20,36 +20,45 @@
android:layout_height="@dimen/dp_99"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_21"
- android:background="@drawable/ffffff_13"
+ android:background="@drawable/bj_ff1c1c1e"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/device_search_state_tv"
+ android:layout_width="7dp"
+ android:layout_height="7dp"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="22.5dp"
+ android:background="@drawable/device_state_ffb9b9b9" />
+
<TextView
android:id="@+id/device_search_name_tv"
- android:layout_width="0dp"
- android:layout_height="@dimen/dp_23"
- android:layout_alignParentStart="true"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_15"
- android:layout_marginEnd="@dimen/dp_6"
- android:layout_toStartOf="@+id/device_search_state_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_20"
+ android:layout_marginStart="6dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="@dimen/dp_5"
+ android:layout_toEndOf="@+id/device_search_state_tv"
android:ellipsize="end"
android:gravity="center_vertical|start"
android:singleLine="true"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_16"
- android:textStyle="bold" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+
<TextView
android:id="@+id/device_search_sn_tv"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="14.5dp"
android:layout_below="@+id/device_search_name_tv"
- android:layout_alignStart="@+id/device_search_name_tv"
+ android:layout_alignStart="@+id/device_search_state_tv"
android:layout_marginTop="@dimen/dp_6"
+ android:layout_toEndOf="@+id/device_search_name_tv"
android:gravity="center_vertical"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
<TextView
@@ -57,24 +66,11 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_17"
android:layout_below="@+id/device_search_sn_tv"
- android:layout_alignStart="@+id/device_search_sn_tv"
+ android:layout_alignStart="@+id/device_search_state_tv"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center_vertical"
- android:textColor="@color/text_66000000"
+ android:textColor="@color/text_66FFFFFF"
android:textSize="@dimen/text_12" />
-
- <TextView
- android:id="@+id/device_search_state_tv"
- android:layout_width="69dp"
- android:layout_height="@dimen/dp_33"
- android:layout_alignParentTop="true"
- android:layout_alignParentEnd="true"
- android:background="@drawable/state_ffb300"
- android:gravity="center"
- android:text="@string/my_power_station_connecting"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_12" />
-
</RelativeLayout>
--
Gitblit v1.8.0