From 2242a796345bceb301cf3e2094f2a4871cb81cb6 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 13 八月 2020 18:22:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/res/layout/layout_signal_slice.xml | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/app/src/main/res/layout/layout_signal_slice.xml b/app/src/main/res/layout/layout_signal_slice.xml
index 3384cea..ba62121 100644
--- a/app/src/main/res/layout/layout_signal_slice.xml
+++ b/app/src/main/res/layout/layout_signal_slice.xml
@@ -14,8 +14,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鍠囧彮"
- android:id="@+id/tv_loudspeaker"
+ android:text="闆剧伅"
+ android:id="@+id/tv_foglight"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textSize="@dimen/network_train_textsize22px"
@@ -124,10 +124,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鍙岄棯"
+ android:text="妗ｄ綅鍥�"
android:textSize="@dimen/network_train_textsize22px"
android:layout_marginLeft="30dp"
- android:id="@+id/tv_emergency_flasher"
+ android:id="@+id/tv_gear_four"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textColor="@android:color/white"/>
@@ -136,7 +136,8 @@
android:layout_height="wrap_content"
android:text="鍓埞"
android:layout_marginLeft="30dp"
- android:id="@+id/tv_gear_four"
+ android:id="@+id/tv_secondary_brake"
+
android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
@@ -203,10 +204,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Signal3-6"
+ android:text="缁曡溅浜�"
android:layout_marginLeft="30dp"
android:id="@+id/tv_signal3_6"
- android:visibility="gone"
android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
@@ -238,10 +238,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Signal3-7"
- android:id="@+id/tv_signal3_7"
+ android:text="缁曡溅涓�"
+ android:id="@+id/tv_winding_three"
android:textSize="@dimen/network_train_textsize22px"
- android:visibility="gone"
android:layout_marginLeft="30dp"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
@@ -263,9 +262,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="绂诲悎"
+ android:text="鍊掓尅"
android:layout_marginLeft="30dp"
- android:id="@+id/tv_clutch_pedal"
+ android:id="@+id/tv_reverse_gear"
android:textSize="@dimen/network_train_textsize22px"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
@@ -273,10 +272,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Signal3-8"
- android:visibility="gone"
+ android:text="缁曡溅鍥�"
android:layout_marginLeft="30dp"
- android:id="@+id/tv_signal3_8"
+ android:id="@+id/tv_winding_four"
android:drawableLeft="@drawable/gray_light"
android:drawablePadding="5dp"
android:textSize="@dimen/network_train_textsize22px"
--
Gitblit v1.8.0