From eefc26e0dceab8aeefa200415ee8b021fdb8db2e Mon Sep 17 00:00:00 2001
From: zhanghui <15122431204@163.com>
Date: Thu, 30 Nov 2017 17:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=96=87=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  18 +-
 .idea/modules.xml                             |   3 +-
 app/build.gradle                              |  27 +-
 app/src/main/res/layout/act_carsmanage.xml    |  60 +++++
 app/src/main/res/layout/act_datanaly_s.xml    |  36 +++
 app/src/main/res/layout/act_datanalysis.xml   |   8 +
 app/src/main/res/layout/act_scanresult.xml    |  24 +-
 app/src/main/res/layout/act_warning.xml       |  19 ++
 .../main/res/layout/activity_mine_info.xml    | 110 ++++++++
 app/src/main/res/layout/activity_setting.xml  |  56 ++++
 .../main/res/layout/calendar_dialog_basic.xml |  25 ++
 app/src/main/res/layout/content_mine_info.xml |  11 +
 app/src/main/res/layout/fragment_chicks.xml   |  14 +
 app/src/main/res/layout/fragment_feed.xml     |  10 +
 .../main/res/layout/fragment_grosschicken.xml |  14 +
 app/src/main/res/layout/fragment_work.xml     |  13 +-
 .../res/layout/include_tool_bar_white.xml     |  17 ++
 app/src/main/res/layout/item_factry.xml       |  18 ++
 app/src/main/res/layout/item_infos.xml        | 254 ++++++++++++++++++
 app/src/main/res/layout/item_warning.xml      |  43 +++
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |  14 +
 app/src/main/res/values/styles.xml            |   7 +
 23 files changed, 779 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/res/layout/act_carsmanage.xml
 create mode 100644 app/src/main/res/layout/act_datanaly_s.xml
 create mode 100644 app/src/main/res/layout/act_datanalysis.xml
 create mode 100644 app/src/main/res/layout/act_warning.xml
 create mode 100644 app/src/main/res/layout/activity_mine_info.xml
 create mode 100644 app/src/main/res/layout/activity_setting.xml
 create mode 100644 app/src/main/res/layout/calendar_dialog_basic.xml
 create mode 100644 app/src/main/res/layout/content_mine_info.xml
 create mode 100644 app/src/main/res/layout/fragment_chicks.xml
 create mode 100644 app/src/main/res/layout/fragment_feed.xml
 create mode 100644 app/src/main/res/layout/fragment_grosschicken.xml
 create mode 100644 app/src/main/res/layout/include_tool_bar_white.xml
 create mode 100644 app/src/main/res/layout/item_factry.xml
 create mode 100644 app/src/main/res/layout/item_infos.xml
 create mode 100644 app/src/main/res/layout/item_warning.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 54207cd..7158618 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,10 +37,26 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index efc9df2..f0a6a7c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/Ytzh.iml" filepath="$PROJECT_DIR$/Ytzh.iml" />
-      <module fileurl="file://$PROJECT_DIR$/Ytzh_Android.iml" filepath="$PROJECT_DIR$/Ytzh_Android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/jsonrpc/jsonrpc.iml" filepath="$PROJECT_DIR$/jsonrpc/jsonrpc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ytzh_Android.iml" filepath="$PROJECT_DIR$/ytzh_Android.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index cda7bde..08c90eb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,33 +27,34 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:26.+'
-    testCompile 'junit:junit:4.12'
     ///< 黄油刀
-    compile 'com.jakewharton:butterknife:8.4.0'
-    apt 'com.jakewharton:butterknife-compiler:8.4.0'
     ///< 图片加载
+    ///< 广播
+    ///< 友盟
+    ///< 动态权限
+    ///< 数据库
+    ///< 二维码扫描
+    ///< 轮播图
+    compile project(':jsonrpc')
+    ///< 图表工具
+    ///< 时间选择器
+    compile 'com.android.support:appcompat-v7:26.+'
+    compile 'com.jakewharton:butterknife:8.4.0'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.android.support:support-v4:26.0.0-alpha1'
     compile 'com.android.support:design:26.0.0-alpha1'
-    ///< 广播
     compile 'org.greenrobot:eventbus:3.0.0'
-    ///< 友盟
     compile 'com.umeng.analytics:analytics:latest.integration'
-    ///< 动态权限
     compile 'pub.devrel:easypermissions:0.2.1'
     compile 'com.google.code.gson:gson:2.8.1'
-    ///< 数据库
     compile 'org.litepal.android:core:1.3.0'
-    ///< 二维码扫描
     compile 'com.journeyapps:zxing-android-embedded:3.5.0'
     compile 'com.google.zxing:core:3.3.0'
-    ///< 轮播图
     compile 'com.youth.banner:banner:1.4.10'
-    compile project(':jsonrpc')
     compile 'com.android.support:cardview-v7:26.0.0-alpha1'
-    ///< 图表工具
     compile 'com.github.lecho:hellocharts-library:1.5.8@aar'
-    ///< 时间选择器
     compile 'com.prolificinteractive:material-calendarview:1.4.0'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    testCompile 'junit:junit:4.12'
+    apt 'com.jakewharton:butterknife-compiler:8.4.0'
 }
diff --git a/app/src/main/res/layout/act_carsmanage.xml b/app/src/main/res/layout/act_carsmanage.xml
new file mode 100644
index 0000000..88929fe
--- /dev/null
+++ b/app/src/main/res/layout/act_carsmanage.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_tool_bar_white"></include>
+    <include layout="@layout/include_line"></include>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/chicks"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:padding="@dimen/dp_12"
+            android:text="@string/Chicks"
+            android:textColor="@color/grey666666"
+            android:textSize="@dimen/text_size_18"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/GrossChicken"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:padding="@dimen/dp_12"
+            android:text="@string/GrossChicken"
+            android:textColor="@color/grey666666"
+            android:textSize="@dimen/text_size_18"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/feed"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_horizontal"
+            android:padding="@dimen/dp_12"
+            android:text="@string/feed"
+            android:textColor="@color/grey666666"
+            android:textSize="@dimen/text_size_18"
+            android:textStyle="bold" />
+
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/main_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_datanaly_s.xml b/app/src/main/res/layout/act_datanaly_s.xml
new file mode 100644
index 0000000..915ef90
--- /dev/null
+++ b/app/src/main/res/layout/act_datanaly_s.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/greyf4f4f4"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_tool_bar"></include>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+            <com.qhclh.ytzh.ui.MyGridView
+                android:id="@+id/gv_dataanaly"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:columnWidth="100dp"
+                android:gravity="center_horizontal"
+                android:horizontalSpacing="10dp"
+                android:numColumns="auto_fit"
+                android:padding="@dimen/dp_10"
+                android:scrollbars="none"
+                android:stretchMode="columnWidth"
+                android:verticalSpacing="15dp"></com.qhclh.ytzh.ui.MyGridView>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
\ 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
new file mode 100644
index 0000000..d6cb79d
--- /dev/null
+++ b/app/src/main/res/layout/act_datanalysis.xml
@@ -0,0 +1,8 @@
+<?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">
+    <include layout="@layout/include_tool_bar"></include>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_scanresult.xml b/app/src/main/res/layout/act_scanresult.xml
index f14841a..bf15292 100644
--- a/app/src/main/res/layout/act_scanresult.xml
+++ b/app/src/main/res/layout/act_scanresult.xml
@@ -1,8 +1,28 @@
 <?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/greyf4f4f4"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_tool_bar"></include>
+
+    <TextView
+        android:id="@+id/type"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:text="@string/app_name"
+        android:padding="@dimen/dp_10"
+        android:textSize="@dimen/text_size_16" />
+
+    <ListView
+        android:id="@+id/lv_infos"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="none">
+
+    </ListView>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_warning.xml b/app/src/main/res/layout/act_warning.xml
new file mode 100644
index 0000000..b0d1105
--- /dev/null
+++ b/app/src/main/res/layout/act_warning.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/greyf4f4f4"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_tool_bar"></include>
+
+    <ListView
+        android:id="@+id/lv_warning"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:scrollbars="none">
+
+    </ListView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_mine_info.xml b/app/src/main/res/layout/activity_mine_info.xml
new file mode 100644
index 0000000..3cf5b92
--- /dev/null
+++ b/app/src/main/res/layout/activity_mine_info.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/greyf4f4f4"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardElevation="@dimen/cardview_compat_inset_shadow">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:padding="12dp">
+
+            <TextView
+                android:id="@+id/textView"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="3"
+                android:gravity="center_vertical"
+                android:text="设置头像"
+                android:textSize="@dimen/text_size_18" />
+
+            <com.qhclh.ytzh.utils.widget.XCRoundImageView
+                android:id="@+id/imageView"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginRight="20dp"
+                android:src="@mipmap/ic_launcher" />
+            <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@drawable/more_icon"/>
+
+
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        app:cardElevation="@dimen/cardview_compat_inset_shadow">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_phoneNumber"
+                android:layout_width="match_parent"
+                android:layout_height="47dp"
+                android:drawablePadding="10dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="我的手机"
+                android:drawableRight="@drawable/more_icon"
+                android:textSize="@dimen/text_size_18" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="#dbdbdb" />
+
+            <TextView
+                android:id="@+id/tv_sex"
+                android:layout_width="match_parent"
+                android:layout_height="47dp"
+                android:drawablePadding="10dp"
+                android:gravity="center_vertical"
+                android:drawableRight="@drawable/more_icon"
+
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="性别"
+                android:textSize="@dimen/text_size_18" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="#dbdbdb" />
+
+            <TextView
+                android:id="@+id/tv_birthday"
+                android:layout_width="match_parent"
+                android:layout_height="47dp"
+                android:drawablePadding="10dp"
+                android:drawableRight="@drawable/more_icon"
+
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="生日"
+                android:textSize="@dimen/text_size_18" />
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
new file mode 100644
index 0000000..5d306e0
--- /dev/null
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/greyf4f4f4"
+    android:orientation="vertical">
+
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        app:cardElevation="@dimen/cardview_compat_inset_shadow">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_phoneNumber"
+                android:layout_width="match_parent"
+                android:layout_height="47dp"
+                android:drawablePadding="10dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="修改密码"
+                android:visibility="gone"
+                android:drawableRight="@drawable/more_icon"
+                android:textSize="@dimen/text_size_18" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="2px"
+                android:background="#dbdbdb" />
+
+            <TextView
+                android:id="@+id/tv_sex"
+                android:layout_width="match_parent"
+                android:layout_height="47dp"
+                android:drawablePadding="10dp"
+                android:drawableRight="@drawable/more_icon"
+                android:gravity="center_vertical"
+
+                android:paddingLeft="12dp"
+                android:paddingRight="12dp"
+                android:text="退出登录"
+                android:textSize="@dimen/text_size_18" />
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/calendar_dialog_basic.xml b/app/src/main/res/layout/calendar_dialog_basic.xml
new file mode 100644
index 0000000..5ae1bce
--- /dev/null
+++ b/app/src/main/res/layout/calendar_dialog_basic.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+
+    >
+
+    <com.prolificinteractive.materialcalendarview.MaterialCalendarView
+        android:id="@+id/calendarView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
+    <!--<TextView-->
+        <!--android:id="@+id/textView"-->
+        <!--android:layout_margin="16dp"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_gravity="center"-->
+        <!--android:textAppearance="?android:attr/textAppearanceLarge"-->
+        <!--/>-->
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_mine_info.xml b/app/src/main/res/layout/content_mine_info.xml
new file mode 100644
index 0000000..7b812e2
--- /dev/null
+++ b/app/src/main/res/layout/content_mine_info.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="com.qhclh.ytzh.me.MineInfoActivity"
+    tools:showIn="@layout/activity_mine_info">
+
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_chicks.xml b/app/src/main/res/layout/fragment_chicks.xml
new file mode 100644
index 0000000..03669bb
--- /dev/null
+++ b/app/src/main/res/layout/fragment_chicks.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@color/greyf4f4f4"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ListView
+        android:id="@+id/lv_infos_chicks"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="none">
+
+    </ListView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml
new file mode 100644
index 0000000..86d2066
--- /dev/null
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -0,0 +1,10 @@
+<?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">
+    <TextView
+        android:text="@string/feed"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_grosschicken.xml b/app/src/main/res/layout/fragment_grosschicken.xml
new file mode 100644
index 0000000..166cabd
--- /dev/null
+++ b/app/src/main/res/layout/fragment_grosschicken.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@color/greyf4f4f4"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ListView
+        android:id="@+id/lv_infos_grosschicken"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="none">
+
+    </ListView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_work.xml b/app/src/main/res/layout/fragment_work.xml
index bd6b3ef..a2718c2 100644
--- a/app/src/main/res/layout/fragment_work.xml
+++ b/app/src/main/res/layout/fragment_work.xml
@@ -13,9 +13,9 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_10"
         android:layout_marginLeft="@dimen/dp_12"
         android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginBottom="@dimen/dp_10"
         android:drawableLeft="@drawable/shape_grey"
         android:drawablePadding="@dimen/dp_10"
         android:text="@string/functions"
@@ -26,9 +26,9 @@
         android:layout_height="wrap_content"
         android:background="@color/white"
         android:orientation="horizontal"
+        android:paddingBottom="@dimen/dp_15"
         android:paddingLeft="@dimen/dp_10"
         android:paddingRight="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_15"
         android:paddingTop="@dimen/dp_15">
         <!-- 种禽-->
         <LinearLayout
@@ -98,6 +98,7 @@
 
 
         <LinearLayout
+            android:id="@+id/work_tablepoultry"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -106,13 +107,15 @@
 
             <ImageView
                 android:layout_width="50dp"
-                android:layout_height="50dp" />
+                android:layout_height="50dp"
+                android:src="@drawable/rouqin_3x" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_3"
-                android:textSize="@dimen/text_size_16" />
+                android:layout_marginTop="@dimen/dp_5"
+                android:text="@string/work_tablepoultry"
+                android:textSize="@dimen/text_size_14" />
         </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/include_tool_bar_white.xml b/app/src/main/res/layout/include_tool_bar_white.xml
new file mode 100644
index 0000000..9f1519a
--- /dev/null
+++ b/app/src/main/res/layout/include_tool_bar_white.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- toolbar-->
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                   android:id="@+id/toolbar1"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="?attr/actionBarSize"
+                                   android:background="@color/white"
+                                   android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+                                   android:elevation="@dimen/dp_2"
+                                   app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+
+    <TextView
+        android:id="@+id/tv_toolbar_title1"
+        style="@style/TextView_18_black_2828281"
+        android:layout_gravity="center"/>
+</android.support.v7.widget.Toolbar>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_factry.xml b/app/src/main/res/layout/item_factry.xml
new file mode 100644
index 0000000..ac4aa38
--- /dev/null
+++ b/app/src/main/res/layout/item_factry.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <CheckBox
+        android:id="@+id/factry_name"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/btn_check"
+        android:button="@null"
+        android:gravity="center_horizontal"
+        android:padding="@dimen/dp_3"
+        android:textColor="@color/black303030"
+        android:textSize="@dimen/text_size_20" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_infos.xml b/app/src/main/res/layout/item_infos.xml
new file mode 100644
index 0000000..e15aeb4
--- /dev/null
+++ b/app/src/main/res/layout/item_infos.xml
@@ -0,0 +1,254 @@
+<?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">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/carname"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/infos_carname"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20"
+            android:text="@string/addrs"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/driver"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/infos_driver"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20"
+            android:text="@string/addrs"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/phone"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/infos_phone"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20"
+            android:text="@string/addrs"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/batch"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/infos_batch"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20"
+            android:text="@string/addrs"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/addrs"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/infos_addrs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:text="@string/addrs"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/time"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/infos_time"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20"
+            android:text="@string/addrs"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/number"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/infos_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:text="@string/addrs"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/immune"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/infos_immune"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20"
+            android:text="@string/addrs"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/Uniformity"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/infos_uniformity"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20"
+            android:text="@string/addrs"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/startime"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/infos_startime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:text="@string/addrs"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/endtime"
+            android:textSize="@dimen/text_size_18"
+            android:textColor="@color/grey888888"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/infos_endtime"
+            android:textColor="@color/black303030"
+            android:textSize="@dimen/text_size_20"
+            android:text="@string/addrs"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_warning.xml b/app/src/main/res/layout/item_warning.xml
new file mode 100644
index 0000000..c19d786
--- /dev/null
+++ b/app/src/main/res/layout/item_warning.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/warning_time"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:padding="@dimen/dp_5"
+        android:textColor="@color/grey888888"
+        android:textSize="@dimen/text_size_16" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/dp_12"
+        android:paddingLeft="@dimen/dp_12">
+
+        <ImageView
+            android:id="@+id/warning_pic"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_60"
+            android:background="@drawable/shape_bg"
+            android:padding="@dimen/dp_2"
+            android:scaleType="fitXY" />
+
+        <TextView
+            android:id="@+id/warning_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_marginRight="@dimen/dp_30"
+            android:background="@drawable/qipao"
+            android:padding="@dimen/dp_10"
+            android:textColor="@color/black303030" />
+
+    </LinearLayout>
+
+</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 c75f07d..8ab6ebd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -29,6 +29,7 @@
     <color name="black303030">#303030</color>
     <color name="redd92828">#d92828</color>
     <color name="transp">#00000000</color>
+    <color name="green02aa3e">#02aa3e</color>
 
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2bd9689..920115f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
     <string name="work_breedingpoultry">种禽</string>
     <string name="work_carsmanager">车辆管理</string>
     <string name="work_scan">扫一扫</string>
+    <string name="work_tablepoultry">肉禽</string>
     <string name="functions">功能区</string>
     <string name="date">日期:</string>
     <string name="supplier">供货商:</string>
@@ -17,7 +18,20 @@
     <string name="driver">司机:</string>
     <string name="driver1">司机</string>
     <string name="number">数量:</string>
+    <string name="carname">车牌号:</string>
+    <string name="phone">联系方式:</string>
+    <string name="batch">批次:</string>
+    <string name="addrs">厂址:</string>
+    <string name="time">时间:</string>
+    <string name="immune">免疫:</string>
+    <string name="Uniformity">均匀度:</string>
+    <string name="startime">起始时间:</string>
+    <string name="endtime">到达时间:</string>
     <string name="permission_camera">请给予应用打开摄像头权限</string>
     <string name="permission_phonestate">请给予应用获取手机状态权限</string>
     <string name="title_activity_mine_info">MineInfoActivity</string>
+    <string name="Chicks">鸡苗</string>
+    <string name="GrossChicken">毛鸡</string>
+    <string name="feed">饲料</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3ad354a..c5753b0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,6 +31,13 @@
         <item name="android:textSize">@dimen/text_size_20</item>
     </style>
 
+    <style name="TextView_18_black_2828281">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:textColor">@color/black303030</item>
+        <item name="android:textSize">@dimen/text_size_20</item>
+    </style>
+
     <style name="TabLayout">
         <item name="android:paddingTop">@dimen/tab_layout_padding</item>
         <item name="android:paddingBottom">@dimen/dp_3</item>