From 50b55076b8972b1d6efa1462fd5c79427d8283ce Mon Sep 17 00:00:00 2001 From: gedoor Date: Thu, 12 Nov 2020 15:15:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E6=96=87=E8=A7=84=E5=88=99=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/data/entities/rule/ContentRule.kt | 2 +- .../java/io/legado/app/help/JsExtensions.kt | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt b/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt index 8e75ae322..ed0d482cb 100644 --- a/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt +++ b/app/src/main/java/io/legado/app/data/entities/rule/ContentRule.kt @@ -11,5 +11,5 @@ data class ContentRule( var sourceRegex: String? = null, var replaceRegex: String? = null, var imageStyle: String? = null, //默认大小居中,FULL最大宽度 - var font: String? = null + var font: String? = null //必须返回ByteArray ) : Parcelable \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/help/JsExtensions.kt b/app/src/main/java/io/legado/app/help/JsExtensions.kt index 56d4f5d69..22fbd5fcf 100644 --- a/app/src/main/java/io/legado/app/help/JsExtensions.kt +++ b/app/src/main/java/io/legado/app/help/JsExtensions.kt @@ -121,10 +121,10 @@ interface JsExtensions { .execute() } - /** - *js实现读取cookie - */ - fun getCookie(tag: String, key: String? = null): String { + /** + *js实现读取cookie + */ + fun getCookie(tag: String, key: String? = null): String { val cookie = CookieStore.getCookie(tag) val cookieMap = CookieStore.cookieToMap(cookie) return if (key != null) { @@ -132,7 +132,7 @@ interface JsExtensions { } else { cookie } - } + } /** * js实现解码,不能删 @@ -191,4 +191,13 @@ interface JsExtensions { fun htmlFormat(str: String): String { return str.htmlFormat() } + + fun base64DecodeToByteArray(str: String): ByteArray { + return Base64.decode(str, Base64.DEFAULT) + } + + fun base64DecodeToByteArray(str: String, flags: Int): ByteArray { + return Base64.decode(str, flags) + } + }