From a5c2e37286dd29b02fff10247e6f3201ad5f58cd Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 26 十月 2020 18:04:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lowprecision'
---
app/src/main/res/layout/layout_fragment_stationsettin.xml | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/layout_fragment_stationsettin.xml b/app/src/main/res/layout/layout_fragment_stationsettin.xml
index 03a3094..2b5bdc4 100644
--- a/app/src/main/res/layout/layout_fragment_stationsettin.xml
+++ b/app/src/main/res/layout/layout_fragment_stationsettin.xml
@@ -1,15 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<FrameLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+<LinearLayout
+
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<safeluck.drive.evaluation.fragment.rulefragments.cview.TextEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:txt_des_tvedit = "瀛︽牎/杞︾珯/妯亾鍖哄煙鏈�楂橀�熷害"
- app:et_input="25"
+ android:id="@+id/cross_school_max_speed"
+ app:txt_des_tvedit = "瀛︽牎/杞︾珯/妯亾鍖哄煙鏈�楂橀�熷害KM/H"
+ app:et_input="30"
+ />
+ <safeluck.drive.evaluation.fragment.rulefragments.cview.TextEditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:txt_des_tvedit = "閫氳繃瀛︽牎/杞︾珯/妯亾锛岃窛绂绘鏌ョ偣鐨勬湁鏁堣窛绂�(绫�)"
+ android:id="@+id/crossing_break_valid_distance"
+ app:et_input="30"
+ />
+ <safeluck.drive.evaluation.fragment.rulefragments.cview.TextEditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:txt_des_tvedit = "鍋滄绾垮闇�鍋滆溅鏃讹紝璺濆仠姝㈢嚎鏈夋晥璺濈(绫�)"
+ android:id="@+id/crossing_stop_valid_distance"
+ app:et_input="3.0"
/>
<safeluck.drive.evaluation.fragment.rulefragments.cview.TextCheckBox
@@ -19,3 +38,18 @@
</LinearLayout>
+ <Button
+ android:id="@+id/btn_setting_save"
+ android:layout_width="100dp"
+ android:layout_height="@dimen/ui_margin_60dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:layout_marginTop="32dp"
+ android:layout_gravity="bottom|center"
+
+ android:background="@drawable/btn_start_bg"
+ android:textAllCaps="false"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize32px"
+ android:text="淇濆瓨"/>
+</FrameLayout>
\ No newline at end of file
--
Gitblit v1.8.0