|
@@ -10,6 +10,7 @@ import com.bigkoo.pickerview.listener.OnTimeSelectListener;
|
|
|
import com.bigkoo.pickerview.view.TimePickerView;
|
|
import com.bigkoo.pickerview.view.TimePickerView;
|
|
|
import com.mgtech.base_library.R;
|
|
import com.mgtech.base_library.R;
|
|
|
|
|
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.Calendar;
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
|
|
|
@@ -51,6 +52,9 @@ public class DateSelectDialogUtil {
|
|
|
|
|
|
|
|
private void initTimePicker() {//Dialog 模式下,在底部弹出
|
|
private void initTimePicker() {//Dialog 模式下,在底部弹出
|
|
|
Calendar selectedDate = Calendar.getInstance();
|
|
Calendar selectedDate = Calendar.getInstance();
|
|
|
|
|
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
|
|
+ String time = format.format(selectedDate.getTime());
|
|
|
|
|
+ selectedDate.setTime(DateFormatUtil.StringToDate(time));
|
|
|
timePickerView = new TimePickerBuilder(context, new OnTimeSelectListener() {
|
|
timePickerView = new TimePickerBuilder(context, new OnTimeSelectListener() {
|
|
|
@Override
|
|
@Override
|
|
|
public void onTimeSelect(Date date, View v) {
|
|
public void onTimeSelect(Date date, View v) {
|
|
@@ -75,7 +79,7 @@ public class DateSelectDialogUtil {
|
|
|
})
|
|
})
|
|
|
.setType(new boolean[]{true, true, true, false, false, false})
|
|
.setType(new boolean[]{true, true, true, false, false, false})
|
|
|
.setLabel("", "", "", "", "", "")
|
|
.setLabel("", "", "", "", "", "")
|
|
|
- .setDate(endDate == null ? selectedDate : endDate)
|
|
|
|
|
|
|
+ .setDate(selectedDate)
|
|
|
.setRangDate(startDate, endDate == null ? selectedDate : endDate)
|
|
.setRangDate(startDate, endDate == null ? selectedDate : endDate)
|
|
|
.setLineSpacingMultiplier(2.0f)
|
|
.setLineSpacingMultiplier(2.0f)
|
|
|
.build();
|
|
.build();
|