From 49c135d23c6038a8c456cf1fcf450e5fb649047a Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 25 十一月 2022 17:44:06 +0800
Subject: [PATCH] 合并代码
---
AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 d9fa747..c41c296 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
@@ -22,6 +22,7 @@
android:layout_marginRight="@dimen/px_30"
android:layout_toLeftOf="@id/iv_device_pic"
android:singleLine="true"
+ android:visibility="gone"
android:textColor="@color/lc_demo_color_2c2c2c"
android:textSize="@dimen/px_36"></TextView>
@@ -122,6 +123,23 @@
android:src="@mipmap/lc_demo_common_btn_next"></ImageView>
</RelativeLayout>
<RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/px_130"
+ android:background="@color/lc_demo_color_ffffff"
+ android:gravity="center_vertical"
+ android:paddingLeft="@dimen/px_30"
+ android:paddingRight="@dimen/px_30">
+
+ <TextView
+ android:id="@+id/tvFormat_sd"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:text="@string/format_sd"
+ android:textColor="@color/lc_demo_color_2c2c2c"
+ android:textSize="@dimen/px_36"></TextView>
+ </RelativeLayout>
+ <RelativeLayout
android:visibility="gone"
android:layout_marginTop="@dimen/px_1"
android:id="@+id/rl_cur_wifi"
@@ -133,6 +151,7 @@
android:paddingRight="@dimen/px_30">
<TextView
+ android:visibility="gone"
android:id="@+id/tv_cur_wifi_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -166,7 +185,8 @@
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/px_50"
android:background="@color/lc_demo_color_ffffff"
- android:gravity="center_vertical">
+ android:gravity="center_vertical"
+ android:visibility="gone">
<TextView
android:layout_width="wrap_content"
--
Gitblit v1.8.0