This commit is contained in:
kunfei committed 2022-10-22 22:52:28 +08:00
1 parent 7753551148
commit 43f48320db
17 files changed
+67 -26

No files matched your search

@@ -3,6 +3,7 @@ package io.legado.app.constant
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.provider.Settings import android.provider.Settings
import com.android.tools.r8.Keep
import com.script.javascript.RhinoScriptEngine import com.script.javascript.RhinoScriptEngine
import io.legado.app.BuildConfig import io.legado.app.BuildConfig
import splitties.init.appCtx import splitties.init.appCtx
@@ -87,6 +88,7 @@ object AppConst {
val charsets = val charsets =
arrayListOf("UTF-8", "GB2312", "GB18030", "GBK", "Unicode", "UTF-16", "UTF-16LE", "ASCII") arrayListOf("UTF-8", "GB2312", "GB18030", "GBK", "Unicode", "UTF-16", "UTF-16LE", "ASCII")
@Keep
data class AppInfo( data class AppInfo(
var versionCode: Long = 0L, var versionCode: Long = 0L,
var versionName: String = "" var versionName: String = ""
@@ -1,8 +1,7 @@
package io.legado.app.data.entities package io.legado.app.data.entities
import android.util.Base64
import com.script.SimpleBindings
import cn.hutool.crypto.symmetric.AES import cn.hutool.crypto.symmetric.AES
import com.script.SimpleBindings
import io.legado.app.constant.AppConst import io.legado.app.constant.AppConst
import io.legado.app.constant.AppLog import io.legado.app.constant.AppLog
import io.legado.app.data.entities.rule.RowUi import io.legado.app.data.entities.rule.RowUi
@@ -60,12 +60,12 @@ object DefaultData {
RssSource.fromJsonArray(json).getOrDefault(emptyList()) RssSource.fromJsonArray(json).getOrDefault(emptyList())
} }
val coverRuleConfig: BookCover.CoverRuleConfig by lazy { val coverRule: BookCover.CoverRule by lazy {
val json = String( val json = String(
appCtx.assets.open("defaultData${File.separator}coverRuleConfig.json") appCtx.assets.open("defaultData${File.separator}coverRule.json")
.readBytes() .readBytes()
) )
GSON.fromJsonObject<BookCover.CoverRuleConfig>(json).getOrThrow()!! GSON.fromJsonObject<BookCover.CoverRule>(json).getOrThrow()!!
} }
val keyboardAssists: List<KeyboardAssist> by lazy { val keyboardAssists: List<KeyboardAssist> by lazy {
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import com.android.tools.r8.Keep
import com.bumptech.glide.RequestBuilder import com.bumptech.glide.RequestBuilder
import com.bumptech.glide.load.resource.bitmap.CenterCrop import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
@@ -23,6 +24,7 @@ import io.legado.app.model.analyzeRule.AnalyzeUrl
import io.legado.app.utils.* import io.legado.app.utils.*
import splitties.init.appCtx import splitties.init.appCtx
@Keep
object BookCover { object BookCover {
private const val coverRuleConfigKey = "legadoCoverRuleConfig" private const val coverRuleConfigKey = "legadoCoverRuleConfig"
@@ -32,12 +34,6 @@ object BookCover {
private set private set
lateinit var defaultDrawable: Drawable lateinit var defaultDrawable: Drawable
private set private set
val coverRuleConfig: CoverRuleConfig
get() {
return GSON.fromJsonObject<CoverRuleConfig>(CacheManager.get(coverRuleConfigKey))
.getOrNull()
?: DefaultData.coverRuleConfig
}
init { init {
@@ -117,8 +113,14 @@ object BookCover {
.thumbnail(loadBlur) .thumbnail(loadBlur)
} }
fun getCoverRule(): CoverRule {
return GSON.fromJsonObject<CoverRule>(CacheManager.get(coverRuleConfigKey))
.getOrNull()
?: DefaultData.coverRule
}
suspend fun searchCover(book: Book): String? { suspend fun searchCover(book: Book): String? {
val config = coverRuleConfig val config = getCoverRule()
if (!config.enable || config.searchUrl.isBlank() || config.coverRule.isBlank()) { if (!config.enable || config.searchUrl.isBlank() || config.coverRule.isBlank()) {
return null return null
} }
@@ -135,16 +137,17 @@ object BookCover {
return analyzeRule.getString(config.coverRule, isUrl = true) return analyzeRule.getString(config.coverRule, isUrl = true)
} }
fun saveCoverRuleConfig(config: CoverRuleConfig) { fun saveCoverRule(config: CoverRule) {
val json = GSON.toJson(config) val json = GSON.toJson(config)
CacheManager.put(coverRuleConfigKey, json) CacheManager.put(coverRuleConfigKey, json)
} }
fun delCoverRuleConfig() { fun delCoverRule() {
CacheManager.delete(coverRuleConfigKey) CacheManager.delete(coverRuleConfigKey)
} }
data class CoverRuleConfig( @Keep
data class CoverRule(
var enable: Boolean = true, var enable: Boolean = true,
var searchUrl: String, var searchUrl: String,
var coverRule: String, var coverRule: String,
@@ -2,7 +2,6 @@ package io.legado.app.ui.book.audio
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import android.graphics.Color
import android.icu.text.SimpleDateFormat import android.icu.text.SimpleDateFormat
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
@@ -79,7 +78,7 @@ class AudioPlayActivity :
} }
override fun onActivityCreated(savedInstanceState: Bundle?) { override fun onActivityCreated(savedInstanceState: Bundle?) {
binding.titleBar.setBackgroundColor(Color.argb(60, 0, 0, 0)) binding.titleBar.setBackgroundResource(R.color.transparent)
AudioPlay.titleData.observe(this) { AudioPlay.titleData.observe(this) {
binding.titleBar.title = it binding.titleBar.title = it
} }
@@ -2,7 +2,6 @@ package io.legado.app.ui.book.info
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
@@ -102,7 +101,7 @@ class BookInfoActivity :
@SuppressLint("PrivateResource") @SuppressLint("PrivateResource")
override fun onActivityCreated(savedInstanceState: Bundle?) { override fun onActivityCreated(savedInstanceState: Bundle?) {
binding.titleBar.setBackgroundColor(Color.argb(60, 0, 0, 0)) binding.titleBar.setBackgroundResource(R.color.transparent)
binding.arcView.setBgColor(backgroundColor) binding.arcView.setBgColor(backgroundColor)
binding.llInfo.setBackgroundColor(backgroundColor) binding.llInfo.setBackgroundColor(backgroundColor)
binding.scrollView.setBackgroundColor(backgroundColor) binding.scrollView.setBackgroundColor(backgroundColor)
@@ -1,10 +1,12 @@
package io.legado.app.ui.book.read.page.entities package io.legado.app.ui.book.read.page.entities
import com.android.tools.r8.Keep
import kotlin.math.min import kotlin.math.min
/** /**
* 章节信息 * 章节信息
*/ */
@Keep
@Suppress("unused") @Suppress("unused")
data class TextChapter( data class TextChapter(
val position: Int, val position: Int,
@@ -1,6 +1,7 @@
package io.legado.app.ui.book.read.page.entities package io.legado.app.ui.book.read.page.entities
import android.text.TextPaint import android.text.TextPaint
import com.android.tools.r8.Keep
import io.legado.app.ui.book.read.page.entities.column.BaseColumn import io.legado.app.ui.book.read.page.entities.column.BaseColumn
import io.legado.app.ui.book.read.page.provider.ChapterProvider import io.legado.app.ui.book.read.page.provider.ChapterProvider
import io.legado.app.utils.textHeight import io.legado.app.utils.textHeight
@@ -8,6 +9,7 @@ import io.legado.app.utils.textHeight
/** /**
* 行信息 * 行信息
*/ */
@Keep
@Suppress("unused", "MemberVisibilityCanBePrivate") @Suppress("unused", "MemberVisibilityCanBePrivate")
data class TextLine( data class TextLine(
var text: String = "", var text: String = "",
@@ -2,6 +2,7 @@ package io.legado.app.ui.book.read.page.entities