This commit is contained in:
kunfei
2023-03-21 23:57:50 +08:00
parent 40c300ea9a
commit 0c2293b5af
2 changed files with 12 additions and 9 deletions

View File

@@ -222,16 +222,25 @@ data class BookSource(
companion object {
private val gson = GSON.newBuilder()
.registerTypeAdapter(ExploreRule::class.java, ExploreRule.jsonDeserializer)
.registerTypeAdapter(SearchRule::class.java, SearchRule.jsonDeserializer)
.registerTypeAdapter(BookInfoRule::class.java, BookInfoRule.jsonDeserializer)
.registerTypeAdapter(TocRule::class.java, TocRule.jsonDeserializer)
.registerTypeAdapter(ContentRule::class.java, ContentRule.jsonDeserializer)
.registerTypeAdapter(ReviewRule::class.java, ReviewRule.jsonDeserializer)
.create()
fun fromJson(json: String): Result<BookSource> {
return GSON.fromJsonObject(json)
return gson.fromJsonObject(json)
}
fun fromJsonArray(json: String): Result<List<BookSource>> {
return GSON.fromJsonArray(json)
return gson.fromJsonArray(json)
}
fun fromJsonArray(inputStream: InputStream): Result<List<BookSource>> {
return GSON.fromJsonArray(inputStream)
return gson.fromJsonArray(inputStream)
}
}

View File

@@ -22,12 +22,6 @@ val GSON: Gson by lazy {
)
.registerTypeAdapter(Int::class.java, IntJsonDeserializer())
.registerTypeAdapter(String::class.java, StringJsonDeserializer())
.registerTypeAdapter(ExploreRule::class.java, ExploreRule.jsonDeserializer)
// .registerTypeAdapter(SearchRule::class.java, SearchRule.jsonDeserializer)
// .registerTypeAdapter(BookInfoRule::class.java, BookInfoRule.jsonDeserializer)
// .registerTypeAdapter(TocRule::class.java, TocRule.jsonDeserializer)
// .registerTypeAdapter(ContentRule::class.java, ContentRule.jsonDeserializer)
// .registerTypeAdapter(ReviewRule::class.java, ReviewRule.jsonDeserializer)
.disableHtmlEscaping()
.setPrettyPrinting()
.create()