js方法优化

pull/42/head
Celeter 6 years ago
parent 0cd13d7c0f
commit 714b275e67
  1. 10
      app/src/main/java/io/legado/app/help/JsExtensions.kt
  2. 10
      app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt
  3. 6
      app/src/main/java/io/legado/app/utils/EncoderUtils.kt

@ -27,14 +27,18 @@ object JsExtensions {
* js实现解码,不能删 * js实现解码,不能删
*/ */
fun base64Decode(str: String): String { fun base64Decode(str: String): String {
return EncoderUtils.base64Decode(str) return EncoderUtils.base64Decode(str, Base64.NO_WRAP)
}
fun base64Decode(str: String, flags: Int): String {
return EncoderUtils.base64Decode(str, flags)
} }
fun base64Encode(str: String): String? { fun base64Encode(str: String): String? {
return EncoderUtils.base64Encode(str) return EncoderUtils.base64Encode(str, Base64.NO_WRAP)
} }
fun base64Encode(str: String, flags: Int = Base64.NO_WRAP): String? { fun base64Encode(str: String, flags: Int): String? {
return EncoderUtils.base64Encode(str, flags) return EncoderUtils.base64Encode(str, flags)
} }

@ -574,14 +574,18 @@ class AnalyzeRule(private var book: BaseBook? = null) {
* js实现解码,不能删 * js实现解码,不能删
*/ */
fun base64Decode(str: String): String { fun base64Decode(str: String): String {
return EncoderUtils.base64Decode(str) return EncoderUtils.base64Decode(str, Base64.NO_WRAP)
}
fun base64Decode(str: String, flags: Int): String {
return EncoderUtils.base64Decode(str, flags)
} }
fun base64Encode(str: String): String? { fun base64Encode(str: String): String? {
return EncoderUtils.base64Encode(str) return EncoderUtils.base64Encode(str, Base64.NO_WRAP)
} }
fun base64Encode(str: String, flags: Int = Base64.NO_WRAP): String? { fun base64Encode(str: String, flags: Int): String? {
return EncoderUtils.base64Encode(str, flags) return EncoderUtils.base64Encode(str, flags)
} }

@ -24,8 +24,8 @@ object EncoderUtils {
return tmp.toString() return tmp.toString()
} }
fun base64Decode(str: String): String { fun base64Decode(str: String, flags: Int): String {
val bytes = Base64.decode(str, Base64.DEFAULT) val bytes = Base64.decode(str, flags)
return try { return try {
String(bytes, StandardCharsets.UTF_8) String(bytes, StandardCharsets.UTF_8)
} catch (e: Exception) { } catch (e: Exception) {
@ -33,7 +33,7 @@ object EncoderUtils {
} }
} }
fun base64Encode(str: String, flags: Int = Base64.NO_WRAP): String? { fun base64Encode(str: String, flags: Int): String? {
return Base64.encodeToString(str.toByteArray(), flags) return Base64.encodeToString(str.toByteArray(), flags)
} }
} }
Loading…
Cancel
Save