17:02

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,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));
+                if (l%2==0) {
+                    startActivity(new Intent(getActivity(), OrderActivity.class));
+                }else {
+                    startActivity(new Intent(getActivity(), WarningActivity.class));
+                }
             }
         });
     }

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();

app/src/main/java/com/qhclh/ytzh/me/MeFragment.java

@@ -20,19 +20,12 @@ public class MeFragment extends BaseFragment {
 
     @Override
     protected void initView() {
-        me_msg = getActivity().findViewById(R.id.me_msg);
-        me_set = getActivity().findViewById(R.id.me_set);
-        Drawable message_icon = getResources().getDrawable(R.drawable.message_icon);
-        Drawable setting_icon = getResources().getDrawable(R.drawable.setting_icon);
-        Drawable zhankai_3x = getResources().getDrawable(R.drawable.zhankai_3x);
-        message_icon.setBounds(0, 0, 40, 30);//第一0是距左边距离，第二0是距上边距离，40分别是长宽
-        setting_icon.setBounds(0, 0, 44, 40);//第一0是距左边距离，第二0是距上边距离，40分别是长宽
-        zhankai_3x.setBounds(0, 0, 20, 40);//第一0是距左边距离，第二0是距上边距离，40分别是长宽
-        me_msg.setCompoundDrawables(message_icon, null, zhankai_3x, null);//只放左边 右边
-        me_set.setCompoundDrawables(setting_icon, null, zhankai_3x, null);//只放左边 右边
+        drawView();
 
     }
 
+
+
     @Override
     protected void initData() {
 
@@ -42,4 +35,21 @@ public class MeFragment extends BaseFragment {
     protected void initOper() {
 
     }
+
+    /**
+     * 初始化布局对象
+     * 代码控制图片大小
+     */
+    private void drawView() {
+        me_msg = getActivity().findViewById(R.id.me_msg);
+        me_set = getActivity().findViewById(R.id.me_set);
+        Drawable message_icon = getResources().getDrawable(R.drawable.message_icon);
+        Drawable setting_icon = getResources().getDrawable(R.drawable.setting_icon);
+        Drawable zhankai_3x = getResources().getDrawable(R.drawable.zhankai_3x);
+        message_icon.setBounds(0, 0, 40, 30);//第一0是距左边距离，第二0是距上边距离，40分别是长宽
+        setting_icon.setBounds(0, 0, 44, 40);//第一0是距左边距离，第二0是距上边距离，40分别是长宽
+        zhankai_3x.setBounds(0, 0, 20, 40);//第一0是距左边距离，第二0是距上边距离，40分别是长宽
+        me_msg.setCompoundDrawables(message_icon, null, zhankai_3x, null);//只放左边 右边
+        me_set.setCompoundDrawables(setting_icon, null, zhankai_3x, null);//只放左边 右边
+    }
 }

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;
+    }
+
 }

app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java

@@ -7,6 +7,8 @@ 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;
 import com.youth.banner.BannerConfig;
@@ -24,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;
@@ -36,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
@@ -65,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
@@ -87,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)){
-            showToast("车辆管理");
+            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("敬请期待！");
         }
     }
 

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,27 @@ 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<>();
     }
 
     @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
@@ -88,9 +114,16 @@ 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();
+                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);