From d5bf5c845908b9429904140383956c94760e3e40 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 10 二月 2020 18:13:23 +0800
Subject: [PATCH] 系统设置里基础数据增加升级单片机配置
---
app/src/main/res/layout/layout_base_datas.xml | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/layout/layout_base_datas.xml b/app/src/main/res/layout/layout_base_datas.xml
index 5ae08d7..a3bd3de 100644
--- a/app/src/main/res/layout/layout_base_datas.xml
+++ b/app/src/main/res/layout/layout_base_datas.xml
@@ -58,6 +58,7 @@
android:layout_height="wrap_content"
android:gravity="center">
<TableRow android:gravity="center_horizontal"
+ android:visibility="gone"
android:layout_marginBottom="10dp">
<TextView
android:layout_width="wrap_content"
@@ -72,6 +73,7 @@
/>
</TableRow>
<TableRow android:gravity="center_horizontal"
+ android:visibility="gone"
android:layout_marginBottom="10dp">
<TextView
android:layout_width="wrap_content"
@@ -94,6 +96,7 @@
android:background="@android:drawable/editbox_background_normal"/>
</TableRow>
<TableRow android:gravity="center_horizontal"
+ android:visibility="gone"
android:layout_marginBottom="10dp">
<TextView
android:layout_width="wrap_content"
@@ -143,6 +146,7 @@
android:id="@+id/btn_signal_conf"
android:layout_marginLeft="15dp"
android:background="@drawable/btn_bg_baseset"/>
+
</TableRow>
</TableLayout>
</LinearLayout>
@@ -153,6 +157,39 @@
android:layout_marginBottom="10dp"
android:background="@color/colorAccent"
/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@android:color/black"
+ android:text="閰嶇疆鍙傛暟锛�"/>
+ <TableLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center">
+ <TableRow android:gravity="center_horizontal"
+ android:layout_marginBottom="10dp">
+
+ <Button android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍗囩骇鍗曠墖鏈�"
+ android:padding="5dp"
+ android:id="@+id/btn_mcu_upgrade"
+ android:layout_marginLeft="15dp"
+ android:background="@drawable/btn_bg_baseset"/>
+ </TableRow>
+ </TableLayout>
+ </LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="10dp"
+ android:background="@color/colorAccent"
+ />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
--
Gitblit v1.8.0