Date api issues.
This commit is contained in:
parent
62ad1f45ba
commit
131101d2ee
@ -16,10 +16,18 @@ actual class DateUtils actual constructor(actual val appSettingsService: AppSett
|
|||||||
val FORMATTERV1 = "yyyy-MM-dd HH:mm:ss"
|
val FORMATTERV1 = "yyyy-MM-dd HH:mm:ss"
|
||||||
|
|
||||||
return if (appSettingsService.getApiVersion() >= 4) {
|
return if (appSettingsService.getApiVersion() >= 4) {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
OffsetDateTime.parse(dateString).toInstant().toEpochMilli()
|
OffsetDateTime.parse(dateString).toInstant().toEpochMilli()
|
||||||
} else {
|
} else {
|
||||||
|
TODO("VERSION.SDK_INT < O")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(FORMATTERV1)).toInstant(
|
LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(FORMATTERV1)).toInstant(
|
||||||
ZoneOffset.UTC).toEpochMilli()
|
ZoneOffset.UTC).toEpochMilli()
|
||||||
|
} else {
|
||||||
|
TODO("VERSION.SDK_INT < O")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -27,11 +35,15 @@ actual class DateUtils actual constructor(actual val appSettingsService: AppSett
|
|||||||
|
|
||||||
val date = parseDate(dateString)
|
val date = parseDate(dateString)
|
||||||
|
|
||||||
return " " + DateUtils.getRelativeTimeSpanString(
|
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
" " + DateUtils.getRelativeTimeSpanString(
|
||||||
date,
|
date,
|
||||||
Instant.now().toEpochMilli(),
|
Instant.now().toEpochMilli(),
|
||||||
DateUtils.MINUTE_IN_MILLIS,
|
DateUtils.MINUTE_IN_MILLIS,
|
||||||
DateUtils.FORMAT_ABBREV_RELATIVE
|
DateUtils.FORMAT_ABBREV_RELATIVE
|
||||||
)
|
)
|
||||||
|
} else {
|
||||||
|
TODO("VERSION.SDK_INT < O")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user