diff --git a/date_time_picker/src/main/java/com/loper7/date_time_picker/controller/DateTimeController.kt b/date_time_picker/src/main/java/com/loper7/date_time_picker/controller/DateTimeController.kt index 0f6cbd1..8c906e2 100644 --- a/date_time_picker/src/main/java/com/loper7/date_time_picker/controller/DateTimeController.kt +++ b/date_time_picker/src/main/java/com/loper7/date_time_picker/controller/DateTimeController.kt @@ -247,8 +247,6 @@ class DateTimeController : BaseDateTimeController() { override fun setDefaultMillisecond(time: Long) { if (time == 0L) return - if (time < minCalendar?.timeInMillis ?: 0) return - if (time > maxCalendar?.timeInMillis ?: 0) return calendar.clear() calendar.timeInMillis = time diff --git a/date_time_picker/src/main/java/com/loper7/date_time_picker/dialog/CardDatePickerDialog.kt b/date_time_picker/src/main/java/com/loper7/date_time_picker/dialog/CardDatePickerDialog.kt index c047e5f..263ef66 100644 --- a/date_time_picker/src/main/java/com/loper7/date_time_picker/dialog/CardDatePickerDialog.kt +++ b/date_time_picker/src/main/java/com/loper7/date_time_picker/dialog/CardDatePickerDialog.kt @@ -247,7 +247,10 @@ open class CardDatePickerDialog(context: Context) : tv_choose_date?.text = Html.fromHtml(str) } } - else -> tv_choose_date?.text = StringUtils.conversionTime(millisecond, "yyyy年MM月dd日 ") + StringUtils.getWeek(millisecond) + else -> tv_choose_date?.text = + StringUtils.conversionTime(millisecond, "yyyy年MM月dd日 ") + StringUtils.getWeek( + millisecond + ) } } }