Skip to content

Commit 33d40ce

Browse files
committed
fix #53
1 parent e7dc935 commit 33d40ce

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

date_time_picker/src/main/java/com/loper7/date_time_picker/controller/DateTimeController.kt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,11 @@ class DateTimeController : BaseDateTimeController() {
250250
if (time < minCalendar?.timeInMillis ?: 0) return
251251
if (time > maxCalendar?.timeInMillis ?: 0) return
252252

253+
calendar.clear()
253254
calendar.timeInMillis = time
254255

255256
mYearSpinner?.value = calendar.get(Calendar.YEAR)
256-
mMonthSpinner?.value = calendar.get(Calendar.MONTH) + 1
257+
mMonthSpinner?.value =calendar.get(Calendar.MONTH) + 1
257258
mDaySpinner?.value = calendar.get(Calendar.DAY_OF_MONTH)
258259
mHourSpinner?.value = calendar.get(Calendar.HOUR_OF_DAY)
259260
mMinuteSpinner?.value = calendar.get(Calendar.MINUTE)
@@ -266,30 +267,27 @@ class DateTimeController : BaseDateTimeController() {
266267
override fun setMinMillisecond(time: Long) {
267268

268269
if (time == 0L) return
269-
if (maxCalendar?.timeInMillis ?: 0 in 1 until time) return
270+
if (maxCalendar?.timeInMillis in 1 until time) return
270271
if (minCalendar == null)
271272
minCalendar = Calendar.getInstance()
272273
minCalendar?.timeInMillis = time
273274

274-
mYearSpinner?.minValue = minCalendar?.get(Calendar.YEAR) ?: 1900
275+
mYearSpinner?.minValue = minCalendar?.get(Calendar.YEAR)
275276

276-
limitMaxAndMin()
277-
setWrapSelectorWheel(wrapSelectorWheelTypes, wrapSelectorWheel)
278-
if (calendar < minCalendar) setDefaultMillisecond(minCalendar?.timeInMillis ?: 0)
277+
setDefaultMillisecond(calendar.timeInMillis)
279278
}
280279

281280
override fun setMaxMillisecond(time: Long) {
282281
if (time == 0L) return
283-
if (minCalendar?.timeInMillis ?: 0 > 0L && time < minCalendar?.timeInMillis ?: 0) return
282+
if (minCalendar?.timeInMillis > 0L && time < minCalendar?.timeInMillis) return
284283
if (maxCalendar == null)
285284
maxCalendar = Calendar.getInstance()
286285
maxCalendar?.timeInMillis = time
287286

288287
mYearSpinner?.maxValue =
289-
maxCalendar?.get(Calendar.YEAR) ?: calendar.get(Calendar.YEAR) + 100
290-
limitMaxAndMin()
291-
setWrapSelectorWheel(wrapSelectorWheelTypes, wrapSelectorWheel)
292-
if (calendar > maxCalendar) setDefaultMillisecond(maxCalendar?.timeInMillis ?: 0)
288+
maxCalendar?.get(Calendar.YEAR)
289+
290+
setDefaultMillisecond(calendar.timeInMillis)
293291
}
294292

295293

0 commit comments

Comments
 (0)