From 875f0cda99a4ac0a67037e3f513f46a773406da0 Mon Sep 17 00:00:00 2001 From: lh <1209405678@qq.com> Date: Sat, 2 Dec 2017 09:28:37 +0800 Subject: [PATCH] no message --- .../java/com/qhclh/ytzh/bean/CarsBean.java | 2 +- .../com/qhclh/ytzh/bean/ChickenDBean.java | 2 +- .../java/com/qhclh/ytzh/bean/FactryBean.java | 2 +- .../java/com/qhclh/ytzh/bean/NewsBean.java | 2 +- .../java/com/qhclh/ytzh/bean/ScanBean.java | 2 +- .../java/com/qhclh/ytzh/bean/WarningBean.java | 2 +- .../com/qhclh/ytzh/index/IndexFragment.java | 2 +- .../com/qhclh/ytzh/index/NewsAdapter.java | 2 +- .../ytzh/index/planorder/CarsActivity.java | 2 +- .../ytzh/index/planorder/CarsAdapter.java | 2 +- .../index/planorder/ChickenDBAdapter.java | 2 +- .../planorder/ChickenDriverBillActivity.java | 2 +- .../ytzh/index/planorder/OrderActivity.java | 2 +- .../ytzh/index/planorder/OrderOActivity.java | 2 +- .../ytzh/index/planorder/WarningActivity.java | 2 +- .../ytzh/index/planorder/WarningAdapter.java | 2 +- .../com/qhclh/ytzh/utils/DateTimeUtil.java | 51 +++++++++---------- .../com/qhclh/ytzh/work/WorkFragment.java | 2 +- .../breedpoultry/DatanalysisSActivity.java | 2 +- .../ytzh/work/breedpoultry/FactryAdapter.java | 2 +- .../work/carsmannage/CarsManageActivity.java | 2 +- .../ytzh/work/carsmannage/ChicksFragment.java | 2 +- .../ytzh/work/carsmannage/FeedFragment.java | 2 +- .../carsmannage/GrossChickenFragment.java | 2 +- .../com/qhclh/ytzh/work/scan/ScanAdapter.java | 2 +- .../ytzh/work/scan/ScanResultActivity.java | 2 +- 26 files changed, 49 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/com/qhclh/ytzh/bean/CarsBean.java b/app/src/main/java/com/qhclh/ytzh/bean/CarsBean.java index 2f6887d..209c109 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/CarsBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/CarsBean.java @@ -3,7 +3,7 @@ package com.qhclh.ytzh.bean; /** * Created by 青花瓷 on 2017/11/29. */ - +///< 派车老板看到的所有车辆 public class CarsBean { private int id; private String carsname; diff --git a/app/src/main/java/com/qhclh/ytzh/bean/ChickenDBean.java b/app/src/main/java/com/qhclh/ytzh/bean/ChickenDBean.java index 56a90e1..6d53552 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/ChickenDBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/ChickenDBean.java @@ -3,7 +3,7 @@ package com.qhclh.ytzh.bean; /** * Created by 青花瓷 on 2017/11/29. */ - +///< 雏苗司机单 public class ChickenDBean { private int id; private String carname; diff --git a/app/src/main/java/com/qhclh/ytzh/bean/FactryBean.java b/app/src/main/java/com/qhclh/ytzh/bean/FactryBean.java index 1b1d75d..66ba793 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/FactryBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/FactryBean.java @@ -3,7 +3,7 @@ package com.qhclh.ytzh.bean; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 筛选查看3项指标中的养殖场 public class FactryBean { private int id; private String name; diff --git a/app/src/main/java/com/qhclh/ytzh/bean/NewsBean.java b/app/src/main/java/com/qhclh/ytzh/bean/NewsBean.java index cf39540..21a1831 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/NewsBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/NewsBean.java @@ -3,7 +3,7 @@ package com.qhclh.ytzh.bean; /** * Created by 青花瓷 on 2017/11/28. */ - +///< 首页消息 public class NewsBean { private int id; private String url; diff --git a/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java b/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java index 898cec8..929b259 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/ScanBean.java @@ -3,7 +3,7 @@ package com.qhclh.ytzh.bean; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 扫一扫 毛鸡 鸡苗 public class ScanBean { private int id; private String infos_carname; diff --git a/app/src/main/java/com/qhclh/ytzh/bean/WarningBean.java b/app/src/main/java/com/qhclh/ytzh/bean/WarningBean.java index a67b435..16d7068 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/WarningBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/WarningBean.java @@ -3,7 +3,7 @@ package com.qhclh.ytzh.bean; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 预警详情页 public class WarningBean { private int id; private String url; 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 e5f35fe..86c6c48 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/index/IndexFragment.java @@ -17,7 +17,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/28. */ - +///< 首页消息 public class IndexFragment extends BaseFragment { private ListView lv_index; private NewsAdapter newsAdapter; diff --git a/app/src/main/java/com/qhclh/ytzh/index/NewsAdapter.java b/app/src/main/java/com/qhclh/ytzh/index/NewsAdapter.java index d254723..e641324 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/NewsAdapter.java +++ b/app/src/main/java/com/qhclh/ytzh/index/NewsAdapter.java @@ -17,7 +17,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/28. */ - +///< 首页消息 public class NewsAdapter extends BaseAdapter { private Context context; diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsActivity.java index 1952b67..52e9a8d 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsActivity.java @@ -20,7 +20,7 @@ import butterknife.BindView; /** * Created by 青花瓷 on 2017/11/29. */ - +///< 派车老板看到的所有车辆 public class CarsActivity extends BaseActivity { @BindView(R.id.toolbar) Toolbar mToolbar; diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsAdapter.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsAdapter.java index ee5442c..47f234e 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsAdapter.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/CarsAdapter.java @@ -16,7 +16,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/29. */ - +///< 派车老板看到的所有车辆 public class CarsAdapter extends BaseAdapter { private Context context; private List carsBeen; diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/ChickenDBAdapter.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/ChickenDBAdapter.java index 18cff43..8263bcd 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/ChickenDBAdapter.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/ChickenDBAdapter.java @@ -15,7 +15,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/29. */ - +///< 雏苗司机单 public class ChickenDBAdapter extends BaseAdapter { private Context context; private List list; 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 b6d3a9d..bb8fc3a 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 @@ -18,7 +18,7 @@ import butterknife.BindView; /** * Created by 青花瓷 on 2017/11/29. */ - +///< 雏苗司机单 public class ChickenDriverBillActivity extends BaseActivity { @BindView(R.id.toolbar) Toolbar mToolbar; diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java index 53d7c83..e469f30 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderActivity.java @@ -15,7 +15,7 @@ import butterknife.OnClick; /** * Created by 青花瓷 on 2017/11/28. */ - +///< 可派车计划单 public class OrderActivity extends BaseActivity { @BindView(R.id.toolbar) Toolbar mToolbar; diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java index cc3ce2b..3534fc1 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/OrderOActivity.java @@ -13,7 +13,7 @@ import butterknife.BindView; /** * Created by 青花瓷 on 2017/11/29. */ - +///< 不可派车计划单 public class OrderOActivity extends BaseActivity { @BindView(R.id.toolbar) Toolbar mToolbar; 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 index b81f03d..6bb63aa 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java @@ -16,7 +16,7 @@ import butterknife.BindView; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 预警详情页 public class WarningActivity extends BaseActivity{ @BindView(R.id.toolbar) Toolbar mToolbar; 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 index 79347d8..4d38b05 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningAdapter.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningAdapter.java @@ -17,7 +17,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 预警详情页 public class WarningAdapter extends BaseAdapter { private Context context; private List list; 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 9a78e61..cb6f37e 100644 --- a/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java +++ b/app/src/main/java/com/qhclh/ytzh/utils/DateTimeUtil.java @@ -15,6 +15,7 @@ public final class DateTimeUtil { public static Date ParseDate(String dateStr) throws ParseException { return dateFormat.parse(dateStr); } + public static Date ParseDateDetail(String dateStr) throws ParseException { return dateFormatDetail.parse(dateStr); } @@ -58,6 +59,7 @@ public final class DateTimeUtil { } return dateFormat.format(date); } + public static String FormatDateDetail(Date date) { if (date == null) { return ""; @@ -70,45 +72,41 @@ public final class DateTimeUtil { } - public static String getYMD() - { - SimpleDateFormat formatter = new SimpleDateFormat ("yyyy年MM月dd日"); - Date curDate = new Date(System.currentTimeMillis());//获取当前时间 - String str = formatter.format(curDate); + 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); + + 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); + 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); + + 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); + 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) - { + public static String getStrYMD(String str) { SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - Date date= null; + Date date = null; try { date = df.parse(str.trim()); } catch (ParseException e) { @@ -120,8 +118,7 @@ public final class DateTimeUtil { return stra; } - public static long getDays(Date d1,Date d2) - { + 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/WorkFragment.java b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java index 944c515..e44c2d2 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java @@ -22,7 +22,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/28. */ - +///< 工作fragment public class WorkFragment extends BaseFragment implements View.OnClickListener { private Banner banner; private List list_path; 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 59855f2..5e7f0f2 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 @@ -19,7 +19,7 @@ import butterknife.BindView; /** * Created by 青花瓷 on 2017/11/30. */ -///< 筛选 +///< 筛选查看3项指标 public class DatanalysisSActivity extends BaseActivity { @BindView(R.id.toolbar) Toolbar mToolbar; 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 index f75ff3f..8331ef4 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/FactryAdapter.java +++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/FactryAdapter.java @@ -16,7 +16,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 养殖场 public class FactryAdapter extends BaseAdapter { private Context context; 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 76976cb..1902006 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 @@ -19,7 +19,7 @@ import butterknife.OnClick; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 车辆管理 public class CarsManageActivity extends BaseActivity1 implements CalendarDialogFragment.CalendarClickListener{ @BindView(R.id.toolbar1) Toolbar mToolbar; 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 0d15a6a..eb4f49e 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 @@ -13,7 +13,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 车辆管理鸡苗 public class ChicksFragment extends BaseFragment{ private ListView lv_infos_chicks; private List scanBeanList; 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 index fcfc4f8..98fdbed 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FeedFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FeedFragment.java @@ -6,7 +6,7 @@ import com.qhclh.ytzh.base.BaseFragment; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 饲料 public class FeedFragment extends BaseFragment { @Override protected int setLayout() { 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 12b326f..edbea12 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 @@ -13,7 +13,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 车辆管理毛鸡 public class GrossChickenFragment extends BaseFragment { private ListView lv_infos_grosschicken; 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 index 01994c5..0bfbc57 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java +++ b/app/src/main/java/com/qhclh/ytzh/work/scan/ScanAdapter.java @@ -15,7 +15,7 @@ import java.util.List; /** * Created by 青花瓷 on 2017/11/30. */ - +///< 扫一扫 public class ScanAdapter extends BaseAdapter { private Context context; 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 017c766..73af544 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 @@ -24,7 +24,7 @@ import pub.devrel.easypermissions.EasyPermissions; /** * Created by 青花瓷 on 2017/11/29. */ - +///< 扫一扫 public class ScanResultActivity extends BaseActivity { @BindView(R.id.toolbar) Toolbar mToolbar;