From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/res/layout/layout_check_signal.xml | 72 +++++++++++++++++-------------------
1 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/app/src/main/res/layout/layout_check_signal.xml b/app/src/main/res/layout/layout_check_signal.xml
index 7c45702..cb48455 100644
--- a/app/src/main/res/layout/layout_check_signal.xml
+++ b/app/src/main/res/layout/layout_check_signal.xml
@@ -1,57 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:lee="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@android:color/white"
>
- <include layout="@layout/toolbar" android:id="@+id/inpsect_signal_toolbar"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏌ョ湅杞﹁浇淇″彿杈撳叆"
+ android:textColor="#ffffffff"
+ android:textSize="23sp"
+ android:layout_marginBottom="17dp"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ />
<FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_width="791dp"
+ android:layout_height="373dp"
+ android:background="@drawable/stu_score_bg"
+ android:layout_marginLeft="@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_width="wrap_content"
android:layout_height="wrap_content">
- <TextView
- android:layout_width="70dp"
- android:layout_height="25dp"
- android:textColor="@android:color/black"
- android:id="@+id/tv_dangwei"
+ <safeluck.drive.evaluation.customview.MyCustomEditText
- android:gravity="center"
- android:text="@string/chesu"/>
- <TextView
- android:layout_width="35dp"
- android:layout_height="25dp"
- android:layout_toRightOf="@id/tv_dangwei"
- android:id="@+id/tv_dangwei_num"
- android:text="0"
- android:gravity="center"
- android:background="@drawable/dangwei_bg"/>
- <TextView
- android:layout_width="70dp"
- android:layout_height="25dp"
- android:textColor="@android:color/black"
+ android:id="@+id/myspeed"
+ lee:txt="121"
+ lee:txt_des="杞﹂��"
+ lee:txt_unit="true"
+ lee:txt_unit_des ="km/h"
- android:gravity="center"
- android:layout_marginTop="15dp"
-
- android:layout_below="@+id/tv_dangwei"
- android:text="@string/engine"/>
- <TextView
- android:layout_width="70dp"
- android:layout_height="25dp"
- android:gravity="center"
- android:layout_marginTop="15dp"
- android:text="-1.32332"
- android:id="@+id/tv_roate_speed"
- android:layout_toRightOf="@id/tv_dangwei"
- android:layout_below="@+id/tv_dangwei_num"
- android:background="@drawable/dangwei_bg"/>
+ android:layout_height="58dp"
+ android:layout_width="237dp"/>
+ <safeluck.drive.evaluation.customview.MyCustomEditText
+ android:layout_marginTop="@dimen/ui_margin_20dp"
+ android:layout_below="@+id/myspeed"
+ lee:txt="1212"
+ lee:txt_des="杞��"
+ lee:txt_unit="true"
+ lee:txt_unit_des ="r/min"
+ android:id="@+id/roatespeed"
+ android:layout_height="58dp"
+ android:layout_width="237dp"/>
</RelativeLayout>
</FrameLayout>
--
Gitblit v1.8.0