From 2588ab0681d9ef96f98114a1de018b420e3ee1da Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 十二月 2022 11:16:14 +0800
Subject: [PATCH] Merge branch 'dev' into library
---
AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
index a1502d7..fedb161 100644
--- a/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
+++ b/AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml
@@ -14,6 +14,20 @@
android:paddingLeft="@dimen/px_30"
android:paddingRight="@dimen/px_30">
+
+ <TextView
+ android:id="@+id/tv_device_info"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="@dimen/px_30"
+ android:layout_toLeftOf="@id/iv_device_pic"
+ android:singleLine="true"
+ android:text="@string/device_info"
+ android:textColor="@color/lc_demo_color_2c2c2c"
+ android:textSize="@dimen/px_36"></TextView>
+
+
<TextView
android:id="@+id/tv_device_name"
android:layout_width="match_parent"
@@ -121,6 +135,14 @@
android:layout_centerVertical="true"
android:src="@mipmap/lc_demo_common_btn_next"></ImageView>
</RelativeLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/px_1"
+ android:background="@color/lc_demo_color_d9d9d9"
+ android:paddingLeft="@dimen/px_30"
+ android:paddingRight="@dimen/px_30"></View>
+
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/px_130"
@@ -131,7 +153,7 @@
<TextView
android:id="@+id/tvFormat_sd"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/format_sd"
@@ -143,7 +165,7 @@
android:layout_marginTop="@dimen/px_1"
android:id="@+id/rl_cur_wifi"
android:layout_width="match_parent"
- android:layout_height="@dimen/px_130"
+ android:layout_height="0dp"
android:background="@color/lc_demo_color_ffffff"
android:gravity="center_vertical"
android:paddingLeft="@dimen/px_30"
--
Gitblit v1.8.0