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" />
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file