From 2c92c137111035cf4b6e2e36010566baa450b6fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 十二月 2022 17:14:24 +0800
Subject: [PATCH] 应用启动分支
---
AndroidOpenDemo/app/src/main/res/layout/fragment_device_detail_main.xml | 80 ++++++++++++++++++++++++++++++---------
1 files changed, 61 insertions(+), 19 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 a867846..38dcfee 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"
@@ -22,6 +36,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>
@@ -121,10 +136,15 @@
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:visibility="gone"
- android:layout_marginTop="@dimen/px_1"
- android:id="@+id/rl_cur_wifi"
android:layout_width="match_parent"
android:layout_height="@dimen/px_130"
android:background="@color/lc_demo_color_ffffff"
@@ -133,6 +153,27 @@
android:paddingRight="@dimen/px_30">
<TextView
+ android:id="@+id/tvFormat_sd"
+ android:layout_width="match_parent"
+ 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"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:background="@color/lc_demo_color_ffffff"
+ android:gravity="center_vertical"
+ android:paddingLeft="@dimen/px_30"
+ 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"
@@ -159,22 +200,23 @@
android:layout_height="0dp"
android:layout_weight="1"></View>
-<!-- <RelativeLayout-->
-<!-- android:id="@+id/rl_detele"-->
-<!-- android:layout_width="match_parent"-->
-<!-- android:layout_height="@dimen/px_110"-->
-<!-- android:layout_gravity="bottom"-->
-<!-- android:layout_marginBottom="@dimen/px_50"-->
-<!-- android:background="@color/lc_demo_color_ffffff"-->
-<!-- android:gravity="center_vertical">-->
+ <RelativeLayout
+ android:id="@+id/rl_detele"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/px_110"
+ android:layout_gravity="bottom"
+ android:layout_marginBottom="@dimen/px_50"
+ android:background="@color/lc_demo_color_ffffff"
+ android:gravity="center_vertical"
+ android:visibility="gone">
-<!-- <TextView-->
-<!-- android:layout_width="wrap_content"-->
-<!-- android:layout_height="wrap_content"-->
-<!-- android:layout_centerInParent="true"-->
-<!-- android:text="@string/lc_demo_device_delete"-->
-<!-- android:textColor="@color/lc_demo_color_FF4F4F"-->
-<!-- android:textSize="@dimen/px_36"></TextView>-->
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="@string/lc_demo_device_delete"
+ android:textColor="@color/lc_demo_color_FF4F4F"
+ android:textSize="@dimen/px_36"></TextView>
-<!-- </RelativeLayout>-->
+ </RelativeLayout>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0