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_setlights.xml | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/app/src/main/res/layout/layout_fragment_setlights.xml b/app/src/main/res/layout/layout_fragment_setlights.xml index dbfb4a0..bd0c818 100644 --- a/app/src/main/res/layout/layout_fragment_setlights.xml +++ b/app/src/main/res/layout/layout_fragment_setlights.xml @@ -1,13 +1,18 @@ <?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" + android:id="@+id/turn_signal_min_advance" app:txt_des_tvedit = "鎵撹浆鍚戠伅鍚庡灏戞绉掕浆寮垨璧锋" app:et_input="3000" /> @@ -43,3 +48,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