From d2ada75cd7db9e4c298a49cf4ec6526c0fc8d860 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Sat, 24 Feb 2018 11:44:05 +0800
Subject: [PATCH] no message

---
 app/src/main/res/layout/act_datanalysis.xml | 76 ++++++++++++++-------
 1 file changed, 51 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/layout/act_datanalysis.xml b/app/src/main/res/layout/act_datanalysis.xml
index 05e31d7..4487510 100644
--- a/app/src/main/res/layout/act_datanalysis.xml
+++ b/app/src/main/res/layout/act_datanalysis.xml
@@ -8,10 +8,10 @@
     <include layout="@layout/include_tool_bar"></include>
 
     <LinearLayout
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/greyf4f4f4">
+        android:background="@color/greyf4f4f4"
+        android:visibility="gone">
 
 
         <TextView
@@ -31,12 +31,14 @@
         android:id="@+id/line_chart"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:paddingLeft="10dp"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:paddingLeft="10dp" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_20"
         android:orientation="horizontal"
         android:padding="@dimen/dp_10">
 
@@ -53,37 +55,61 @@
             android:drawablePadding="@dimen/dp_5"
             android:text="@string/standard"
             android:textColor="@color/grey888888"
-            android:textSize="@dimen/text_size_14" />
+            android:textSize="@dimen/text_size_14"
+            android:visibility="gone" />
 
-        <TextView
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="2"
-            android:drawableLeft="@drawable/shape_blue"
-            android:drawablePadding="@dimen/dp_5"
-            android:text="@string/death"
-            android:textColor="@color/grey888888"
-            android:textSize="@dimen/text_size_14" />
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
 
-        <TextView
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/shape_blue"
+                android:drawablePadding="@dimen/dp_5"
+                android:text="死淘"
+                android:textColor="@color/grey888888"
+                android:textSize="@dimen/text_size_16" />
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="2"
-            android:drawableLeft="@drawable/shape_green"
-            android:drawablePadding="@dimen/dp_5"
-            android:text="@string/weight"
-            android:textColor="@color/grey888888"
-            android:textSize="@dimen/text_size_14" />
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
 
-        <TextView
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/shape_green"
+                android:drawablePadding="@dimen/dp_5"
+                android:text="@string/weight"
+                android:textColor="@color/grey888888"
+                android:textSize="@dimen/text_size_16" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="2"
-            android:drawableLeft="@drawable/shape_perpo"
-            android:drawablePadding="@dimen/dp_5"
-            android:text="@string/eliminatee"
-            android:textColor="@color/grey888888"
-            android:textSize="@dimen/text_size_14" />
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/shape_perpo"
+                android:drawablePadding="@dimen/dp_5"
+                android:text="@string/water1"
+                android:textColor="@color/grey888888"
+                android:textSize="@dimen/text_size_16" />
+        </LinearLayout>
 
         <View
             android:layout_width="0dp"
@@ -92,13 +118,13 @@
     </LinearLayout>
 
     <TableLayout
-        android:visibility="gone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_marginLeft="@dimen/dp_10"
         android:layout_marginRight="@dimen/dp_10"
-        android:stretchColumns="*">
+        android:stretchColumns="*"
+        android:visibility="gone">
 
         <TableRow>