From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/res/layout/layout_net_train.xml | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/app/src/main/res/layout/layout_net_train.xml b/app/src/main/res/layout/layout_net_train.xml
index d10b307..cc15c51 100644
--- a/app/src/main/res/layout/layout_net_train.xml
+++ b/app/src/main/res/layout/layout_net_train.xml
@@ -1,46 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
- android:layout_height="match_parent" android:orientation="horizontal">
+ android:layout_height="match_parent" android:orientation="horizontal"
+ android:background="@drawable/stu_score_bg">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="4"
android:layout_height="match_parent"
- android:paddingTop="2dp"
android:paddingBottom="2dp"
- android:paddingLeft="5dp"
- android:paddingRight="5dp"
- android:gravity="center"
+
android:orientation="vertical"
- android:background="@color/train_bg"
+
>
<RelativeLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:background="@drawable/stu_score_title"
+
+ android:layout_height="38dp">
<TextView
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="38dp"
android:id="@+id/tv_item"
- android:background="@color/train_item_bg"
- android:padding="10dp"
+ android:gravity="center_vertical"
+ android:textColor="#FFFFFF"
+ android:layout_marginLeft="19dp"
+ android:drawablePadding="5dp"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:drawableLeft="@mipmap/duobianxing"
android:text="椤圭洰鍒楄〃"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="10dp"
- android:layout_marginRight="10dp"
android:layout_toRightOf="@+id/tv_item"
android:gravity="center"
+ android:layout_marginLeft="300dp"
android:padding="10dp"
android:id="@+id/tv_speed"
+ android:textColor="#A1A1A3"
android:text="@string/speed"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/tv_speed"
- android:id="@+id/tv_pos"
+ android:id="@+id/tv_start_time"
android:padding="10dp"
android:gravity="center"
- android:text="@string/licheng"/>
+ android:textColor="#A1A1A3"
+ android:layout_alignParentEnd="true"
+ android:layout_marginRight="16dp"
+ android:text="@string/begin_time"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -48,7 +55,7 @@
android:id="@+id/tv_stop"
android:textColor="@android:color/white"
android:padding="10dp"
-
+android:visibility="gone"
android:background="@drawable/btn_start_bg"
android:layout_toRightOf="@+id/tv_pos"/>
</RelativeLayout>
@@ -56,5 +63,4 @@
<include layout="@layout/layout_road_train" android:visibility="gone" android:id="@+id/lukao"/>
</LinearLayout>
- <include android:layout_gravity="center_vertical" android:layout_marginLeft="10dp" android:layout_width="0dp" android:layout_weight="1" android:layout_height="match_parent" layout="@layout/layout_train_exit"/>
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0