From f5a6da1f77245fa8104f9e275cca13342654ffab Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期四, 24 九月 2020 15:40:07 +0800
Subject: [PATCH] 完成档位相关设置
---
app/src/main/res/layout/layout_road_train.xml | 300 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 154 insertions(+), 146 deletions(-)
diff --git a/app/src/main/res/layout/layout_road_train.xml b/app/src/main/res/layout/layout_road_train.xml
index 62475ff..65b4621 100644
--- a/app/src/main/res/layout/layout_road_train.xml
+++ b/app/src/main/res/layout/layout_road_train.xml
@@ -1,158 +1,166 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+<GridLayout android:layout_width="match_parent"
+ android:layout_height="110dp"
+ android:columnCount="6"
+ android:orientation="horizontal"
+ android:rowCount="2"
+ xmlns:android="http://schemas.android.com/apk/res/android">
-
-<TableLayout
-
- android:layout_width="match_parent"
- android:layout_height="45dp"
- android:padding="@dimen/ui_margin_5dp"
- android:gravity="bottom">
-
-
-
-<TableRow android:layout_width="match_parent"
- android:id="@+id/first"
- android:layout_height="35dp">
- <Button android:id="@+id/btn_1"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- style="@style/ui_exam_font"
+ <Button
+ android:id="@+id/btn_3"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:layout_rowWeight="1"
+ android:layout_columnWeight="1"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginTop="@dimen/ui_margin_5dp"
android:layout_marginRight="@dimen/ui_margin_10dp"
- android:background="@drawable/btn_exam_item_bg"
- android:text="@string/straight_line"/>
- <Button android:id="@+id/btn_2"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
- android:layout_marginRight="@dimen/ui_margin_10dp"
- style="@style/ui_exam_font"
- android:text="@string/add_subtract"/>
- <Button android:id="@+id/btn_3"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
- android:layout_marginRight="@dimen/ui_margin_10dp"
- style="@style/ui_exam_font"
- android:text="@string/pull_over"/>
- <Button android:id="@+id/btn_4"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
- android:layout_marginRight="@dimen/ui_margin_10dp"
- style="@style/ui_exam_font"
- android:text="@string/by_crossing"/>
- <Button android:id="@+id/btn_5"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- style="@style/ui_exam_font"
- android:background="@drawable/btn_exam_item_bg"
- android:layout_marginRight="@dimen/ui_margin_10dp"
- android:text="@string/junction_left"/>
- <Button android:id="@+id/btn_6"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
- android:layout_marginRight="@dimen/ui_margin_10dp"
- style="@style/ui_exam_font"
- android:text="@string/junction_right"/>
- <Button android:id="@+id/btn_12"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginBottom="5dp"
+ android:background="@drawable/btn_item_collect_bg"
+ android:text="@string/pull_over"
+ android:textColor="@color/color_ffffff" />
- style="@style/ui_exam_font"
- android:text="@string/lane_change"/>
-</TableRow>
-
- <TableRow android:layout_width="match_parent"
- android:id="@+id/second"
- android:layout_height="35dp">
-
- <Button android:id="@+id/btn_7"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
+ <Button android:text="@string/add_subtract"
+ android:layout_columnWeight="1"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:layout_rowWeight="1"
+ android:id="@+id/btn_2"
+ android:layout_marginTop="@dimen/ui_margin_5dp"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
android:layout_marginRight="@dimen/ui_margin_10dp"
- style="@style/ui_exam_font"
- android:text="@string/crosswalk"/>
- <Button android:id="@+id/btn_8"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- style="@style/ui_exam_font"
- android:background="@drawable/btn_exam_item_bg"
- android:layout_marginRight="@dimen/ui_margin_10dp"
- android:text="@string/school_area"/>
+ android:layout_marginBottom="5dp"
+ android:textColor="@color/color_ffffff"
+ android:background="@drawable/btn_item_collect_bg"
+ />
- <Button android:id="@+id/btn_9"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- style="@style/ui_exam_font"
- android:background="@drawable/btn_exam_item_bg"
+ <Button android:text="@string/crosswalk"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
android:layout_marginRight="@dimen/ui_margin_10dp"
- android:text="@string/bus_area"/>
- <Button android:id="@+id/btn_10"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- style="@style/ui_exam_font"
- android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginBottom="5dp"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_width="wrap_content"
+ android:layout_columnWeight="1"
+ android:layout_marginTop="@dimen/ui_margin_5dp"
+
+ android:layout_rowWeight="1"
+ android:id="@+id/btn_7"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/straight_line"
+ android:textColor="@color/color_ffffff"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:layout_marginTop="@dimen/ui_margin_5dp"
+
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
android:layout_marginRight="@dimen/ui_margin_10dp"
- android:text="@string/turn_around"/>
- <Button android:id="@+id/btn_14"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
- android:layout_marginRight="@dimen/ui_margin_10dp"
- style="@style/ui_exam_font"
- android:text="@string/start_vehicle"/>
- <Button android:id="@+id/btn_16"
- android:textColor="#FFFFFF"
- style="@style/ui_exam_font"
- android:background="@drawable/btn_exam_item_bg"
- android:layout_marginRight="@dimen/ui_margin_10dp"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:text="@string/pull_over"/>
+ android:layout_marginBottom="5dp"
+ android:id="@+id/btn_1"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/lane_change"
+ android:layout_marginTop="@dimen/ui_margin_5dp"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="5dp"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:layout_columnWeight="1"
+ android:id="@+id/btn__5"
+ android:layout_rowWeight="1"
+ android:textColor="@color/color_ffffff"
+ android:background="@drawable/btn_item_collect_bg"
+ />
- <Button android:id="@+id/btn_13"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="@dimen/ui_margin_45dp"
- android:textColor="#FFFFFF"
- android:background="@drawable/btn_exam_item_bg"
+ <Button android:text="@string/over_take"
+ android:layout_marginTop="@dimen/ui_margin_5dp"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="5dp"
+ android:id="@+id/btn__7"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
- style="@style/ui_exam_font"
- android:text="@string/night_driving"/>
- </TableRow>
+ <Button android:text="@string/school_area"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="5dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:id="@+id/btn_8"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
-</TableLayout>
-</ScrollView>
\ No newline at end of file
+ <Button android:text="@string/bus_area"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="5dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_columnWeight="1"
+ android:id="@+id/btn_9"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/side_by_side"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:id="@+id/btn_re_6"
+ android:layout_marginBottom="5dp"
+ android:textColor="@color/color_ffffff"
+ android:background="@drawable/btn_item_collect_bg"
+ />
+ <Button android:text="@string/junction_left"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="5dp"
+ android:textColor="@color/color_ffffff"
+
+ android:id="@+id/btn_5"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/junction_right"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="5dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:layout_columnWeight="1"
+ android:id="@+id/btn_6"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
+ <Button android:text="@string/turn_around"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:id="@+id/btn_10"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="5dp"
+ android:textColor="@color/color_ffffff"
+ android:background="@drawable/btn_item_collect_bg"
+ />
+
+ <Button android:text="@string/by_crossing"
+ android:layout_height="@dimen/ui_margin_40dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:id="@+id/btn_4"
+ android:visibility="gone"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_marginBottom="5dp"
+ android:background="@drawable/btn_item_collect_bg"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ />
+
+</GridLayout>
--
Gitblit v1.8.0