From 8e9355c1708409387ce3d85b31a2e78f102e02af Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Fri, 1 Dec 2017 10:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/drawable/shape_balck.xml   |  12 ++
 app/src/main/res/drawable/shape_blue.xml    |  12 ++
 app/src/main/res/drawable/shape_green.xml   |  12 ++
 app/src/main/res/drawable/shape_perpo.xml   |  12 ++
 app/src/main/res/drawable/shape_red1.xml    |  12 ++
 app/src/main/res/drawable/shape_white.xml   |  12 ++
 app/src/main/res/layout/act_datanalysis.xml | 176 +++++++++++++++++++-
 app/src/main/res/values/colors.xml          |   4 +
 app/src/main/res/values/strings.xml         |   6 +
 9 files changed, 256 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_balck.xml
 create mode 100644 app/src/main/res/drawable/shape_blue.xml
 create mode 100644 app/src/main/res/drawable/shape_green.xml
 create mode 100644 app/src/main/res/drawable/shape_perpo.xml
 create mode 100644 app/src/main/res/drawable/shape_red1.xml
 create mode 100644 app/src/main/res/drawable/shape_white.xml

diff --git a/app/src/main/res/drawable/shape_balck.xml b/app/src/main/res/drawable/shape_balck.xml
new file mode 100644
index 0000000..ac72f85
--- /dev/null
+++ b/app/src/main/res/drawable/shape_balck.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/greyf4f4f4" />
+
+    <stroke
+        android:width="@dimen/dp_0.5"
+        android:color="@color/black" />
+    <size
+        android:width="@dimen/dp_14"
+        android:height="@dimen/dp_14" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_blue.xml b/app/src/main/res/drawable/shape_blue.xml
new file mode 100644
index 0000000..3aaf085
--- /dev/null
+++ b/app/src/main/res/drawable/shape_blue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/blue48dac7" />
+
+    <!--<stroke-->
+        <!--android:width="@dimen/dp_1"-->
+        <!--android:color="@color/grey888888" />-->
+    <size
+        android:width="@dimen/dp_14"
+        android:height="@dimen/dp_14" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_green.xml b/app/src/main/res/drawable/shape_green.xml
new file mode 100644
index 0000000..e1b3c6c
--- /dev/null
+++ b/app/src/main/res/drawable/shape_green.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/grenn48da59" />
+
+    <!--<stroke-->
+        <!--android:width="@dimen/dp_1"-->
+        <!--android:color="@color/grey888888" />-->
+    <size
+        android:width="@dimen/dp_14"
+        android:height="@dimen/dp_14" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_perpo.xml b/app/src/main/res/drawable/shape_perpo.xml
new file mode 100644
index 0000000..073996d
--- /dev/null
+++ b/app/src/main/res/drawable/shape_perpo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/perpod26ee4" />
+
+    <!--<stroke-->
+        <!--android:width="@dimen/dp_1"-->
+        <!--android:color="@color/grey888888" />-->
+    <size
+        android:width="@dimen/dp_14"
+        android:height="@dimen/dp_14" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_red1.xml b/app/src/main/res/drawable/shape_red1.xml
new file mode 100644
index 0000000..6b79d3f
--- /dev/null
+++ b/app/src/main/res/drawable/shape_red1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/redda4848" />
+
+    <!--<stroke-->
+        <!--android:width="@dimen/dp_1"-->
+        <!--android:color="@color/grey888888" />-->
+    <size
+        android:width="@dimen/dp_14"
+        android:height="@dimen/dp_14" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_white.xml b/app/src/main/res/drawable/shape_white.xml
new file mode 100644
index 0000000..11cd961
--- /dev/null
+++ b/app/src/main/res/drawable/shape_white.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/white" />
+
+    <stroke
+        android:width="@dimen/dp_0.5"
+        android:color="@color/black" />
+    <size
+        android:width="@dimen/dp_14"
+        android:height="@dimen/dp_14" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_datanalysis.xml b/app/src/main/res/layout/act_datanalysis.xml
index d6cb79d..e63bd6e 100644
--- a/app/src/main/res/layout/act_datanalysis.xml
+++ b/app/src/main/res/layout/act_datanalysis.xml
@@ -1,8 +1,180 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical">
+
     <include layout="@layout/include_tool_bar"></include>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/greyf4f4f4">
+
+
+        <TextView
+            android:id="@+id/data_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/dp_8"
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_8"
+            android:background="@drawable/shape_select"
+            android:padding="@dimen/dp_3"
+            android:text="@string/app_name"
+            android:textSize="@dimen/text_size_16" />
+    </LinearLayout>
+
+    <lecho.lib.hellocharts.view.LineChartView
+        android:id="@+id/line_chart"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginLeft="2dp"
+        android:layout_weight="1" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10">
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:drawableLeft="@drawable/shape_red1"
+            android:drawablePadding="@dimen/dp_5"
+            android:text="@string/standard"
+            android:textColor="@color/grey888888"
+            android:textSize="@dimen/text_size_14" />
+
+        <TextView
+            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" />
+
+        <TextView
+            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" />
+
+        <TextView
+            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/Death"
+            android:textColor="@color/grey888888"
+            android:textSize="@dimen/text_size_14" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+    </LinearLayout>
+
+    <TableLayout
+        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="*">
+
+        <TableRow>
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:background="@drawable/shape_balck"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/dp_3"
+                android:text="@string/Contrastiveterm"
+                android:textColor="@color/grey888888"
+                android:textSize="@dimen/text_size_16"></TextView>
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:background="@drawable/shape_balck"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/dp_3"
+                android:text="@string/showcontents"
+                android:textColor="@color/grey888888"
+                android:textSize="@dimen/text_size_16"></TextView>
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:id="@+id/taget1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:background="@drawable/shape_white"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/dp_3"
+                android:text="@string/death"
+                android:textColor="@color/black303030"
+                android:textSize="@dimen/text_size_16"></TextView>
+
+            <TextView
+                android:id="@+id/taget_content1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:background="@drawable/shape_white"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/dp_3"
+                android:text="@string/showcontents"
+                android:textSize="@dimen/text_size_16"></TextView>
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:id="@+id/taget2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:background="@drawable/shape_white"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/dp_3"
+                android:text="@string/death"
+                android:textColor="@color/black303030"
+                android:textSize="@dimen/text_size_16"></TextView>
+
+            <TextView
+                android:id="@+id/taget_content2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:background="@drawable/shape_white"
+                android:gravity="center_horizontal"
+                android:padding="@dimen/dp_3"
+                android:text="@string/showcontents"
+                android:textSize="@dimen/text_size_16"></TextView>
+        </TableRow>
+
+    </TableLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8ab6ebd..a8e42d1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -31,5 +31,9 @@
     <color name="transp">#00000000</color>
     <color name="green02aa3e">#02aa3e</color>
 
+    <color name="redda4848">#da4848</color>
+    <color name="blue48dac7">#48dac7</color>
+    <color name="grenn48da59">#48da59</color>
+    <color name="perpod26ee4">#d26ee4</color>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 920115f..e91ab94 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,5 +33,11 @@
     <string name="Chicks">鸡苗</string>
     <string name="GrossChicken">毛鸡</string>
     <string name="feed">饲料</string>
+    <string name="standard">标准</string>
+    <string name="death">死亡</string>
+    <string name="weight">体重</string>
+    <string name="Death">死淘</string>
+    <string name="Contrastiveterm">对比项</string>
+    <string name="showcontents">显示内容</string>
 
 </resources>