From 26ed6eb5e0c3a15b56f724e8890d33e3b6339882 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期五, 28 二月 2020 17:40:11 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/res/layout/layout_base_datas.xml | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/app/src/main/res/layout/layout_base_datas.xml b/app/src/main/res/layout/layout_base_datas.xml
index ab91696..6e5f80a 100644
--- a/app/src/main/res/layout/layout_base_datas.xml
+++ b/app/src/main/res/layout/layout_base_datas.xml
@@ -1,12 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView android:layout_height="match_parent" android:layout_width="match_parent" xmlns:android="http://schemas.android.com/apk/res/android">
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+<!-- <include layout="@layout/toolbar"/>-->
+<!-- <ScrollView-->
+<!-- android:layout_height="match_parent" android:layout_width="match_parent"-->
+
+<!-- >-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="10dp"
android:gravity="center_horizontal"
+ android:background="@color/train_bg"
>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -122,12 +133,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
+ android:visibility="gone"
android:text="鐢佃瘽锛�"/>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/et_phone"
android:text="19234567894"
+ android:visibility="gone"
android:inputType="numberDecimal"
android:background="@android:drawable/editbox_background_normal"/>
</LinearLayout>
@@ -146,7 +159,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
- android:text="杞﹁浇淇″彿杈撳叆锛�"/>
+ android:text="杞﹁浇淇″彿閰嶇疆锛�"/>
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -231,6 +244,7 @@
<Button android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="鏌ョ湅淇″彿"
+ android:visibility="gone"
android:id="@+id/btn_inpsect_signal"
android:padding="5dp"
android:background="@drawable/btn_bg_baseset"/>
@@ -293,27 +307,7 @@
</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"
- />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
- <TextView
- android:textColor="@android:color/black"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:id="@+id/tv_mcu_info"
- android:text="@string/mcu_info"
- android:layout_weight="1"/>
-
- </LinearLayout>
<View
android:layout_width="match_parent"
@@ -328,5 +322,6 @@
android:id="@+id/btn_save_platform"
android:text="淇濆瓨"/>
</LinearLayout>
+<!-- </ScrollView>-->
+</LinearLayout>
-</ScrollView>
--
Gitblit v1.8.0