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_signal_config.xml |   77 +++++++++++++++++++++++++-------------
 1 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/layout/layout_signal_config.xml b/app/src/main/res/layout/layout_signal_config.xml
index aaad303..5a195b6 100644
--- a/app/src/main/res/layout/layout_signal_config.xml
+++ b/app/src/main/res/layout/layout_signal_config.xml
@@ -1,67 +1,90 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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"
-    android:background="@android:color/white"
     android:id="@+id/ll_container"
+
+    android:layout_marginBottom="@dimen/ui_margin_25dp"
+
     >
     <include layout="@layout/toolbar"/>
 <LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="30dp"
-    android:padding="5dp"
-
+    android:layout_height="25dp"
+    android:layout_marginLeft="@dimen/ui_margin_10dp"
+    android:layout_marginRight="10dp"
     android:orientation="horizontal"
     android:layout_column="8">
 <TextView
     android:layout_width="0dp"
     android:layout_weight="1"
     android:layout_height="wrap_content"
-    android:textColor="@android:color/black"
+    android:gravity="center"
+    android:textSize="15sp"
+    android:textColor="#ff888995"
+    android:text="鐗╃悊閫氶亾"/>
+    <TextView
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:textSize="15sp"
+        android:textColor="#ff888995"
+        android:gravity="center"
+    android:layout_height="wrap_content"
     android:text="淇″彿鍚嶇О"/>
     <TextView
         android:layout_width="0dp"
         android:layout_weight="1"
     android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-    android:text="鐗╃悊绱㈠紩"/>
-    <TextView
-        android:layout_width="0dp"
-        android:layout_weight="1"
-    android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textSize="15sp"
+        android:textColor="#ff888995"
     android:text="楂樼數骞虫湁鏁�"/>
+
 
     <TextView
         android:layout_width="0dp"
         android:layout_weight="1"
     android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-    android:text="涓绘澘鏈夋晥"/>
+        android:gravity="center"
+        android:textSize="15sp"
+        android:textColor="#ff888995"
+    android:text="鐗╃悊閫氶亾"/>
     <TextView
         android:layout_width="0dp"
         android:layout_weight="1"
     android:layout_height="wrap_content"
-    android:textColor="@android:color/black"
+        android:gravity="center"
+        android:textSize="15sp"
+        android:textColor="#ff888995"
     android:text="淇″彿鍚嶇О"/>
     <TextView
         android:layout_width="0dp"
         android:layout_weight="1"
     android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-    android:text="鐗╃悊绱㈠紩"/>
-    <TextView
-        android:layout_width="0dp"
-        android:layout_weight="1"
-    android:layout_height="wrap_content"
+        android:textSize="15sp"
+        android:textColor="#ff888995"
+        android:gravity="center"
     android:text="楂樼數骞虫湁鏁�"/>
 
-    <TextView
-        android:layout_width="0dp"
-        android:layout_weight="1"
-    android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-    android:text="涓绘澘鏈夋晥"/>
+
 
 </LinearLayout>
+    <ListView
+        android:layout_width="match_parent"
+        android:id="@+id/lv_signalconf"
+        android:layout_height="match_parent"/>
 </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/ui_margin_10dp"
+        android:layout_marginRight="@dimen/ui_margin_10dp"
+        android:layout_marginBottom="@dimen/ui_margin_25dp"
+        android:layout_marginTop="@dimen/ui_margin_50dp"
+        android:background="@drawable/stu_score_bg"
+        />
+</FrameLayout>
\ No newline at end of file

--
Gitblit v1.8.0