Yaoliang 2 лет назад
Родитель
Сommit
4749ffdd91

+ 1 - 1
app/src/main/java/io/legado/app/data/entities/Book.kt

@@ -452,4 +452,4 @@ data class Book(
         @TypeConverter
         fun stringToReadConfig(json: String?) = GSON.fromJsonObject<ReadConfig>(json).getOrNull()
     }
-}
+}

+ 2 - 3
app/src/main/java/io/legado/app/model/ReadBook.kt

@@ -591,8 +591,7 @@ object ReadBook : CoroutineScope by MainScope() {
                 }
             }
 
-            // put a log to avoid Kotlin K2 compiler take "when" as a return statement
-            AppLog.putDebug("contentLoadFinish done")
+            return@async
         }.onError {
             AppLog.put("ChapterProvider ERROR", it)
             appCtx.toastOnUi("ChapterProvider ERROR:\n${it.stackTraceStr}")
@@ -729,4 +728,4 @@ object ReadBook : CoroutineScope by MainScope() {
         fun notifyBookChanged()
     }
 
-}
+}

+ 1 - 1
app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt

@@ -61,7 +61,6 @@ abstract class BaseReadBookActivity :
 
     override val binding by viewBinding(ActivityBookReadBinding::inflate)
     override val viewModel by viewModels<ReadBookViewModel>()
-    val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
 
     var bottomDialog = 0
         set(value) {
@@ -311,6 +310,7 @@ abstract class BaseReadBookActivity :
     }
 
     fun showSimulatedReading() {
+        val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
         ReadBook.book?.let { book ->
             alert(titleResource = R.string.simulated_reading) {
                 val alertBinding = DialogSimulatedReadingBinding.inflate(layoutInflater).apply {