From 39d8fdbb1754997a33b323b6a447ffb2a837806f Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期三, 19 八月 2020 18:34:11 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/res/layout/layout_signal_slice.xml | 94 +++++------------------------------------------
1 files changed, 10 insertions(+), 84 deletions(-)
diff --git a/app/src/main/res/layout/layout_signal_slice.xml b/app/src/main/res/layout/layout_signal_slice.xml
index ba62121..0bbf684 100644
--- a/app/src/main/res/layout/layout_signal_slice.xml
+++ b/app/src/main/res/layout/layout_signal_slice.xml
@@ -30,17 +30,7 @@
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textColor="@android:color/white"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="妗ｄ綅涓�"
- android:textSize="@dimen/network_train_textsize22px"
- android:layout_marginLeft="30dp"
- android:id="@+id/tv_gear_one"
- android:layout_toRightOf="@+id/tv_high_beam"
- android:drawableLeft="@drawable/gray_light"
- android:drawablePadding="5dp"
- android:textColor="@android:color/white"/>
+
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -54,23 +44,14 @@
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textColor="@android:color/white"/>
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="绌烘。"
+ android:text="缁曡溅涓�"
+ android:id="@+id/tv_winding_three"
android:textSize="@dimen/network_train_textsize22px"
android:layout_marginLeft="30dp"
- android:id="@+id/tv_null_engine"
- android:drawableLeft="@drawable/gray_light"
- android:drawablePadding="5dp"
- android:textColor="@android:color/white"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="妗ｄ綅浜�"
- android:textSize="@dimen/network_train_textsize22px"
- android:layout_marginLeft="30dp"
- android:id="@+id/tv_gear_two"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textColor="@android:color/white"/>
@@ -97,16 +78,7 @@
android:drawablePadding="5dp"
android:layout_marginLeft="30dp"
android:textColor="@android:color/white"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="妗ｄ綅涓�"
- android:textSize="@dimen/network_train_textsize22px"
- android:layout_marginLeft="30dp"
- android:id="@+id/tv_gear_three"
- android:drawableLeft="@drawable/gray_light"
- android:drawablePadding="5dp"
- android:textColor="@android:color/white"/>
+
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -121,16 +93,7 @@
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textColor="@android:color/white"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="妗ｄ綅鍥�"
- android:textSize="@dimen/network_train_textsize22px"
- android:layout_marginLeft="30dp"
- android:id="@+id/tv_gear_four"
- android:drawableLeft="@drawable/gray_light"
- android:drawablePadding="5dp"
- android:textColor="@android:color/white"/>
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -167,16 +130,7 @@
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textColor="@android:color/white"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="妗ｄ綅浜�"
- android:layout_marginLeft="30dp"
- android:id="@+id/tv_gear_five"
- android:textSize="@dimen/network_train_textsize22px"
- android:drawableLeft="@drawable/gray_light"
- android:drawablePadding="5dp"
- android:textColor="@android:color/white"/>
+
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -201,16 +155,6 @@
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textColor="@android:color/white"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="缁曡溅浜�"
- android:layout_marginLeft="30dp"
- android:id="@+id/tv_signal3_6"
- android:textSize="@dimen/network_train_textsize22px"
- android:drawableLeft="@drawable/gray_light"
- android:drawablePadding="5dp"
- android:textColor="@android:color/white"/>
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -228,23 +172,14 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="閽ュ寵START浣�"
+ android:text="缁曡溅浜�"
android:layout_marginLeft="30dp"
android:id="@+id/tv_winding_two"
android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textColor="@android:color/white"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="缁曡溅涓�"
- android:id="@+id/tv_winding_three"
- android:textSize="@dimen/network_train_textsize22px"
- android:layout_marginLeft="30dp"
- android:drawableLeft="@drawable/gray_light"
- android:drawablePadding="5dp"
- android:textColor="@android:color/white"/>
+
</TableRow>
<TableRow android:layout_marginBottom="10dp" >
@@ -259,16 +194,7 @@
android:drawablePadding="5dp"
android:textSize="@dimen/network_train_textsize22px"
android:textColor="@android:color/white"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍊掓尅"
- android:layout_marginLeft="30dp"
- android:id="@+id/tv_reverse_gear"
- android:textSize="@dimen/network_train_textsize22px"
- android:drawableLeft="@drawable/gray_light"
- android:drawablePadding="5dp"
- android:textColor="@android:color/white"/>
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
--
Gitblit v1.8.0