From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/item_station.xml | 66 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/app/src/main/res/layout/item_station.xml b/app/src/main/res/layout/item_station.xml
index 48dca6c..86b8ae3 100644
--- a/app/src/main/res/layout/item_station.xml
+++ b/app/src/main/res/layout/item_station.xml
@@ -2,33 +2,49 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/station_status_cl"
- android:layout_width="74dp"
- android:layout_height="56dp"
- android:background="@drawable/station_status_no_ffffff">
+ android:layout_width="90dp"
+ android:layout_height="56dp">
- <TextView
- android:id="@+id/station_status_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_25"
- android:layout_marginTop="7dp"
- android:text="99"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_21"
- android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="parent"
+ <LinearLayout
+ android:id="@+id/parent_ll"
+ android:layout_width="@dimen/dp_74"
+ android:layout_height="match_parent"
+ android:background="@drawable/station_status_no_ffffff"
+ android:orientation="vertical"
+ app:layout_constraintEnd_toStartOf="@+id/v"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
- <TextView
- android:id="@+id/station_status_number_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
- android:layout_marginTop="1dp"
- android:text="state"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14"
- app:layout_constraintEnd_toEndOf="@+id/station_status_tv"
- app:layout_constraintStart_toStartOf="@+id/station_status_tv"
- app:layout_constraintTop_toBottomOf="@+id/station_status_tv" />
+ <TextView
+ android:id="@+id/station_total_tv"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginTop="7dp"
+ android:gravity="center"
+ android:text="0"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_21"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/station_title_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_66000000"
+ android:textSize="@dimen/text_14" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/v"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="match_parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+
+ />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0