From b41f9db09c0145d4530e78c0c53d0a1cacd29e03 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期五, 18 九月 2020 15:07:01 +0800
Subject: [PATCH] 完成线路采集（未充分测试——）
---
app/src/main/res/layout/layout_project_collect.xml | 102 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 38 deletions(-)
diff --git a/app/src/main/res/layout/layout_project_collect.xml b/app/src/main/res/layout/layout_project_collect.xml
index 9d2d903..cb030bc 100644
--- a/app/src/main/res/layout/layout_project_collect.xml
+++ b/app/src/main/res/layout/layout_project_collect.xml
@@ -50,29 +50,30 @@
android:background="@drawable/btn_item_collect_bg"
/>
- <Button android:text="@string/turn_around"
- android:layout_marginTop="@dimen/ui_margin_10dp"
- android:layout_columnWeight="1"
- android:layout_rowWeight="1"
- android:id="@+id/btn_route_3"
+ <Button android:text="@string/crosswalk"
android:layout_marginLeft="@dimen/ui_margin_20dp"
android:layout_marginRight="@dimen/ui_margin_20dp"
android:layout_marginBottom="10dp"
android:textColor="@color/color_ffffff"
- android:background="@drawable/btn_item_collect_bg"
- />
+ android:layout_width="wrap_content"
+ android:layout_columnWeight="1"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
- <Button android:text="@string/by_crossing"
- android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:layout_rowWeight="1"
+ android:id="@+id/btn_route_12"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/straight_line"
android:textColor="@color/color_ffffff"
- android:layout_marginLeft="@dimen/ui_margin_20dp"
- android:id="@+id/btn_route_4"
- android:layout_marginRight="@dimen/ui_margin_20dp"
- android:layout_marginBottom="10dp"
- android:background="@drawable/btn_item_collect_bg"
android:layout_columnWeight="1"
android:layout_rowWeight="1"
- />
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:id="@+id/btn_route_13"
+ android:background="@drawable/btn_item_collect_bg"/>
<Button android:text="@string/lane_change"
android:layout_marginTop="@dimen/ui_margin_10dp"
@@ -86,16 +87,6 @@
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_20dp"
- android:layout_marginRight="@dimen/ui_margin_20dp"
- android:id="@+id/btn_route_6"
- android:layout_marginBottom="10dp"
- android:textColor="@color/color_ffffff"
- android:background="@drawable/btn_item_collect_bg"
- />
<Button android:text="@string/over_take"
android:layout_marginLeft="@dimen/ui_margin_20dp"
@@ -127,11 +118,23 @@
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_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:id="@+id/btn_route_6"
+ android:visibility="gone"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:background="@drawable/btn_item_collect_bg"
+ />
<Button android:text="@string/junction_left"
android:layout_marginLeft="@dimen/ui_margin_20dp"
android:layout_marginRight="@dimen/ui_margin_20dp"
android:layout_marginBottom="10dp"
android:textColor="@color/color_ffffff"
+ android:visibility="gone"
android:id="@+id/btn_route_10"
android:layout_columnWeight="1"
android:layout_rowWeight="1"
@@ -142,33 +145,56 @@
android:layout_marginRight="@dimen/ui_margin_20dp"
android:layout_marginBottom="10dp"
android:textColor="@color/color_ffffff"
+ android:visibility="gone"
android:layout_columnWeight="1"
android:id="@+id/btn_route_11"
android:layout_rowWeight="1"
android:background="@drawable/btn_item_collect_bg"/>
-
- <Button android:text="@string/crosswalk"
+ <Button android:text="@string/turn_around"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:id="@+id/btn_route_3"
+ android:visibility="gone"
android:layout_marginLeft="@dimen/ui_margin_20dp"
android:layout_marginRight="@dimen/ui_margin_20dp"
android:layout_marginBottom="10dp"
android:textColor="@color/color_ffffff"
- android:layout_width="wrap_content"
- android:layout_columnWeight="1"
- android:layout_rowWeight="1"
- android:id="@+id/btn_route_12"
- android:background="@drawable/btn_item_collect_bg"/>
+ android:background="@drawable/btn_item_collect_bg"
+ />
- <Button android:text="@string/straight_line"
+ <Button android:text="@string/by_crossing"
+
android:textColor="@color/color_ffffff"
- android:layout_columnWeight="1"
- android:layout_rowWeight="1"
android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:id="@+id/btn_route_4"
+ android:visibility="gone"
android:layout_marginRight="@dimen/ui_margin_20dp"
android:layout_marginBottom="10dp"
- android:id="@+id/btn_route_13"
- android:background="@drawable/btn_item_collect_bg"/>
+ android:background="@drawable/btn_item_collect_bg"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ />
+
</GridLayout>
-
+<ScrollView
+ android:layout_width="380dp"
+ android:id="@+id/scrollview"
+ android:layout_height="match_parent">
+ <TextView
+ android:layout_width="380dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/stu_score_title"
+ android:id="@+id/tv_route_info"
+ android:gravity="center_vertical"
+ android:descendantFocusability="blocksDescendants"
+ android:textColor="#FFFFFF"
+ android:focusable="false"
+ android:focusableInTouchMode="false"
+ android:drawablePadding="5dp"
+ android:paddingLeft="19dp"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:text="椤圭洰鍒楄〃"/>
+</ScrollView>
</LinearLayout>
--
Gitblit v1.8.0