From c50ca9ffc4b5ce64ff0c5431e8b742e4a9cccd41 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 30 Nov 2017 09:21:15 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/qhclh/ytzh/bean/ScanBean.java    | 149 ++++++++++
 .../com/qhclh/ytzh/work/scan/ScanAdapter.java |  98 +++++++
 .../ytzh/work/scan/ScanResultActivity.java    |  37 ++-
 app/src/main/res/layout/act_scanresult.xml    |  24 +-
 app/src/main/res/layout/item_infos.xml        | 254 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   9 +
 6 files changed, 567 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java
 create mode 100644 app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java
 create mode 100644 app/src/main/res/layout/item_infos.xml

diff --git a/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java b/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java
new file mode 100644
index 0000000..898cec8
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java
@@ -0,0 +1,149 @@
+package com.qhclh.ytzh.bean;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class ScanBean {
+    private int id;
+    private String infos_carname;
+    private String infos_driver;
+    private String infos_phone;
+    private String infos_batch;
+    private String infos_addrs;
+    private String infos_time;
+    private String infos_number;
+    private String infos_immune;
+    private String infos_uniformity;
+    private String infos_startime;
+    private String infos_endtime;
+
+    public ScanBean(int id, String infos_carname, String infos_driver, String infos_phone, String infos_batch, String infos_addrs, String infos_time, String infos_number, String infos_immune, String infos_uniformity, String infos_startime, String infos_endtime) {
+        this.id = id;
+        this.infos_carname = infos_carname;
+        this.infos_driver = infos_driver;
+        this.infos_phone = infos_phone;
+        this.infos_batch = infos_batch;
+        this.infos_addrs = infos_addrs;
+        this.infos_time = infos_time;
+        this.infos_number = infos_number;
+        this.infos_immune = infos_immune;
+        this.infos_uniformity = infos_uniformity;
+        this.infos_startime = infos_startime;
+        this.infos_endtime = infos_endtime;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getInfos_carname() {
+        return infos_carname;
+    }
+
+    public void setInfos_carname(String infos_carname) {
+        this.infos_carname = infos_carname;
+    }
+
+    public String getInfos_driver() {
+        return infos_driver;
+    }
+
+    public void setInfos_driver(String infos_driver) {
+        this.infos_driver = infos_driver;
+    }
+
+    public String getInfos_phone() {
+        return infos_phone;
+    }
+
+    public void setInfos_phone(String infos_phone) {
+        this.infos_phone = infos_phone;
+    }
+
+    public String getInfos_batch() {
+        return infos_batch;
+    }
+
+    public void setInfos_batch(String infos_batch) {
+        this.infos_batch = infos_batch;
+    }
+
+    public String getInfos_addrs() {
+        return infos_addrs;
+    }
+
+    public void setInfos_addrs(String infos_addrs) {
+        this.infos_addrs = infos_addrs;
+    }
+
+    public String getInfos_time() {
+        return infos_time;
+    }
+
+    public void setInfos_time(String infos_time) {
+        this.infos_time = infos_time;
+    }
+
+    public String getInfos_number() {
+        return infos_number;
+    }
+
+    public void setInfos_number(String infos_number) {
+        this.infos_number = infos_number;
+    }
+
+    public String getInfos_immune() {
+        return infos_immune;
+    }
+
+    public void setInfos_immune(String infos_immune) {
+        this.infos_immune = infos_immune;
+    }
+
+    public String getInfos_uniformity() {
+        return infos_uniformity;
+    }
+
+    public void setInfos_uniformity(String infos_uniformity) {
+        this.infos_uniformity = infos_uniformity;
+    }
+
+    public String getInfos_startime() {
+        return infos_startime;
+    }
+
+    public void setInfos_startime(String infos_startime) {
+        this.infos_startime = infos_startime;
+    }
+
+    public String getInfos_endtime() {
+        return infos_endtime;
+    }
+
+    public void setInfos_endtime(String infos_endtime) {
+        this.infos_endtime = infos_endtime;
+    }
+
+    @Override
+    public String toString() {
+        return "ScanBean{" +
+                "id=" + id +
+                ", infos_carname='" + infos_carname + '\'' +
+                ", infos_driver='" + infos_driver + '\'' +
+                ", infos_phone='" + infos_phone + '\'' +
+                ", infos_batch='" + infos_batch + '\'' +
+                ", infos_addrs='" + infos_addrs + '\'' +
+                ", infos_time='" + infos_time + '\'' +
+                ", infos_number='" + infos_number + '\'' +
+                ", infos_immune='" + infos_immune + '\'' +
+                ", infos_uniformity='" + infos_uniformity + '\'' +
+                ", infos_startime='" + infos_startime + '\'' +
+                ", infos_endtime='" + infos_endtime + '\'' +
+                '}';
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java
new file mode 100644
index 0000000..01994c5
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java
@@ -0,0 +1,98 @@
+package com.qhclh.ytzh.work.scan;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.bean.ScanBean;
+
+import java.util.List;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class ScanAdapter extends BaseAdapter {
+
+    private Context context;
+    private List<ScanBean> list;
+    private LayoutInflater layoutInflater;
+
+    public ScanAdapter(Context context, List<ScanBean> list) {
+        this.context = context;
+        this.list = list;
+        layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return list.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return list.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return list.get(i).getId();
+    }
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        ViewHolder viewHolder;
+        ScanBean message = list.get(i);
+        if (view == null){
+            view = layoutInflater.inflate(R.layout.item_infos,viewGroup,false);
+            viewHolder = new ViewHolder();
+            viewHolder.infos_carname = view.findViewById(R.id.infos_carname);
+            viewHolder.infos_driver = view.findViewById(R.id.infos_driver);
+            viewHolder.infos_phone = view.findViewById(R.id.infos_phone);
+            viewHolder.infos_batch = view.findViewById(R.id.infos_batch);
+            viewHolder.infos_addrs = view.findViewById(R.id.infos_addrs);
+            viewHolder.infos_time = view.findViewById(R.id.infos_time);
+            viewHolder.infos_number = view.findViewById(R.id.infos_number);
+            viewHolder.infos_immune = view.findViewById(R.id.infos_immune);
+            viewHolder.infos_uniformity = view.findViewById(R.id.infos_uniformity);
+            viewHolder.infos_startime = view.findViewById(R.id.infos_startime);
+            viewHolder.infos_endtime = view.findViewById(R.id.infos_endtime);
+
+            view.setTag(viewHolder);
+        }else {
+            viewHolder = (ViewHolder) view.getTag();
+        }
+
+        viewHolder.infos_carname.setText(message.getInfos_carname());
+        viewHolder.infos_driver.setText(message.getInfos_driver());
+        viewHolder.infos_phone.setText(message.getInfos_phone());
+        viewHolder.infos_batch.setText(message.getInfos_batch());
+        viewHolder.infos_addrs.setText(message.getInfos_addrs());
+        viewHolder.infos_time.setText(message.getInfos_time());
+        viewHolder.infos_number.setText(message.getInfos_number());
+        viewHolder.infos_immune.setText(message.getInfos_immune());
+        viewHolder.infos_uniformity.setText(message.getInfos_uniformity());
+        viewHolder.infos_startime.setText(message.getInfos_startime());
+        viewHolder.infos_endtime.setText(message.getInfos_endtime());
+
+        return view;
+    }
+
+    private class ViewHolder{
+        private TextView infos_carname;
+        private TextView infos_driver;
+        private TextView infos_phone;
+        private TextView infos_batch;
+        private TextView infos_addrs;
+        private TextView infos_time;
+        private TextView infos_number;
+        private TextView infos_immune;
+        private TextView infos_uniformity;
+        private TextView infos_startime;
+        private TextView infos_endtime;
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
index 4718422..be13137 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
@@ -3,12 +3,21 @@ package com.qhclh.ytzh.work.scan;
 import android.Manifest;
 import android.content.Intent;
 import android.support.annotation.NonNull;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
 
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
 import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseActivity;
+import com.qhclh.ytzh.bean.ScanBean;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
 import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.EasyPermissions;
 
@@ -17,9 +26,16 @@ import pub.devrel.easypermissions.EasyPermissions;
  */
 
 public class ScanResultActivity extends BaseActivity {
+    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+    @BindView(R.id.lv_infos)
+    ListView lv_infos;
     private String scanStr = "";
     private boolean scanf = false;
 
+    private List<ScanBean> scanBeanList;
+    private ScanAdapter scanAdapter;
+
     @Override
     protected int setLayoutId() {
         return R.layout.act_scanresult;
@@ -27,17 +43,34 @@ public class ScanResultActivity extends BaseActivity {
 
     @Override
     protected void initView() {
-
+        initToolbar(mToolbar, "扫码结果", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
     }
 
     @Override
     protected void initData() {
+        scanBeanList = new ArrayList<>();
 
+        for (int i=0;i<4;i++){
+            scanBeanList.add(new ScanBean(i,"车牌号"+i,"司机"+i,"联系方式"+i,"批次"+i,"厂址"+i,
+                    "时间"+i,"数量"+i,"免疫"+i,"均匀度"+i,"起始时间"+i,"到达时间"+i));
+        }
+        scanAdapter = new ScanAdapter(this,scanBeanList);
+        lv_infos.setAdapter(scanAdapter);
     }
 
     @Override
     protected void initOper() {
-
+        lv_infos.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                showToast(l+"");
+            }
+        });
     }
 
     @Override
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/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/values/strings.xml b/app/src/main/res/values/strings.xml
index 827febb..6942b84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,6 +17,15 @@
     <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>
 </resources>

From cd5b1f4a7eb82c8ec85f390b892f79f4b96463b6 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 30 Nov 2017 09:25:00 +0800
Subject: [PATCH 2/9] no message

---
 .../qhclh/ytzh/work/scan/ScanResultActivity.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
index be13137..d4af373 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
@@ -54,13 +54,6 @@ public class ScanResultActivity extends BaseActivity {
     @Override
     protected void initData() {
         scanBeanList = new ArrayList<>();
-
-        for (int i=0;i<4;i++){
-            scanBeanList.add(new ScanBean(i,"车牌号"+i,"司机"+i,"联系方式"+i,"批次"+i,"厂址"+i,
-                    "时间"+i,"数量"+i,"免疫"+i,"均匀度"+i,"起始时间"+i,"到达时间"+i));
-        }
-        scanAdapter = new ScanAdapter(this,scanBeanList);
-        lv_infos.setAdapter(scanAdapter);
     }
 
     @Override
@@ -124,6 +117,12 @@ public class ScanResultActivity extends BaseActivity {
                 finish();
             } else {
                 scanStr = result.getContents();
+                for (int i=0;i<4;i++){
+                    scanBeanList.add(new ScanBean(i,"车牌号"+i,"司机"+i,"联系方式"+i,"批次"+i,"厂址"+i,
+                            "时间"+i,"数量"+i,"免疫"+i,"均匀度"+i,"起始时间"+i,"到达时间"+i));
+                }
+                scanAdapter = new ScanAdapter(this,scanBeanList);
+                lv_infos.setAdapter(scanAdapter);
             }
         } else {
             super.onActivityResult(requestCode, resultCode, data);

From ff8a958d5419e716a023f2990003d81a76926d6d Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 30 Nov 2017 10:50:19 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A03=E4=B8=AA=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   2 +
 .../com/qhclh/ytzh/work/WorkFragment.java     |   3 +-
 .../work/carsmannage/CarsManageActivity.java  | 179 ++++++++++++++++++
 .../ytzh/work/carsmannage/ChicksFragment.java |  30 +++
 .../ytzh/work/carsmannage/FeedFragment.java   |  30 +++
 .../carsmannage/GrossChickenFragment.java     |  30 +++
 app/src/main/res/layout/act_carsmanage.xml    |  59 ++++++
 app/src/main/res/layout/fragment_chicks.xml   |  11 ++
 app/src/main/res/layout/fragment_feed.xml     |  10 +
 .../main/res/layout/fragment_grosschicken.xml |  10 +
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |   3 +
 12 files changed, 367 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java
 create mode 100644 app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java
 create mode 100644 app/src/main/java/com/qhclh/ytzh/work/carsmannage/FeedFragment.java
 create mode 100644 app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java
 create mode 100644 app/src/main/res/layout/act_carsmanage.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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1d36073..9f00190 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,6 +44,8 @@
         <activity
             android:name=".work.scan.ScanResultActivity"
             android:screenOrientation="portrait" />
+        <activity android:name=".work.carsmannage.CarsManageActivity"
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".index.planorder.CarsActivity"
             android:screenOrientation="portrait" />
diff --git a/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java
index 1cb9752..c03d6ec 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java
@@ -7,6 +7,7 @@ import android.widget.LinearLayout;
 import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseFragment;
 import com.qhclh.ytzh.utils.GlideImageLoader;
+import com.qhclh.ytzh.work.carsmannage.CarsManageActivity;
 import com.qhclh.ytzh.work.scan.ScanResultActivity;
 import com.youth.banner.Banner;
 import com.youth.banner.BannerConfig;
@@ -89,7 +90,7 @@ public class WorkFragment extends BaseFragment implements View.OnClickListener {
         if (view.equals(work_breedingpoultry)){
             showToast("种禽");
         }else if (view.equals(work_carsmanager)){
-            showToast("车辆管理");
+            startActivity(new Intent(getActivity(), CarsManageActivity.class));
         }else if (view.equals(work_scan)){
             startActivity(new Intent(getActivity(), ScanResultActivity.class));
         }
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java
new file mode 100644
index 0000000..41ace4f
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java
@@ -0,0 +1,179 @@
+package com.qhclh.ytzh.work.carsmannage;
+
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.TextView;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.base.BaseActivity;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class CarsManageActivity extends BaseActivity {
+    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+    @BindView(R.id.chicks)
+    TextView chicks;
+    @BindView(R.id.GrossChicken)
+    TextView GrossChicken;
+    @BindView(R.id.feed)
+    TextView feed;
+
+    ///< 鸡苗
+    private static final int TAB_POSITION_CHICKS = 0;
+    ///< 毛鸡
+    private static final int TAB_POSITION_GROSSCHICKEN = 1;
+    ///< 饲料
+    private static final int TAB_POSITION_FEED = 2;
+    private int mCurrentTabPosition = -1;
+    private int mTargetTabPosition = TAB_POSITION_CHICKS;
+
+    private ChicksFragment chicksFragment;
+    private GrossChickenFragment grossChickenFragment;
+    private FeedFragment feedFragment;
+
+    @Override
+    protected int setLayoutId() {
+        return R.layout.act_carsmanage;
+    }
+
+    @Override
+    protected void initView() {
+        ///< 点击切换fragment
+        onTabClick(mTargetTabPosition);
+        initToolbar(mToolbar, "车辆管理", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected void initData() {
+        feed.setVisibility(View.GONE);
+    }
+
+    @Override
+    protected void initOper() {
+
+    }
+
+    @OnClick({R.id.chicks,R.id.GrossChicken,R.id.feed})
+    public void OnClick(View v){
+        switch (v.getId()){
+            case R.id.chicks:
+                onTabClick(TAB_POSITION_CHICKS);
+                break;
+            case R.id.GrossChicken:
+                onTabClick(TAB_POSITION_GROSSCHICKEN);
+                break;
+            case R.id.feed:
+                onTabClick(TAB_POSITION_FEED);
+                break;
+
+        }
+    }
+
+    private void onTabClick(int tabPosition) {
+        if (mCurrentTabPosition == tabPosition) {
+            return;
+        }
+        mCurrentTabPosition = tabPosition;
+        changeTabState(tabPosition);
+        changeFragment(tabPosition);
+    }
+
+    private void changeTabState(int tabPosition) {
+        clearAllTabState();
+        switch (tabPosition) {
+            case TAB_POSITION_CHICKS: {
+                chicks.setTextColor(this.getResources().getColor(R.color.white));
+                chicks.setBackgroundColor(this.getResources().getColor(R.color.green02aa3e));
+                break;
+            }
+
+            case TAB_POSITION_GROSSCHICKEN: {
+                GrossChicken.setTextColor(this.getResources().getColor(R.color.white));
+                GrossChicken.setBackgroundColor(this.getResources().getColor(R.color.green02aa3e));
+                break;
+            }
+            case TAB_POSITION_FEED: {
+                feed.setTextColor(this.getResources().getColor(R.color.white));
+                feed.setBackgroundColor(this.getResources().getColor(R.color.green02aa3e));
+                break;
+            }
+        }
+    }
+
+
+    private void clearAllTabState() {
+        ///< 首页
+        chicks.setTextColor(this.getResources().getColor(R.color.grey666666));
+        chicks.setBackgroundColor(this.getResources().getColor(R.color.white));
+        ///< 工作
+        GrossChicken.setTextColor(this.getResources().getColor(R.color.grey666666));
+        GrossChicken.setBackgroundColor(this.getResources().getColor(R.color.white));
+        ///< 我的
+        feed.setTextColor(this.getResources().getColor(R.color.grey666666));
+        feed.setBackgroundColor(this.getResources().getColor(R.color.white));
+
+    }
+
+
+    private void changeFragment(int tabPosition) {
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        hideFragment(transaction);
+        switch (tabPosition) {
+            case TAB_POSITION_CHICKS: {
+                if (chicksFragment == null) {
+                    chicksFragment = new ChicksFragment();
+                    transaction.add(R.id.main_container, chicksFragment);
+                } else {
+                    transaction.show(chicksFragment);
+                }
+                break;
+            }
+
+            case TAB_POSITION_GROSSCHICKEN: {
+                if (grossChickenFragment == null) {
+                    grossChickenFragment = new GrossChickenFragment();
+                    transaction.add(R.id.main_container, grossChickenFragment);
+                } else {
+                    transaction.show(grossChickenFragment);
+                }
+                break;
+            }
+
+            case TAB_POSITION_FEED: {
+                if (feedFragment == null) {
+                    feedFragment = new FeedFragment();
+                    transaction.add(R.id.main_container, feedFragment);
+                } else {
+                    transaction.show(feedFragment);
+                }
+                break;
+            }
+        }
+        transaction.commitAllowingStateLoss();
+    }
+
+    private void hideFragment(FragmentTransaction transaction) {
+        if (chicksFragment != null) {
+            transaction.hide(chicksFragment);
+        }
+
+        if (grossChickenFragment != null) {
+            transaction.hide(grossChickenFragment);
+        }
+        if (feedFragment != null) {
+            transaction.hide(feedFragment);
+        }
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java
new file mode 100644
index 0000000..9ae5c7a
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java
@@ -0,0 +1,30 @@
+package com.qhclh.ytzh.work.carsmannage;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.base.BaseFragment;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class ChicksFragment extends BaseFragment{
+    @Override
+    protected int setLayout() {
+        return R.layout.fragment_chicks;
+    }
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initOper() {
+
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FeedFragment.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FeedFragment.java
new file mode 100644
index 0000000..fcfc4f8
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FeedFragment.java
@@ -0,0 +1,30 @@
+package com.qhclh.ytzh.work.carsmannage;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.base.BaseFragment;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class FeedFragment extends BaseFragment {
+    @Override
+    protected int setLayout() {
+        return R.layout.fragment_feed;
+    }
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initOper() {
+
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java
new file mode 100644
index 0000000..883af58
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java
@@ -0,0 +1,30 @@
+package com.qhclh.ytzh.work.carsmannage;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.base.BaseFragment;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class GrossChickenFragment extends BaseFragment {
+    @Override
+    protected int setLayout() {
+        return R.layout.fragment_grosschicken;
+    }
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initOper() {
+
+    }
+}
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..995fafc
--- /dev/null
+++ b/app/src/main/res/layout/act_carsmanage.xml
@@ -0,0 +1,59 @@
+<?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"></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_20"
+            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_20"
+            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_20"
+            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/fragment_chicks.xml b/app/src/main/res/layout/fragment_chicks.xml
new file mode 100644
index 0000000..83c7804
--- /dev/null
+++ b/app/src/main/res/layout/fragment_chicks.xml
@@ -0,0 +1,11 @@
+<?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/Chicks"
+        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_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..65ad196
--- /dev/null
+++ b/app/src/main/res/layout/fragment_grosschicken.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/GrossChicken"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</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 6942b84..44571be 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,4 +28,7 @@
     <string name="endtime">到达时间:</string>
     <string name="permission_camera">请给予应用打开摄像头权限</string>
     <string name="permission_phonestate">请给予应用获取手机状态权限</string>
+    <string name="Chicks">鸡苗</string>
+    <string name="GrossChicken">毛鸡</string>
+    <string name="feed">饲料</string>
 </resources>

From febbcc83daeff277ce667e084c60d03897c56a6d Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 30 Nov 2017 11:15:54 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=99=BD=E8=89=B2toolbar?=
 =?UTF-8?q?=20=20=E5=8A=A0=E5=85=A5menu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ytzh/work/carsmannage/BaseActivity1.java  | 98 +++++++++++++++++++
 .../work/carsmannage/CarsManageActivity.java  | 23 ++++-
 .../ytzh/work/scan/ScanResultActivity.java    |  1 +
 app/src/main/res/layout/act_carsmanage.xml    |  3 +-
 .../res/layout/include_tool_bar_white.xml     | 17 ++++
 app/src/main/res/menu/screen.xml              |  9 ++
 app/src/main/res/values/styles.xml            |  7 ++
 7 files changed, 154 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/qhclh/ytzh/work/carsmannage/BaseActivity1.java
 create mode 100644 app/src/main/res/layout/include_tool_bar_white.xml
 create mode 100644 app/src/main/res/menu/screen.xml

diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/BaseActivity1.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/BaseActivity1.java
new file mode 100644
index 0000000..b3cb932
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/BaseActivity1.java
@@ -0,0 +1,98 @@
+package com.qhclh.ytzh.work.carsmannage;
+
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.utils.ActivityCollector;
+import com.umeng.analytics.MobclickAgent;
+
+import butterknife.ButterKnife;
+
+
+/**
+ * Created by 青花瓷 on 2017/7/19.
+ */
+
+public abstract class BaseActivity1 extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(setLayoutId());
+        ButterKnife.bind(this);
+        ActivityCollector.addActivity(this);
+        initView();
+        initData();
+        initOper();
+    }
+
+    protected abstract int setLayoutId();
+    protected abstract void initView();
+    protected abstract void initData();
+    protected abstract void initOper();
+    ///< toolbar设置
+    public void initToolbar(Toolbar toolbar, String title, View.OnClickListener listener) {
+        if (toolbar == null) {
+            return;
+        }
+        TextView tvTitle = findById(toolbar, R.id.tv_toolbar_title1);
+        if (tvTitle != null) {
+            tvTitle.setText(title == null ? "" : title);
+        }
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayShowTitleEnabled(false);
+        }
+        if (listener != null) {
+            toolbar.setNavigationIcon(R.drawable.fanhui1_3x);
+            toolbar.setNavigationOnClickListener(listener);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        try {
+            MobclickAgent.onResume(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        try {
+            MobclickAgent.onPause(this);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        ActivityCollector.removeActivity(this);
+    }
+
+    public void finishAll(){ActivityCollector.finishAll();}
+
+    public void showToast(String str) {
+        Toast.makeText(this, str, Toast.LENGTH_SHORT).show();
+    }
+
+    protected <T extends View> T findById(@NonNull View view, @IdRes int resId) {
+        return ButterKnife.findById(view, resId);
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java
index 41ace4f..cd7d899 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java
@@ -2,11 +2,12 @@ package com.qhclh.ytzh.work.carsmannage;
 
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
 import com.qhclh.ytzh.R;
-import com.qhclh.ytzh.base.BaseActivity;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -15,8 +16,8 @@ import butterknife.OnClick;
  * Created by 青花瓷 on 2017/11/30.
  */
 
-public class CarsManageActivity extends BaseActivity {
-    @BindView(R.id.toolbar)
+public class CarsManageActivity extends BaseActivity1 {
+    @BindView(R.id.toolbar1)
     Toolbar mToolbar;
     @BindView(R.id.chicks)
     TextView chicks;
@@ -176,4 +177,20 @@ public class CarsManageActivity extends BaseActivity {
             transaction.hide(feedFragment);
         }
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.screen, menu);
+        menu.findItem(R.id.screenr).setVisible(true);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.screenr:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
index d4af373..017c766 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanResultActivity.java
@@ -114,6 +114,7 @@ public class ScanResultActivity extends BaseActivity {
         IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
         if (result != null) {
             if (result.getContents() == null) {
+                showToast("取消扫描");
                 finish();
             } else {
                 scanStr = result.getContents();
diff --git a/app/src/main/res/layout/act_carsmanage.xml b/app/src/main/res/layout/act_carsmanage.xml
index 995fafc..b11aa62 100644
--- a/app/src/main/res/layout/act_carsmanage.xml
+++ b/app/src/main/res/layout/act_carsmanage.xml
@@ -4,7 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/include_tool_bar"></include>
+    <include layout="@layout/include_tool_bar_white"></include>
+    <include layout="@layout/include_line"></include>
 
     <LinearLayout
         android:layout_width="match_parent"
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/menu/screen.xml b/app/src/main/res/menu/screen.xml
new file mode 100644
index 0000000..f57a122
--- /dev/null
+++ b/app/src/main/res/menu/screen.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/screenr"
+        android:title="screen"
+        android:icon="@drawable/shaixuan_3x"
+        android:orderInCategory="70"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 553594a..d856177 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>

From e3fcadfb2fe1285bde404d77e605fd8668821123 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 30 Nov 2017 11:28:57 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qhclh/ytzh/ui/CalendarDialogFragment.java | 71 +++++++++++++++++++
 .../com/qhclh/ytzh/utils/DateTimeUtil.java    | 58 +++++++++++++++
 .../work/carsmannage/CarsManageActivity.java  | 17 ++++-
 app/src/main/res/layout/act_carsmanage.xml    |  6 +-
 .../main/res/layout/calendar_dialog_basic.xml | 25 +++++++
 5 files changed, 173 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/qhclh/ytzh/ui/CalendarDialogFragment.java
 create mode 100644 app/src/main/res/layout/calendar_dialog_basic.xml

diff --git a/app/src/main/java/com/qhclh/ytzh/ui/CalendarDialogFragment.java b/app/src/main/java/com/qhclh/ytzh/ui/CalendarDialogFragment.java
new file mode 100644
index 0000000..91b7a6b
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/ui/CalendarDialogFragment.java
@@ -0,0 +1,71 @@
+package com.qhclh.ytzh.ui;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+
+import com.prolificinteractive.materialcalendarview.CalendarDay;
+import com.prolificinteractive.materialcalendarview.MaterialCalendarView;
+import com.prolificinteractive.materialcalendarview.OnDateSelectedListener;
+import com.qhclh.ytzh.R;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Created by luanhui on 2016/7/5.
+ */
+public class CalendarDialogFragment extends DialogFragment implements OnDateSelectedListener {
+
+//    private TextView textView;
+    private static final DateFormat FORMATTER = SimpleDateFormat.getDateInstance();
+
+
+    public interface CalendarClickListener
+    {
+        void onStartCalendarClick(Date date);
+        void onEndCalendarClick(Date date);
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        //去掉标题
+        getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
+        return inflater.inflate(R.layout.calendar_dialog_basic, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+//        textView = (TextView) view.findViewById(R.id.textView);
+
+        MaterialCalendarView widget = (MaterialCalendarView) view.findViewById(R.id.calendarView);
+
+        widget.setOnDateChangedListener(this);
+    }
+
+    @Override
+    public void onDateSelected(@NonNull MaterialCalendarView widget, @NonNull CalendarDay date, boolean selected) {
+//        textView.setText(FORMATTER.format(date.getDate()));
+
+        CalendarClickListener listener = (CalendarClickListener) getActivity();
+        String tag=this.getTag();
+        if(tag.equals("end"))
+        {
+            listener.onEndCalendarClick(date.getDate());
+        }
+        else{
+            listener.onStartCalendarClick(date.getDate());
+        }
+
+        this.dismiss();
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java b/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java
index c5cf18e..9a78e61 100644
--- a/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java
+++ b/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java
@@ -69,4 +69,62 @@ public final class DateTimeUtil {
         return SafeParseDate(FormatDate(time));
     }
 
+
+    public static String getYMD()
+    {
+        SimpleDateFormat formatter    =   new    SimpleDateFormat    ("yyyy年MM月dd日");
+        Date curDate    =   new    Date(System.currentTimeMillis());//获取当前时间
+        String    str    =    formatter.format(curDate);
+        return str;
+    }
+    public static String getYMD(Date string)
+    {
+        SimpleDateFormat formatter    =   new    SimpleDateFormat    ("yyyy-MM-dd");
+        String    str    =    formatter.format(string);
+        return str;
+    }
+
+    public static String getYMD2(Date string)
+    {
+        SimpleDateFormat formatter    =   new    SimpleDateFormat    ("yyyy/MM/dd");
+        String    str    =    formatter.format(string);
+        return str;
+    }
+    public static String getYMD3(Date string)
+    {
+        SimpleDateFormat formatter    =   new    SimpleDateFormat    ("MM月dd日");
+        String    str    =    formatter.format(string);
+        return str;
+    }
+
+    public static String getYMDHMS()
+    {
+        SimpleDateFormat formatter    =   new    SimpleDateFormat    ("yyyy年MM月dd日 HH:mm:ss");
+        Date curDate    =   new    Date(System.currentTimeMillis());//获取当前时间
+        String    str    =    formatter.format(curDate);
+        return str;
+    }
+
+    public static String getStrYMD(String str)
+    {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        Date date= null;
+        try {
+            date = df.parse(str.trim());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd");
+        String stra = formatter.format(date);
+        return stra;
+    }
+
+    public static long getDays(Date d1,Date d2)
+    {
+        long diff = d1.getTime() - d2.getTime();//这样得到的差值是微秒级别
+        long days = diff / (1000 * 60 * 60 * 24);
+        return days;
+    }
+
 }
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java
index cd7d899..76976cb 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java
@@ -8,6 +8,10 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.ui.CalendarDialogFragment;
+import com.qhclh.ytzh.utils.DateTimeUtil;
+
+import java.util.Date;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -16,7 +20,7 @@ import butterknife.OnClick;
  * Created by 青花瓷 on 2017/11/30.
  */
 
-public class CarsManageActivity extends BaseActivity1 {
+public class CarsManageActivity extends BaseActivity1 implements CalendarDialogFragment.CalendarClickListener{
     @BindView(R.id.toolbar1)
     Toolbar mToolbar;
     @BindView(R.id.chicks)
@@ -189,8 +193,19 @@ public class CarsManageActivity extends BaseActivity1 {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.screenr:
+                new CalendarDialogFragment().show(getSupportFragmentManager(), "start");
                 break;
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onStartCalendarClick(Date date) {
+        showToast(DateTimeUtil.FormatDate(date));
+    }
+
+    @Override
+    public void onEndCalendarClick(Date date) {
+        showToast(DateTimeUtil.FormatDate(date));
+    }
 }
diff --git a/app/src/main/res/layout/act_carsmanage.xml b/app/src/main/res/layout/act_carsmanage.xml
index b11aa62..88929fe 100644
--- a/app/src/main/res/layout/act_carsmanage.xml
+++ b/app/src/main/res/layout/act_carsmanage.xml
@@ -21,7 +21,7 @@
             android:padding="@dimen/dp_12"
             android:text="@string/Chicks"
             android:textColor="@color/grey666666"
-            android:textSize="@dimen/text_size_20"
+            android:textSize="@dimen/text_size_18"
             android:textStyle="bold" />
 
         <TextView
@@ -33,7 +33,7 @@
             android:padding="@dimen/dp_12"
             android:text="@string/GrossChicken"
             android:textColor="@color/grey666666"
-            android:textSize="@dimen/text_size_20"
+            android:textSize="@dimen/text_size_18"
             android:textStyle="bold" />
 
         <TextView
@@ -45,7 +45,7 @@
             android:padding="@dimen/dp_12"
             android:text="@string/feed"
             android:textColor="@color/grey666666"
-            android:textSize="@dimen/text_size_20"
+            android:textSize="@dimen/text_size_18"
             android:textStyle="bold" />
 
 
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

From 5e7c4c0449fb8652fd88433b0a5748668ed865f0 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 30 Nov 2017 14:01:51 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=AF=A6=E7=BB=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   8 +-
 .../java/com/qhclh/ytzh/bean/WarningBean.java |  62 ++++++++++++++
 .../com/qhclh/ytzh/index/IndexFragment.java   |   4 +-
 .../planorder/ChickenDriverBillActivity.java  |   2 +-
 .../ytzh/index/planorder/WarningActivity.java |  58 +++++++++++++
 .../ytzh/index/planorder/WarningAdapter.java  |  81 ++++++++++++++++++
 app/src/main/res/drawable-xhdpi/qipao.png     | Bin 0 -> 3050 bytes
 app/src/main/res/layout/act_warning.xml       |  19 ++++
 app/src/main/res/layout/item_warning.xml      |  43 ++++++++++
 9 files changed, 273 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/com/qhclh/ytzh/bean/WarningBean.java
 create mode 100644 app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java
 create mode 100644 app/src/main/java/com/qhclh/ytzh/index/planorder/WarningAdapter.java
 create mode 100644 app/src/main/res/drawable-xhdpi/qipao.png
 create mode 100644 app/src/main/res/layout/act_warning.xml
 create mode 100644 app/src/main/res/layout/item_warning.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9f00190..e957330 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,14 +44,18 @@
         <activity
             android:name=".work.scan.ScanResultActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".work.carsmannage.CarsManageActivity"
-            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".work.carsmannage.CarsManageActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".index.planorder.CarsActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".index.planorder.ChickenDriverBillActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".index.planorder.WarningActivity"
+            android:screenOrientation="portrait" />
 
 
         <!-- 设置竖屏扫码 -->
diff --git a/app/src/main/java/com/qhclh/ytzh/bean/WarningBean.java b/app/src/main/java/com/qhclh/ytzh/bean/WarningBean.java
new file mode 100644
index 0000000..a67b435
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/bean/WarningBean.java
@@ -0,0 +1,62 @@
+package com.qhclh.ytzh.bean;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class WarningBean {
+    private int id;
+    private String url;
+    private String content;
+    private String time;
+
+    public WarningBean(int id, String url, String content, String time) {
+        this.id = id;
+        this.url = url;
+        this.content = content;
+        this.time = time;
+    }
+
+    @Override
+    public String toString() {
+        return "WarningBean{" +
+                "id=" + id +
+                ", url='" + url + '\'' +
+                ", content='" + content + '\'' +
+                ", time='" + time + '\'' +
+                '}';
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java b/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java
index 6ec5567..d5a9aea 100644
--- a/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java
@@ -9,6 +9,7 @@ import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseFragment;
 import com.qhclh.ytzh.bean.NewsBean;
 import com.qhclh.ytzh.index.planorder.OrderActivity;
+import com.qhclh.ytzh.index.planorder.WarningActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +47,8 @@ public class IndexFragment extends BaseFragment {
         lv_index.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                startActivity(new Intent(getActivity(), OrderActivity.class));
+//                startActivity(new Intent(getActivity(), OrderActivity.class));
+                startActivity(new Intent(getActivity(), WarningActivity.class));
             }
         });
     }
diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/ChickenDriverBillActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/ChickenDriverBillActivity.java
index 323b923..b6d3a9d 100644
--- a/app/src/main/java/com/qhclh/ytzh/index/planorder/ChickenDriverBillActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/ChickenDriverBillActivity.java
@@ -34,7 +34,7 @@ public class ChickenDriverBillActivity extends BaseActivity {
 
     @Override
     protected void initView() {
-        initToolbar(mToolbar, "雏鸡司机单", new View.OnClickListener() {
+        initToolbar(mToolbar, "雏苗司机单", new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 finish();
diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java
new file mode 100644
index 0000000..b81f03d
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java
@@ -0,0 +1,58 @@
+package com.qhclh.ytzh.index.planorder;
+
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.ListView;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.base.BaseActivity;
+import com.qhclh.ytzh.bean.WarningBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class WarningActivity extends BaseActivity{
+    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+    @BindView(R.id.lv_warning)
+    ListView lv_warning;
+
+    private List<WarningBean> warningBeanList;
+    private WarningAdapter warningAdapter;
+    @Override
+    protected int setLayoutId() {
+        return R.layout.act_warning;
+    }
+
+    @Override
+    protected void initView() {
+        initToolbar(mToolbar, "预警详情页", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected void initData() {
+        warningBeanList = new ArrayList<>();
+        for (int i=0;i<8;i++){
+            warningBeanList.add(new WarningBean(i,"https://www.baidu.com/img/bd_logo1.png","asagggggggggggwwwwwwwwwwwwwaa"+i,"adf"));
+        }
+
+        warningAdapter = new WarningAdapter(this,warningBeanList);
+        lv_warning.setAdapter(warningAdapter);
+    }
+
+    @Override
+    protected void initOper() {
+
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningAdapter.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningAdapter.java
new file mode 100644
index 0000000..79347d8
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningAdapter.java
@@ -0,0 +1,81 @@
+package com.qhclh.ytzh.index.planorder;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.bean.WarningBean;
+
+import java.util.List;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class WarningAdapter extends BaseAdapter {
+    private Context context;
+    private List<WarningBean> list;
+    private LayoutInflater layoutInflater;
+
+    public WarningAdapter(Context context, List<WarningBean> list) {
+        this.context = context;
+        this.list = list;
+        layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return list.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return list.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return list.get(i).getId();
+    }
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        ViewHolder viewHolder;
+        WarningBean message = list.get(i);
+        if (view == null){
+            view = layoutInflater.inflate(R.layout.item_warning,viewGroup,false);
+            viewHolder = new ViewHolder();
+            viewHolder.warning_pic = view.findViewById(R.id.warning_pic);
+            viewHolder.warning_time = view.findViewById(R.id.warning_time);
+            viewHolder.warning_content = view.findViewById(R.id.warning_content);
+
+            view.setTag(viewHolder);
+        }else {
+            viewHolder = (ViewHolder) view.getTag();
+        }
+
+        Glide.with(context)
+                .load(message.getUrl())
+                .error(R.mipmap.ic_launcher_round)
+                .placeholder(R.mipmap.ic_launcher_round)
+                .into(viewHolder.warning_pic);
+
+        viewHolder.warning_time.setText(message.getTime());
+        viewHolder.warning_content.setText(message.getContent());
+
+        return view;
+    }
+
+    private class ViewHolder{
+        private ImageView warning_pic;
+
+        private TextView warning_time;
+        private TextView warning_content;
+    }
+}
diff --git a/app/src/main/res/drawable-xhdpi/qipao.png b/app/src/main/res/drawable-xhdpi/qipao.png
new file mode 100644
index 0000000000000000000000000000000000000000..497a780eb56ba609e32bd7887362c04aeb628a97
GIT binary patch
literal 3050
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
IP?}x(Z(bC5qyPW_

literal 0
HcmV?d00001

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/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

From 14f29820cab4eace410b506c0c8ba9fdadaf1f1a Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 30 Nov 2017 14:16:33 +0800
Subject: [PATCH 7/9] no message

---
 .../com/qhclh/ytzh/index/IndexFragment.java   |  7 +++++--
 .../ytzh/work/carsmannage/ChicksFragment.java | 20 ++++++++++++++++--
 .../carsmannage/GrossChickenFragment.java     | 21 +++++++++++++++++--
 app/src/main/res/layout/fragment_chicks.xml   | 11 ++++++----
 .../main/res/layout/fragment_grosschicken.xml | 14 ++++++++-----
 5 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java b/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java
index d5a9aea..e5f35fe 100644
--- a/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java
@@ -47,8 +47,11 @@ public class IndexFragment extends BaseFragment {
         lv_index.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-//                startActivity(new Intent(getActivity(), OrderActivity.class));
-                startActivity(new Intent(getActivity(), WarningActivity.class));
+                if (l%2==0) {
+                    startActivity(new Intent(getActivity(), OrderActivity.class));
+                }else {
+                    startActivity(new Intent(getActivity(), WarningActivity.class));
+                }
             }
         });
     }
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java
index 9ae5c7a..0d15a6a 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/ChicksFragment.java
@@ -1,13 +1,23 @@
 package com.qhclh.ytzh.work.carsmannage;
 
+import android.widget.ListView;
+
 import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseFragment;
+import com.qhclh.ytzh.bean.ScanBean;
+import com.qhclh.ytzh.work.scan.ScanAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by 青花瓷 on 2017/11/30.
  */
 
 public class ChicksFragment extends BaseFragment{
+    private ListView lv_infos_chicks;
+    private List<ScanBean> scanBeanList;
+    private ScanAdapter scanAdapter;
     @Override
     protected int setLayout() {
         return R.layout.fragment_chicks;
@@ -15,12 +25,18 @@ public class ChicksFragment extends BaseFragment{
 
     @Override
     protected void initView() {
-
+        lv_infos_chicks = getActivity().findViewById(R.id.lv_infos_chicks);
     }
 
     @Override
     protected void initData() {
-
+        scanBeanList = new ArrayList<>();
+        for (int i=0;i<4;i++){
+            scanBeanList.add(new ScanBean(i,"车牌号"+i,"司机"+i,"联系方式"+i,"批次"+i,"厂址"+i,
+                    "时间"+i,"数量"+i,"免疫"+i,"均匀度"+i,"起始时间"+i,"到达时间"+i));
+        }
+        scanAdapter = new ScanAdapter(getActivity(),scanBeanList);
+        lv_infos_chicks.setAdapter(scanAdapter);
     }
 
     @Override
diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java
index 883af58..12b326f 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/GrossChickenFragment.java
@@ -1,13 +1,24 @@
 package com.qhclh.ytzh.work.carsmannage;
 
+import android.widget.ListView;
+
 import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseFragment;
+import com.qhclh.ytzh.bean.ScanBean;
+import com.qhclh.ytzh.work.scan.ScanAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by 青花瓷 on 2017/11/30.
  */
 
 public class GrossChickenFragment extends BaseFragment {
+    private ListView lv_infos_grosschicken;
+
+    private List<ScanBean> scanBeanList;
+    private ScanAdapter scanAdapter;
     @Override
     protected int setLayout() {
         return R.layout.fragment_grosschicken;
@@ -15,12 +26,18 @@ public class GrossChickenFragment extends BaseFragment {
 
     @Override
     protected void initView() {
-
+        lv_infos_grosschicken = getActivity().findViewById(R.id.lv_infos_grosschicken);
     }
 
     @Override
     protected void initData() {
-
+        scanBeanList = new ArrayList<>();
+        for (int i=0;i<4;i++){
+            scanBeanList.add(new ScanBean(i,"车牌号1"+i,"司机1"+i,"联系方式1"+i,"批次1"+i,"厂址1"+i,
+                    "时间1"+i,"数量1"+i,"免疫1"+i,"均匀度1"+i,"起始时间1"+i,"到达时间1"+i));
+        }
+        scanAdapter = new ScanAdapter(getActivity(),scanBeanList);
+        lv_infos_grosschicken.setAdapter(scanAdapter);
     }
 
     @Override
diff --git a/app/src/main/res/layout/fragment_chicks.xml b/app/src/main/res/layout/fragment_chicks.xml
index 83c7804..03669bb 100644
--- a/app/src/main/res/layout/fragment_chicks.xml
+++ b/app/src/main/res/layout/fragment_chicks.xml
@@ -1,11 +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">
-    <TextView
-        android:text="@string/Chicks"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    <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_grosschicken.xml b/app/src/main/res/layout/fragment_grosschicken.xml
index 65ad196..166cabd 100644
--- a/app/src/main/res/layout/fragment_grosschicken.xml
+++ b/app/src/main/res/layout/fragment_grosschicken.xml
@@ -1,10 +1,14 @@
 <?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:orientation="vertical"
+    android:background="@color/greyf4f4f4"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <TextView
-        android:text="@string/GrossChicken"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    <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

From b1368379a6832ac15e5aa7a5dc75b4a5aef820cd Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 30 Nov 2017 15:02:18 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=A7=8D=E7=A6=BD=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=20=EF=BC=8C=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   7 ++
 .../com/qhclh/ytzh/work/WorkFragment.java     |  10 ++-
 .../breedpoultry/DatanalysisActivity.java     |  63 ++++++++++++++++++
 .../breedpoultry/DatanalysisSActivity.java    |  42 ++++++++++++
 app/src/main/res/drawable-xhdpi/rouqin_3x.png | Bin 0 -> 4205 bytes
 app/src/main/res/layout/act_datanaly_s.xml    |   7 ++
 app/src/main/res/layout/act_datanalysis.xml   |   8 +++
 app/src/main/res/layout/fragment_work.xml     |  13 ++--
 app/src/main/res/menu/datanalysismenu.xml     |   9 +++
 app/src/main/res/values/strings.xml           |   1 +
 10 files changed, 153 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java
 create mode 100644 app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java
 create mode 100644 app/src/main/res/drawable-xhdpi/rouqin_3x.png
 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/menu/datanalysismenu.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e957330..ca16812 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,6 +57,13 @@
             android:name=".index.planorder.WarningActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".work.breedpoultry.DatanalysisActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".work.breedpoultry.DatanalysisSActivity"
+            android:screenOrientation="portrait" />
+
 
         <!-- 设置竖屏扫码 -->
         <activity
diff --git a/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java
index c03d6ec..944c515 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java
@@ -7,6 +7,7 @@ import android.widget.LinearLayout;
 import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseFragment;
 import com.qhclh.ytzh.utils.GlideImageLoader;
+import com.qhclh.ytzh.work.breedpoultry.DatanalysisActivity;
 import com.qhclh.ytzh.work.carsmannage.CarsManageActivity;
 import com.qhclh.ytzh.work.scan.ScanResultActivity;
 import com.youth.banner.Banner;
@@ -25,7 +26,7 @@ import java.util.List;
 public class WorkFragment extends BaseFragment implements View.OnClickListener {
     private Banner banner;
     private List<String> list_path;
-    private LinearLayout work_breedingpoultry,work_carsmanager,work_scan;
+    private LinearLayout work_breedingpoultry,work_carsmanager,work_scan,work_tablepoultry;
     @Override
     protected int setLayout() {
         return R.layout.fragment_work;
@@ -37,6 +38,8 @@ public class WorkFragment extends BaseFragment implements View.OnClickListener {
         work_breedingpoultry = getActivity().findViewById(R.id.work_breedingpoultry);
         work_carsmanager = getActivity().findViewById(R.id.work_carsmanager);
         work_scan = getActivity().findViewById(R.id.work_scan);
+        work_tablepoultry = getActivity().findViewById(R.id.work_tablepoultry);
+        work_tablepoultry.setVisibility(View.INVISIBLE);
     }
 
     @Override
@@ -66,6 +69,7 @@ public class WorkFragment extends BaseFragment implements View.OnClickListener {
         work_breedingpoultry.setOnClickListener(this);
         work_carsmanager.setOnClickListener(this);
         work_scan.setOnClickListener(this);
+        work_tablepoultry.setOnClickListener(this);
     }
 
     @Override
@@ -88,11 +92,13 @@ public class WorkFragment extends BaseFragment implements View.OnClickListener {
     @Override
     public void onClick(View view) {
         if (view.equals(work_breedingpoultry)){
-            showToast("种禽");
+            startActivity(new Intent(getActivity(), DatanalysisActivity.class));
         }else if (view.equals(work_carsmanager)){
             startActivity(new Intent(getActivity(), CarsManageActivity.class));
         }else if (view.equals(work_scan)){
             startActivity(new Intent(getActivity(), ScanResultActivity.class));
+        }else if (view.equals(work_tablepoultry)){
+            showToast("敬请期待！");
         }
     }
 
diff --git a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java
new file mode 100644
index 0000000..e356f1a
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java
@@ -0,0 +1,63 @@
+package com.qhclh.ytzh.work.breedpoultry;
+
+import android.content.Intent;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.base.BaseActivity;
+
+import butterknife.BindView;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+///< 数据分析
+public class DatanalysisActivity extends BaseActivity {
+    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+    @Override
+    protected int setLayoutId() {
+        return R.layout.act_datanalysis;
+    }
+
+    @Override
+    protected void initView() {
+        initToolbar(mToolbar, "数据分析", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initOper() {
+
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.datanalysismenu, menu);
+        menu.findItem(R.id.datanalysis_menu).setVisible(true);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.datanalysis_menu:
+                startActivity(new Intent(this,DatanalysisSActivity.class));
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java
new file mode 100644
index 0000000..510c14c
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java
@@ -0,0 +1,42 @@
+package com.qhclh.ytzh.work.breedpoultry;
+
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.base.BaseActivity;
+
+import butterknife.BindView;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+///< 筛选
+public class DatanalysisSActivity extends BaseActivity {
+    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+    @Override
+    protected int setLayoutId() {
+        return R.layout.act_datanaly_s;
+    }
+
+    @Override
+    protected void initView() {
+        initToolbar(mToolbar, "筛选", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initOper() {
+
+    }
+}
diff --git a/app/src/main/res/drawable-xhdpi/rouqin_3x.png b/app/src/main/res/drawable-xhdpi/rouqin_3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..da16e4e70c9d6e7e8447e8ac4e0abf5b0840f64f
GIT binary patch
literal 4205
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

literal 0
HcmV?d00001

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..150a42a
--- /dev/null
+++ b/app/src/main/res/layout/act_datanaly_s.xml
@@ -0,0 +1,7 @@
+<?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_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/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/menu/datanalysismenu.xml b/app/src/main/res/menu/datanalysismenu.xml
new file mode 100644
index 0000000..a38282b
--- /dev/null
+++ b/app/src/main/res/menu/datanalysismenu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/datanalysis_menu"
+        android:title="datanalysis"
+        android:icon="@drawable/shuju_3x"
+        android:orderInCategory="70"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 44571be..f89756d 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>

From 4677a49e54b7d2862e7a2970f345fbabb227f2f1 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 30 Nov 2017 16:54:14 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=AD=9B=E9=80=89=E7=95=8C=E9=9D=A2=20?=
 =?UTF-8?q?=E5=8E=82=E7=9A=84=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/qhclh/ytzh/bean/FactryBean.java  | 55 +++++++++++
 .../java/com/qhclh/ytzh/ui/MyGridView.java    | 30 ++++++
 .../breedpoultry/DatanalysisSActivity.java    | 22 ++++-
 .../ytzh/work/breedpoultry/FactryAdapter.java | 92 +++++++++++++++++++
 app/src/main/res/drawable/btn_check.xml       |  7 ++
 app/src/main/res/drawable/shape_select.xml    | 17 ++++
 app/src/main/res/layout/act_datanaly_s.xml    | 33 ++++++-
 app/src/main/res/layout/item_factry.xml       | 18 ++++
 8 files changed, 271 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/qhclh/ytzh/bean/FactryBean.java
 create mode 100644 app/src/main/java/com/qhclh/ytzh/ui/MyGridView.java
 create mode 100644 app/src/main/java/com/qhclh/ytzh/work/breedpoultry/FactryAdapter.java
 create mode 100644 app/src/main/res/drawable/btn_check.xml
 create mode 100644 app/src/main/res/drawable/shape_select.xml
 create mode 100644 app/src/main/res/layout/item_factry.xml

diff --git a/app/src/main/java/com/qhclh/ytzh/bean/FactryBean.java b/app/src/main/java/com/qhclh/ytzh/bean/FactryBean.java
new file mode 100644
index 0000000..1b1d75d
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/bean/FactryBean.java
@@ -0,0 +1,55 @@
+package com.qhclh.ytzh.bean;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class FactryBean {
+    private int id;
+    private String name;
+    private boolean isCheck;
+
+    public FactryBean(int id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public FactryBean(int id, String name, boolean isCheck) {
+        this.id = id;
+        this.name = name;
+        this.isCheck = isCheck;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isCheck() {
+        return isCheck;
+    }
+
+    public void setCheck(boolean check) {
+        isCheck = check;
+    }
+
+    @Override
+    public String toString() {
+        return "FactryBean{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", isCheck=" + isCheck +
+                '}';
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/ui/MyGridView.java b/app/src/main/java/com/qhclh/ytzh/ui/MyGridView.java
new file mode 100644
index 0000000..a80af03
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/ui/MyGridView.java
@@ -0,0 +1,30 @@
+package com.qhclh.ytzh.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.GridView;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class MyGridView extends GridView {
+    public MyGridView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public MyGridView(Context context) {
+        super(context);
+    }
+
+    public MyGridView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int expandSpec = MeasureSpec.makeMeasureSpec(
+                Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
+        super.onMeasure(widthMeasureSpec, expandSpec);
+    }
+}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java
index 510c14c..a24a8fb 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java
@@ -2,9 +2,14 @@ package com.qhclh.ytzh.work.breedpoultry;
 
 import android.support.v7.widget.Toolbar;
 import android.view.View;
+import android.widget.GridView;
 
 import com.qhclh.ytzh.R;
 import com.qhclh.ytzh.base.BaseActivity;
+import com.qhclh.ytzh.bean.FactryBean;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import butterknife.BindView;
 
@@ -15,6 +20,12 @@ import butterknife.BindView;
 public class DatanalysisSActivity extends BaseActivity {
     @BindView(R.id.toolbar)
     Toolbar mToolbar;
+    @BindView(R.id.gv_dataanaly)
+    GridView gv_dataanaly;
+    private List<FactryBean> factryBeanList;
+    private FactryAdapter factryAdapter;
+
+    private List<Boolean> factryCheck;
     @Override
     protected int setLayoutId() {
         return R.layout.act_datanaly_s;
@@ -32,7 +43,16 @@ public class DatanalysisSActivity extends BaseActivity {
 
     @Override
     protected void initData() {
-
+        factryBeanList = new ArrayList<>();
+        factryCheck = new ArrayList<>();
+        for (int i=0;i<10;i++){
+            factryBeanList.add(new FactryBean(i,"adf"+i));
+        }
+        for (int i=0;i<factryBeanList.size();i++){
+            factryCheck.add(factryBeanList.get(i).isCheck());
+        }
+        factryAdapter = new FactryAdapter(this,factryBeanList,factryCheck);
+        gv_dataanaly.setAdapter(factryAdapter);
     }
 
     @Override
diff --git a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/FactryAdapter.java b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/FactryAdapter.java
new file mode 100644
index 0000000..f75ff3f
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/FactryAdapter.java
@@ -0,0 +1,92 @@
+package com.qhclh.ytzh.work.breedpoultry;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.bean.FactryBean;
+
+import java.util.List;
+
+/**
+ * Created by 青花瓷 on 2017/11/30.
+ */
+
+public class FactryAdapter extends BaseAdapter {
+
+    private Context context;
+    private List<FactryBean> list;
+    private LayoutInflater layoutInflater;
+    private List<Boolean> isCheck;
+
+    public FactryAdapter(Context context, List<FactryBean> list, List<Boolean> isCheck) {
+        this.context = context;
+        this.list = list;
+        this.isCheck = isCheck;
+        layoutInflater = LayoutInflater.from(context);
+    }
+
+    public FactryAdapter(Context context, List<FactryBean> list) {
+        this.context = context;
+        this.list = list;
+        layoutInflater = LayoutInflater.from(context);
+    }
+
+    @Override
+    public int getCount() {
+        return list.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return list.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return list.get(i).getId();
+    }
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        FactryBean message = list.get(i);
+        final ViewHolder viewHolder;
+        if (view == null){
+            viewHolder = new ViewHolder();
+            view = layoutInflater.inflate(R.layout.item_factry,viewGroup,false);
+            viewHolder.factry_name = view.findViewById(R.id.factry_name);
+
+            view.setTag(viewHolder);
+
+        }else {
+            viewHolder = (ViewHolder) view.getTag();
+        }
+        viewHolder.factry_name.setTag(i);
+        viewHolder.factry_name.setChecked(isCheck.get(i));
+        viewHolder.factry_name.setText(message.getName());
+        viewHolder.factry_name.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                int pos = (int) compoundButton.getTag();
+                isCheck.set(pos, b);
+                list.get(pos).setCheck(b);
+                if (b){
+                    viewHolder.factry_name.setTextColor(context.getResources().getColor(R.color.green029737));
+                }else {
+                    viewHolder.factry_name.setTextColor(context.getResources().getColor(R.color.black303030));
+                }
+            }
+        });
+
+        return view;
+    }
+
+    private class ViewHolder {
+        public CheckBox factry_name;
+    }
+}
diff --git a/app/src/main/res/drawable/btn_check.xml b/app/src/main/res/drawable/btn_check.xml
new file mode 100644
index 0000000..fa68b4b
--- /dev/null
+++ b/app/src/main/res/drawable/btn_check.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_select" android:state_checked="true"></item>
+    <item android:drawable="@drawable/shape_select" android:state_selected="true"></item>
+    <item android:drawable="@drawable/shape_select" android:state_pressed="true"></item>
+    <item android:drawable="@drawable/shape_bg1"></item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_select.xml b/app/src/main/res/drawable/shape_select.xml
new file mode 100644
index 0000000..6ac01a0
--- /dev/null
+++ b/app/src/main/res/drawable/shape_select.xml
@@ -0,0 +1,17 @@
+<?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_1"
+        android:color="@color/green029737" />
+    <corners
+        android:bottomLeftRadius="@dimen/dp_3"
+        android:bottomRightRadius="@dimen/dp_3"
+        android:topLeftRadius="@dimen/dp_3"
+        android:topRightRadius="@dimen/dp_3" />
+    <size
+        android:width="@dimen/dp_20"
+        android:height="@dimen/dp_20" />
+</shape>
\ 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
index 150a42a..915ef90 100644
--- a/app/src/main/res/layout/act_datanaly_s.xml
+++ b/app/src/main/res/layout/act_datanaly_s.xml
@@ -1,7 +1,36 @@
 <?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_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/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