bug修改

github2136 · github2136 · commit e63a2e5cc99c · 2023-02-18T12:06:22.000+08:00
diff --git a/app/src/main/java/com/github2136/datalevelpicker_demo/MainActivity.kt b/app/src/main/java/com/github2136/datalevelpicker_demo/MainActivity.kt
@@ -120,7 +120,7 @@ class MainActivity : AppCompatActivity() {
             }
             R.id.btn10 -> {
                 timeRangPickerDialog.setLimit("07:00", "21:00")
-                timeRangPickerDialog.show("12:00", "13:00", supportFragmentManager)
+                timeRangPickerDialog.show(null, null, supportFragmentManager)
             }
             R.id.btn11 -> {
                 dateTimePickerDialog.setLimit(null, null)
diff --git a/library/src/main/java/com/github2136/datetime/TimePickerDialog.kt b/library/src/main/java/com/github2136/datetime/TimePickerDialog.kt
@@ -126,9 +126,9 @@ class TimePickerDialog(
     fun show(date: String?, manager: FragmentManager) {
         if (!this.isAdded) {
             val temp = if (date != null) {
-                Util.str2date(date, Util.DATE_PATTERN_HM) ?: Date()
+                Util.str2date(date, Util.DATE_PATTERN_HM) ?: Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!
             } else {
-                Date()
+                Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!
             }
             if (temp.before(startLimitCalendar.time) || temp.after(endLimitCalendar.time)) {
                 timeCalender.time = startLimitCalendar.time
diff --git a/library/src/main/java/com/github2136/datetime/TimeRangPickerDialog.kt b/library/src/main/java/com/github2136/datetime/TimeRangPickerDialog.kt
@@ -196,9 +196,9 @@ class TimeRangPickerDialog(
                 }
             }
             val startTemp = if (start != null) {
-                Util.str2date(start, Util.DATE_PATTERN_HM) ?: Date()
+                Util.str2date(start, Util.DATE_PATTERN_HM) ?: Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!
             } else {
-                Date()
+                Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!
             }
             if (startTemp.before(startLimitCalendar.time) || startTemp.after(endLimitCalendar.time)) {
                 startCalendar.time = startLimitCalendar.time
@@ -207,9 +207,9 @@ class TimeRangPickerDialog(
             }
 
             val endTemp = if (end != null) {
-                Util.str2date(end, Util.DATE_PATTERN_HM) ?: Date()
+                Util.str2date(end, Util.DATE_PATTERN_HM) ?: Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!
             } else {
-                Date()
+                Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!
             }
             if (endTemp.before(startLimitCalendar.time) || endTemp.after(endLimitCalendar.time)) {
                 endCalendar.time = startLimitCalendar.time

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ class MainActivity : AppCompatActivity() {`
`120`	`120`	`}`
`121`	`121`	`R.id.btn10 -> {`
`122`	`122`	`timeRangPickerDialog.setLimit("07:00", "21:00")`
`123`		`- timeRangPickerDialog.show("12:00", "13:00", supportFragmentManager)`
	`123`	`+ timeRangPickerDialog.show(null, null, supportFragmentManager)`
`124`	`124`	`}`
`125`	`125`	`R.id.btn11 -> {`
`126`	`126`	`dateTimePickerDialog.setLimit(null, null)`
Original file line number	Diff line number	Diff line change
`@@ -196,9 +196,9 @@ class TimeRangPickerDialog(`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`	`val startTemp = if (start != null) {`
`199`		`- Util.str2date(start, Util.DATE_PATTERN_HM) ?: Date()`
	`199`	`+ Util.str2date(start, Util.DATE_PATTERN_HM) ?: Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!`
`200`	`200`	`} else {`
`201`		`- Date()`
	`201`	`+ Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!`
`202`	`202`	`}`
`203`	`203`	`if (startTemp.before(startLimitCalendar.time) \|\| startTemp.after(endLimitCalendar.time)) {`
`204`	`204`	`startCalendar.time = startLimitCalendar.time`
`@@ -207,9 +207,9 @@ class TimeRangPickerDialog(`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`val endTemp = if (end != null) {`
`210`		`- Util.str2date(end, Util.DATE_PATTERN_HM) ?: Date()`
	`210`	`+ Util.str2date(end, Util.DATE_PATTERN_HM) ?: Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!`
`211`	`211`	`} else {`
`212`		`- Date()`
	`212`	`+ Util.str2date(Util.date2str(Date(), Util.DATE_PATTERN_HM), Util.DATE_PATTERN_HM)!!`
`213`	`213`	`}`
`214`	`214`	`if (endTemp.before(startLimitCalendar.time) \|\| endTemp.after(endLimitCalendar.time)) {`
`215`	`215`	`endCalendar.time = startLimitCalendar.time`