Merge pull request #500 from gedoor/antecer

整合queryTTF支持base64

app/src/main/java/io/legado/app/help/JsExtensions.kt

@@ -245,9 +245,7 @@ interface JsExtensions {
         str ?: return null
         val key = md5Encode16(str)
         var qTTF = CacheManager.getQueryTTF(key)
-        if (qTTF != null) {
+        if (qTTF != null) return qTTF
-            return qTTF
-        }
         val font: ByteArray? = when {
             str.isAbsUrl() -> runBlocking {
                 var x = CacheManager.getByteArray(key)
@@ -276,12 +274,12 @@ interface JsExtensions {
         start: Int,
         end: Int
     ): String {
-        if (font1 == null || font2 == null) {
+        if (font1 == null || font2 == null) return text
-            return text
+        val startChar = start.toChar()
-        }
+        val endChar = end.toChar()
         val contentArray = text.toCharArray()
         contentArray.forEachIndexed { index, s ->
-            if (s > start.toChar() && s < end.toChar()) {
+            if (s in startChar until endChar) {
                 val code = font2.GetCodeByGlyf(font1.GetGlyfByCode(s.toInt()))
                 contentArray[index] = code.toChar()
             }