diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt index bc70b6306..db6abd93d 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt @@ -517,4 +517,4 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) { } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt index 95b8bc61c..db882dd80 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt @@ -330,8 +330,7 @@ abstract class BaseReadBookActivity : { _, yy, mm, dayOfMonth -> // 使用Java 8的日期和时间API来格式化日期 val date = LocalDate.of(yy, mm + 1, dayOfMonth) // Java 8的LocalDate,月份从1开始 - val formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") - val formattedDate = date.format(formatter) + val formattedDate = date.format(dateFormatter) startDate.setText(formattedDate) }, localStartDate.year, localStartDate.monthValue - 1, localStartDate.dayOfMonth ) diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt index 01a81fb7e..40c21d682 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt @@ -229,12 +229,11 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { AppLog.put("拉取阅读进度失败《${book.name}》\n${it.localizedMessage}", it) }.onSuccess { progress -> if (progress.durChapterIndex < book.durChapterIndex || - progress.durChapterIndex >= book.simulatedTotalChapterNum() || (progress.durChapterIndex == book.durChapterIndex && progress.durChapterPos < book.durChapterPos) ) { alertSync?.invoke(progress) - } else { + } else if (progress.durChapterIndex < book.simulatedTotalChapterNum()) { ReadBook.setProgress(progress) AppLog.put("自动同步阅读进度成功《${book.name}》 ${progress.durChapterTitle}") } @@ -545,4 +544,4 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { } } -} \ No newline at end of file +} diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml deleted file mode 100644 index 9a602ca1b..000000000 --- a/app/src/main/res/values-night/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Start Chapter - \ No newline at end of file