From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 07 五月 2025 15:02:30 +0800 Subject: [PATCH] Merge branch '1.2.0' --- app/src/main/res/layout/item_plant_details.xml | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml index 328d31c..2572852 100644 --- a/app/src/main/res/layout/item_plant_details.xml +++ b/app/src/main/res/layout/item_plant_details.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="194.5dp" android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_16" android:background="@drawable/bj_ff1c1c1e"> <!--鐢电珯鍥剧墖--> @@ -35,7 +36,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_5" - android:layout_marginTop="14.5dp" + android:layout_marginTop="13.5dp" android:layout_toStartOf="@+id/home_debug_state_ll" android:layout_toEndOf="@+id/home_image_iv" android:gravity="center_vertical" @@ -73,22 +74,20 @@ android:layout_height="@dimen/dp_18" android:layout_alignParentTop="true" android:layout_alignParentEnd="true" - android:layout_marginTop="@dimen/dp_14" + android:layout_marginTop="@dimen/dp_15" android:orientation="horizontal"> <ImageView android:id="@+id/home_debug_state_iv" android:layout_width="@dimen/dp_18" - android:layout_height="@dimen/dp_18" - android:src="@drawable/initiai" /> + android:layout_height="@dimen/dp_18" /> <TextView android:id="@+id/home_debug_state_tv" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingStart="0dp" android:paddingEnd="@dimen/dp_16" - android:text="Initial" android:textColor="@color/text_FFACACAC" android:textSize="@dimen/text_12" /> </LinearLayout> -- Gitblit v1.8.0