From 39d8fdbb1754997a33b323b6a447ffb2a837806f Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期三, 19 八月 2020 18:34:11 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge

---
 app/src/main/res/layout/layout_check_signal.xml |   86 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/layout_check_signal.xml b/app/src/main/res/layout/layout_check_signal.xml
index 581eb68..3fa2990 100644
--- a/app/src/main/res/layout/layout_check_signal.xml
+++ b/app/src/main/res/layout/layout_check_signal.xml
@@ -18,15 +18,17 @@
             android:layout_marginLeft="@dimen/ui_margin_10dp"
             />
         <FrameLayout
-            android:layout_width="791dp"
-            android:layout_height="373dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:background="@drawable/stu_score_bg"
             android:layout_marginLeft="@dimen/ui_margin_10dp"
+            android:layout_marginBottom="@dimen/ui_margin_10dp"
             android:layout_marginRight="10dp">
             <include layout="@layout/layout_signal_slice" android:id="@+id/inpset_signal_slice"/>
             <RelativeLayout
                 android:layout_gravity="end"
                 android:padding="10dp"
+                android:layout_marginRight="@dimen/ui_margin_20dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
                 <safeluck.drive.evaluation.customview.MyCustomEditText
@@ -38,7 +40,7 @@
                     lee:txt_unit_des ="km/h"
 
                     android:layout_height="58dp"
-                    android:layout_width="237dp"/>
+                    android:layout_width="257dp"/>
                 <safeluck.drive.evaluation.customview.MyCustomEditText
                     android:layout_marginTop="@dimen/ui_margin_20dp"
                     android:layout_below="@+id/myspeed"
@@ -48,7 +50,83 @@
                     lee:txt_unit_des ="r/min"
                     android:id="@+id/roatespeed"
                     android:layout_height="58dp"
-                    android:layout_width="237dp"/>
+                    android:layout_width="257dp"/>
+                <safeluck.drive.evaluation.customview.MyCustomEditText
+                    android:layout_marginTop="@dimen/ui_margin_20dp"
+                    android:layout_below="@+id/roatespeed"
+                    lee:txt="1212"
+                    lee:txt_des="妗ｄ綅"
+                    lee:txt_unit="true"
+                    lee:txt_unit_des ="妗�"
+                    android:id="@+id/dagnwei"
+                    android:layout_height="58dp"
+                    android:layout_width="257dp"/>
+                <safeluck.drive.evaluation.customview.MyCustomEditText
+                    android:layout_marginTop="@dimen/ui_margin_20dp"
+                    android:layout_below="@+id/dagnwei"
+                    lee:txt="1212"
+                    lee:txt_des="閽ュ寵"
+                    lee:txt_unit="false"
+                    lee:txt_unit_des ="妗�"
+                    android:id="@+id/keystatus"
+                    android:layout_height="58dp"
+                    android:layout_width="257dp"/>
+                <safeluck.drive.evaluation.customview.MyCustomEditText
+                    android:layout_marginTop="@dimen/ui_margin_20dp"
+                    android:layout_below="@+id/keystatus"
+                    lee:txt="1212"
+                    lee:txt_des="鍔犻�熻笍鏉�"
+                    lee:txt_unit="false"
+                    lee:txt_unit_des ="妗�"
+                    android:id="@+id/accelerator"
+                    android:layout_height="58dp"
+                    android:layout_width="257dp"/>
+            </RelativeLayout>
+            <RelativeLayout
+                android:layout_gravity="center_horizontal"
+                android:padding="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+                <safeluck.drive.evaluation.customview.MyCustomEditText
+
+                    android:id="@+id/odo"
+                    lee:txt="121"
+                    lee:txt_des="鎬婚噷绋�"
+                    lee:txt_unit="true"
+                    lee:txt_unit_des ="km"
+
+                    android:layout_height="58dp"
+                    android:layout_width="257dp"/>
+                <safeluck.drive.evaluation.customview.MyCustomEditText
+                    android:layout_marginTop="@dimen/ui_margin_20dp"
+                    android:layout_below="@+id/odo"
+                    lee:txt="1212"
+                    lee:txt_des="鏈杩愯閲岀▼"
+                    lee:txt_unit="true"
+                    lee:txt_unit_des ="km"
+                    android:id="@+id/trip"
+                    android:layout_height="58dp"
+                    android:layout_width="257dp"/>
+                <safeluck.drive.evaluation.customview.MyCustomEditText
+                    android:layout_marginTop="@dimen/ui_margin_20dp"
+                    android:layout_below="@+id/trip"
+                    lee:txt="1212"
+                    lee:txt_des="鏈杩愯鏃堕棿"
+                    lee:txt_unit="true"
+                    lee:txt_unit_des ="绉�"
+                    android:id="@+id/trip_time"
+                    android:layout_height="58dp"
+                    android:layout_width="257dp"/>
+                <safeluck.drive.evaluation.customview.MyCustomEditText
+                    android:layout_marginTop="@dimen/ui_margin_20dp"
+                    android:layout_below="@+id/trip_time"
+                    lee:txt="1212"
+                    lee:txt_des="鐢靛帇"
+                    lee:txt_unit="true"
+                    lee:txt_unit_des ="V"
+                    android:id="@+id/cell_volt"
+                    android:layout_height="58dp"
+                    android:layout_width="257dp"/>
             </RelativeLayout>
         </FrameLayout>
 

--
Gitblit v1.8.0